diff --git a/OlympusServices/.idea/misc.xml b/OlympusServices/.idea/misc.xml
index 99202cc..c0f68ed 100644
--- a/OlympusServices/.idea/misc.xml
+++ b/OlympusServices/.idea/misc.xml
@@ -25,7 +25,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/OlympusServices/.idea/vcs.xml b/OlympusServices/.idea/vcs.xml
index 35eb1dd..62bd7a0 100644
--- a/OlympusServices/.idea/vcs.xml
+++ b/OlympusServices/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/OlympusServices/app/src/main/res/layout/activity_log_in.xml b/OlympusServices/app/src/main/res/layout/activity_log_in.xml
index 17ce1f3..4210dc9 100644
--- a/OlympusServices/app/src/main/res/layout/activity_log_in.xml
+++ b/OlympusServices/app/src/main/res/layout/activity_log_in.xml
@@ -30,7 +30,7 @@
         android:layout_width="match_parent"
         android:layout_height="70dp"
         android:background="@color/colorWhite"
-        android:hint="Username"
+        android:hint="@string/username"
         android:textSize="20sp"
         android:layout_marginTop="40dp"
         app:met_baseColor="@android:color/white"
@@ -43,7 +43,7 @@
         android:layout_width="match_parent"
         android:layout_height="70dp"
         android:background="@drawable/customborder"
-        android:hint="Password"
+        android:hint="@string/password"
         android:textSize="20sp"
         android:layout_marginTop="20dp"
         app:met_baseColor="@android:color/white"
diff --git a/OlympusServices/app/src/main/res/values/strings.xml b/OlympusServices/app/src/main/res/values/strings.xml
index b6a75bf..0714d08 100644
--- a/OlympusServices/app/src/main/res/values/strings.xml
+++ b/OlympusServices/app/src/main/res/values/strings.xml
@@ -19,6 +19,8 @@
     <string name="login">Log In</string>
     <string name="newusername">Enter Username</string>
     <string name="newpassword">Enter Password</string>
+    <string name="password">Password</string>
+    <string name="username">Username</string>
     <string-array name="roles">
         <item>Admin</item>
         <item>User</item>
diff --git a/UML Class Diagram.docx b/UML Class Diagram.docx
index 1b6097c..4c3da81 100644
Binary files a/UML Class Diagram.docx and b/UML Class Diagram.docx differ