diff --git a/Android/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png b/Android/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png
index 13387e7..c04b523 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png and b/Android/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_add_circle_black_24dp.png b/Android/app/src/main/res/drawable-hdpi/ic_add_circle_black_24dp.png
index 7eb8a62..8a92ad3 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_add_circle_black_24dp.png and b/Android/app/src/main/res/drawable-hdpi/ic_add_circle_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_close_black_24dp.png b/Android/app/src/main/res/drawable-hdpi/ic_close_black_24dp.png
index fa610ae..1a9cd75 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_close_black_24dp.png and b/Android/app/src/main/res/drawable-hdpi/ic_close_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/Android/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png
index 51d3ffe..ceb1a1e 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png and b/Android/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/Android/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
index 370bef7..4a9f769 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png and b/Android/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_help_black_24dp.png b/Android/app/src/main/res/drawable-hdpi/ic_help_black_24dp.png
index e196ce1..374fafd 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_help_black_24dp.png and b/Android/app/src/main/res/drawable-hdpi/ic_help_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_black_24dp.png b/Android/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_black_24dp.png
index d1dd6cc..05b3579 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_black_24dp.png and b/Android/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_right_black_24dp.png b/Android/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_right_black_24dp.png
index 17801f6..67f890c 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_right_black_24dp.png and b/Android/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_right_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/Android/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
index fa8c1c5..acf1ddf 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png and b/Android/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png b/Android/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png
index b2d7244..23bf119 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png and b/Android/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_add_circle_black_24dp.png b/Android/app/src/main/res/drawable-mdpi/ic_add_circle_black_24dp.png
index df73571..ac376d0 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_add_circle_black_24dp.png and b/Android/app/src/main/res/drawable-mdpi/ic_add_circle_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_close_black_24dp.png b/Android/app/src/main/res/drawable-mdpi/ic_close_black_24dp.png
index 0ba4616..40a1a84 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_close_black_24dp.png and b/Android/app/src/main/res/drawable-mdpi/ic_close_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/Android/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png
index f26e9e1..af7f828 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png and b/Android/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/Android/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
index 8d48370..e2f5f35 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png and b/Android/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_help_black_24dp.png b/Android/app/src/main/res/drawable-mdpi/ic_help_black_24dp.png
index 9ed9f00..f6e789b 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_help_black_24dp.png and b/Android/app/src/main/res/drawable-mdpi/ic_help_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_black_24dp.png b/Android/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_black_24dp.png
index ebdca6d..22b624b 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_black_24dp.png and b/Android/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_right_black_24dp.png b/Android/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_right_black_24dp.png
index 9be7f6a..9a048f1 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_right_black_24dp.png and b/Android/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_right_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/Android/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
index 63a0673..c59419c 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png and b/Android/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/shanmukha.jpg b/Android/app/src/main/res/drawable-mdpi/shanmukha.jpg
index 4f61e77..7c7b203 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/shanmukha.jpg and b/Android/app/src/main/res/drawable-mdpi/shanmukha.jpg differ
diff --git a/Android/app/src/main/res/drawable-mdpi/shanmukha_splash.jpg b/Android/app/src/main/res/drawable-mdpi/shanmukha_splash.jpg
index a241135..b04c9ca 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/shanmukha_splash.jpg and b/Android/app/src/main/res/drawable-mdpi/shanmukha_splash.jpg differ
diff --git a/Android/app/src/main/res/drawable-mdpi/splash.png b/Android/app/src/main/res/drawable-mdpi/splash.png
index eaf3be8..0f8c0c9 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/splash.png and b/Android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/splash3.png b/Android/app/src/main/res/drawable-mdpi/splash3.png
index 80ea725..181fb03 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/splash3.png and b/Android/app/src/main/res/drawable-mdpi/splash3.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/splash4.png b/Android/app/src/main/res/drawable-mdpi/splash4.png
index 3df58d2..0162dab 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/splash4.png and b/Android/app/src/main/res/drawable-mdpi/splash4.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/splash_2.png b/Android/app/src/main/res/drawable-mdpi/splash_2.png
index 2dce5e7..baa301b 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/splash_2.png and b/Android/app/src/main/res/drawable-mdpi/splash_2.png differ
diff --git a/Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
index c7bd21d..ddb26ad 100644
--- a/Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,34 +1,34 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png b/Android/app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png
index e49c67c..3191d52 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png and b/Android/app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_add_circle_black_24dp.png b/Android/app/src/main/res/drawable-xhdpi/ic_add_circle_black_24dp.png
index f26e05f..6cfd7d3 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_add_circle_black_24dp.png and b/Android/app/src/main/res/drawable-xhdpi/ic_add_circle_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png b/Android/app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png
index 637e06c..6bc4372 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png and b/Android/app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/Android/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
index 9803ea3..b7c7ffd 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png and b/Android/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/Android/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
index e9b5411..388b5b0 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png and b/Android/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_help_black_24dp.png b/Android/app/src/main/res/drawable-xhdpi/ic_help_black_24dp.png
index 1101da7..d3542c6 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_help_black_24dp.png and b/Android/app/src/main/res/drawable-xhdpi/ic_help_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_black_24dp.png b/Android/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_black_24dp.png
index 139dfd3..49ef87d 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_black_24dp.png and b/Android/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_right_black_24dp.png b/Android/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_right_black_24dp.png
index c0ba00f..073583e 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_right_black_24dp.png and b/Android/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_right_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/Android/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
index e563dfb..e84e188 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png and b/Android/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png b/Android/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png
index 73784b3..a84106b 100644
Binary files a/Android/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png and b/Android/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxhdpi/ic_add_circle_black_24dp.png b/Android/app/src/main/res/drawable-xxhdpi/ic_add_circle_black_24dp.png
index f26f33f..6317302 100644
Binary files a/Android/app/src/main/res/drawable-xxhdpi/ic_add_circle_black_24dp.png and b/Android/app/src/main/res/drawable-xxhdpi/ic_add_circle_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png b/Android/app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png
index 2f49029..51b4401 100644
Binary files a/Android/app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png and b/Android/app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/Android/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
index ba0dd12..6b717e0 100644
Binary files a/Android/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png and b/Android/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/Android/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
index 57c9b63..3fcdfdb 100644
Binary files a/Android/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png and b/Android/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png b/Android/app/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png
index c776e87..645822e 100644
Binary files a/Android/app/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png and b/Android/app/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_black_24dp.png b/Android/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_black_24dp.png
index a5235ca..da52e03 100644
Binary files a/Android/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_black_24dp.png and b/Android/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_black_24dp.png b/Android/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_black_24dp.png
index 53b89f6..b96cfd1 100644
Binary files a/Android/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_black_24dp.png and b/Android/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/Android/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
index c339324..3023ff8 100644
Binary files a/Android/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png and b/Android/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png b/Android/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png
index 1b1dded..3cb1092 100644
Binary files a/Android/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png and b/Android/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxxhdpi/ic_add_circle_black_24dp.png b/Android/app/src/main/res/drawable-xxxhdpi/ic_add_circle_black_24dp.png
index 1f9394c..af8720e 100644
Binary files a/Android/app/src/main/res/drawable-xxxhdpi/ic_add_circle_black_24dp.png and b/Android/app/src/main/res/drawable-xxxhdpi/ic_add_circle_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png b/Android/app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png
index dcface3..df42fee 100644
Binary files a/Android/app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png and b/Android/app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/Android/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
index 9ff9b47..3964192 100644
Binary files a/Android/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png and b/Android/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/Android/app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
index 3d4676b..8d322aa 100644
Binary files a/Android/app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png and b/Android/app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png b/Android/app/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png
index 09888ee..7c48230 100644
Binary files a/Android/app/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png and b/Android/app/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_black_24dp.png b/Android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_black_24dp.png
index e683ae6..55f211b 100644
Binary files a/Android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_black_24dp.png and b/Android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_right_black_24dp.png b/Android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_right_black_24dp.png
index 1aa2900..6f2dc5b 100644
Binary files a/Android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_right_black_24dp.png and b/Android/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_right_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
index 3211218..476d5c9 100644
Binary files a/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png and b/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png differ
diff --git a/Android/app/src/main/res/drawable/ic_launcher_background.xml b/Android/app/src/main/res/drawable/ic_launcher_background.xml
index d5fccc5..3a37cf6 100644
--- a/Android/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/Android/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,170 +1,170 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillColor="#26A69A"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+</vector>
diff --git a/Android/app/src/main/res/layout/activity_about_us.xml b/Android/app/src/main/res/layout/activity_about_us.xml
index 54b16de..16b08fb 100644
--- a/Android/app/src/main/res/layout/activity_about_us.xml
+++ b/Android/app/src/main/res/layout/activity_about_us.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".bookmypcr.activities.AboutUs">
-
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/maintoolbar"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" >
-
-        </android.support.v7.widget.Toolbar>
-
-    </android.support.design.widget.AppBarLayout>
-<ScrollView
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_below="@id/maintoolbar">
-<RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginLeft="10dp"
-    android:gravity="center"
-    android:layout_marginTop="15dp"
-    android:layout_marginRight="10dp"
-    >
-    <android.support.v7.widget.AppCompatImageView
-        android:layout_width="match_parent"
-        android:id="@+id/shanmukhaLogo"
-        android:layout_height="587px" android:src="@drawable/shanmukha"/>
-    <android.support.v7.widget.AppCompatTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
-        android:layout_marginBottom="50dp"
-        android:layout_gravity="center_horizontal|center"
-        android:gravity="center"
-        android:autoLink="all" android:clickable="true"
-        android:layout_below="@+id/shanmukhaLogo"
-        android:text="@string/aboutus"
-        android:id="@+id/title" />
-</RelativeLayout>
-</ScrollView>
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".bookmypcr.activities.AboutUs">
+
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/maintoolbar"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" >
+
+        </android.support.v7.widget.Toolbar>
+
+    </android.support.design.widget.AppBarLayout>
+<ScrollView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_below="@id/maintoolbar">
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginLeft="10dp"
+    android:gravity="center"
+    android:layout_marginTop="15dp"
+    android:layout_marginRight="10dp"
+    >
+    <android.support.v7.widget.AppCompatImageView
+        android:layout_width="match_parent"
+        android:id="@+id/shanmukhaLogo"
+        android:layout_height="587px" android:src="@drawable/shanmukha"/>
+    <android.support.v7.widget.AppCompatTextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="50dp"
+        android:layout_gravity="center_horizontal|center"
+        android:gravity="center"
+        android:autoLink="all" android:clickable="true"
+        android:layout_below="@+id/shanmukhaLogo"
+        android:text="@string/aboutus"
+        android:id="@+id/title" />
+</RelativeLayout>
+</ScrollView>
+
+</RelativeLayout>
diff --git a/Android/app/src/main/res/layout/activity_add_pcr.xml b/Android/app/src/main/res/layout/activity_add_pcr.xml
index e61b283..fa95efd 100644
--- a/Android/app/src/main/res/layout/activity_add_pcr.xml
+++ b/Android/app/src/main/res/layout/activity_add_pcr.xml
@@ -1,93 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".bookmypcr.activities.AddPCR">
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/maintoolbar"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" >
-
-
-            <Button
-                android:id="@+id/Save"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right|end"
-                android:background="?android:selectableItemBackground"
-                android:text="Save"
-                android:onClick="savePCR"/>
-
-
-        </android.support.v7.widget.Toolbar>
-
-    </android.support.design.widget.AppBarLayout>
-
-    <android.support.v7.widget.AppCompatEditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="50dp"
-        android:hint="PCR Name"
-        android:id="@+id/title"
-        android:layout_below="@+id/maintoolbar"/>
-
-
-    <android.support.v7.widget.AppCompatEditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="50dp"
-        android:id="@+id/manufacturer"
-        android:layout_below="@+id/title"
-        android:hint="Manufacturer Name"/>
-
-
-    <android.support.v7.widget.AppCompatEditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="50dp"
-        android:id="@+id/model"
-        android:layout_below="@+id/manufacturer"
-        android:hint="Model"/>
-
-
-    <android.support.v7.widget.AppCompatEditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="50dp"
-        android:id="@+id/location"
-        android:layout_below="@+id/model"
-        android:hint="Location"/>
-
-
-    <android.support.v7.widget.AppCompatEditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="50dp"
-        android:id="@+id/comments"
-        android:layout_below="@+id/location"
-        android:hint="Comments"/>
-
-
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".bookmypcr.activities.AddPCR">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/maintoolbar"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" >
+
+
+            <Button
+                android:id="@+id/Save"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right|end"
+                android:background="?android:selectableItemBackground"
+                android:text="Save"
+                android:onClick="savePCR"/>
+
+
+        </android.support.v7.widget.Toolbar>
+
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v7.widget.AppCompatEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="50dp"
+        android:hint="PCR Name"
+        android:id="@+id/title"
+        android:layout_below="@+id/maintoolbar"/>
+
+
+    <android.support.v7.widget.AppCompatEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="50dp"
+        android:id="@+id/manufacturer"
+        android:layout_below="@+id/title"
+        android:hint="Manufacturer Name"/>
+
+
+    <android.support.v7.widget.AppCompatEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="50dp"
+        android:id="@+id/model"
+        android:layout_below="@+id/manufacturer"
+        android:hint="Model"/>
+
+
+    <android.support.v7.widget.AppCompatEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="50dp"
+        android:id="@+id/location"
+        android:layout_below="@+id/model"
+        android:hint="Location"/>
+
+
+    <android.support.v7.widget.AppCompatEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="50dp"
+        android:id="@+id/comments"
+        android:layout_below="@+id/location"
+        android:hint="Comments"/>
+
+
+
+</RelativeLayout>
diff --git a/Android/app/src/main/res/layout/activity_calendar.xml b/Android/app/src/main/res/layout/activity_calendar.xml
index 29bbefe..42e2fc9 100644
--- a/Android/app/src/main/res/layout/activity_calendar.xml
+++ b/Android/app/src/main/res/layout/activity_calendar.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:openDrawer="start">
-
-    <include
-        layout="@layout/app_bar_calendar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <android.support.design.widget.NavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true"
-        app:headerLayout="@layout/nav_header_calendar"
-        app:menu="@menu/activity_calendar_drawer" />
-
-</android.support.v4.widget.DrawerLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start">
+
+    <include
+        layout="@layout/app_bar_calendar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <android.support.design.widget.NavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true"
+        app:headerLayout="@layout/nav_header_calendar"
+        app:menu="@menu/activity_calendar_drawer" />
+
+</android.support.v4.widget.DrawerLayout>
diff --git a/Android/app/src/main/res/layout/activity_create_lab.xml b/Android/app/src/main/res/layout/activity_create_lab.xml
index 14be5a7..a798652 100644
--- a/Android/app/src/main/res/layout/activity_create_lab.xml
+++ b/Android/app/src/main/res/layout/activity_create_lab.xml
@@ -1,169 +1,169 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".bookmypcr.activities.CreateLab">
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/maintoolbar"
-        android:theme="@style/AppTheme.AppBarOverlay">
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" >
-        </android.support.v7.widget.Toolbar>
-    </android.support.design.widget.AppBarLayout>
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/maintoolbar">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Enter Lab Details"
-                android:textSize="20dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:textStyle="bold"
-                android:id="@+id/labText"
-                android:layout_marginLeft="10dp"/>
-
-            <android.support.v7.widget.AppCompatEditText
-                android:layout_width="match_parent"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:hint="Lab Name"
-                android:layout_below="@+id/labText"
-                android:layout_height="wrap_content" android:id="@+id/labName"
-                />
-            <android.support.v7.widget.AppCompatEditText
-                android:layout_width="match_parent"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:hint="Department"
-                android:layout_height="wrap_content" android:id="@+id/department"
-                android:layout_below="@+id/labName"/>
-            <android.support.v7.widget.AppCompatEditText
-                android:layout_width="match_parent"
-                android:layout_marginLeft="10dp"
-                android:hint="University"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:layout_height="wrap_content" android:id="@+id/university"
-                android:layout_below="@+id/department"/>
-            <android.support.v7.widget.AppCompatEditText
-                android:layout_width="match_parent"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:hint="Incharge Name"
-                android:layout_height="wrap_content" android:id="@+id/incharge"
-                android:layout_below="@+id/university"/>
-            <android.support.v7.widget.AppCompatEditText
-                android:layout_width="match_parent"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:hint="Incharge Contact Number"
-                android:layout_height="wrap_content" android:id="@+id/inchargeNo"
-                android:inputType="phone"
-                android:layout_below="@+id/incharge"/>
-            <android.support.v7.widget.AppCompatEditText
-                android:layout_width="match_parent"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:hint="Incharge Contact Email ID"
-                android:layout_height="wrap_content" android:id="@+id/inchargeEmail"
-                android:inputType="textEmailAddress"
-                android:layout_below="@+id/inchargeNo"/>
-
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Enter PCR Details"
-                android:textSize="20dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:textStyle="bold"
-                android:layout_below="@+id/inchargeEmail"
-                android:id="@+id/pcrText"
-                android:layout_marginLeft="10dp"/>
-            <android.support.v7.widget.AppCompatEditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:layout_marginLeft="10dp"
-                android:hint="PCR Name"
-                android:id="@+id/title"
-                android:layout_below="@+id/pcrText"/>
-
-
-            <android.support.v7.widget.AppCompatEditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:id="@+id/manufacturer"
-                android:layout_below="@+id/title"
-                android:hint="Manufacturer Name"/>
-
-
-            <android.support.v7.widget.AppCompatEditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:id="@+id/model"
-                android:layout_below="@+id/manufacturer"
-                android:hint="Model"/>
-
-
-            <android.support.v7.widget.AppCompatEditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:id="@+id/location"
-                android:layout_below="@+id/model"
-                android:hint="Location"/>
-
-
-            <android.support.v7.widget.AppCompatEditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:id="@+id/comments"
-                android:layout_below="@+id/location"
-                android:hint="Comments"/>
-
-            <Button
-                android:layout_width="match_parent"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="20dp"
-                android:layout_below="@+id/comments"
-                android:onClick="createLab"
-                android:layout_gravity="center"
-                android:layout_height="wrap_content"
-                android:text="Create Lab Account"/>
-        </RelativeLayout>
-    </ScrollView>
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".bookmypcr.activities.CreateLab">
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/maintoolbar"
+        android:theme="@style/AppTheme.AppBarOverlay">
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" >
+        </android.support.v7.widget.Toolbar>
+    </android.support.design.widget.AppBarLayout>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/maintoolbar">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Enter Lab Details"
+                android:textSize="20dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:textStyle="bold"
+                android:id="@+id/labText"
+                android:layout_marginLeft="10dp"/>
+
+            <android.support.v7.widget.AppCompatEditText
+                android:layout_width="match_parent"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:hint="Lab Name"
+                android:layout_below="@+id/labText"
+                android:layout_height="wrap_content" android:id="@+id/labName"
+                />
+            <android.support.v7.widget.AppCompatEditText
+                android:layout_width="match_parent"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:hint="Department"
+                android:layout_height="wrap_content" android:id="@+id/department"
+                android:layout_below="@+id/labName"/>
+            <android.support.v7.widget.AppCompatEditText
+                android:layout_width="match_parent"
+                android:layout_marginLeft="10dp"
+                android:hint="University"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:layout_height="wrap_content" android:id="@+id/university"
+                android:layout_below="@+id/department"/>
+            <android.support.v7.widget.AppCompatEditText
+                android:layout_width="match_parent"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:hint="Incharge Name"
+                android:layout_height="wrap_content" android:id="@+id/incharge"
+                android:layout_below="@+id/university"/>
+            <android.support.v7.widget.AppCompatEditText
+                android:layout_width="match_parent"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:hint="Incharge Contact Number"
+                android:layout_height="wrap_content" android:id="@+id/inchargeNo"
+                android:inputType="phone"
+                android:layout_below="@+id/incharge"/>
+            <android.support.v7.widget.AppCompatEditText
+                android:layout_width="match_parent"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:hint="Incharge Contact Email ID"
+                android:layout_height="wrap_content" android:id="@+id/inchargeEmail"
+                android:inputType="textEmailAddress"
+                android:layout_below="@+id/inchargeNo"/>
+
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Enter PCR Details"
+                android:textSize="20dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:textStyle="bold"
+                android:layout_below="@+id/inchargeEmail"
+                android:id="@+id/pcrText"
+                android:layout_marginLeft="10dp"/>
+            <android.support.v7.widget.AppCompatEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:layout_marginLeft="10dp"
+                android:hint="PCR Name"
+                android:id="@+id/title"
+                android:layout_below="@+id/pcrText"/>
+
+
+            <android.support.v7.widget.AppCompatEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:id="@+id/manufacturer"
+                android:layout_below="@+id/title"
+                android:hint="Manufacturer Name"/>
+
+
+            <android.support.v7.widget.AppCompatEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:id="@+id/model"
+                android:layout_below="@+id/manufacturer"
+                android:hint="Model"/>
+
+
+            <android.support.v7.widget.AppCompatEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:id="@+id/location"
+                android:layout_below="@+id/model"
+                android:hint="Location"/>
+
+
+            <android.support.v7.widget.AppCompatEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:id="@+id/comments"
+                android:layout_below="@+id/location"
+                android:hint="Comments"/>
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="20dp"
+                android:layout_below="@+id/comments"
+                android:onClick="createLab"
+                android:layout_gravity="center"
+                android:layout_height="wrap_content"
+                android:text="Create Lab Account"/>
+        </RelativeLayout>
+    </ScrollView>
+</RelativeLayout>
diff --git a/Android/app/src/main/res/layout/activity_edit_event.xml b/Android/app/src/main/res/layout/activity_edit_event.xml
index a2a502a..865e117 100644
--- a/Android/app/src/main/res/layout/activity_edit_event.xml
+++ b/Android/app/src/main/res/layout/activity_edit_event.xml
@@ -1,147 +1,147 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".bookmypcr.activities.EditEvent">
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/maintoolbar"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" >
-
-
-            <Button
-                android:id="@+id/Save"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right|end"
-                android:background="?android:selectableItemBackground"
-                android:text="Save"
-                android:onClick="saveEvent"/>
-
-            <ImageButton
-                android:paddingRight="10dp"
-                android:id="@+id/ImageButton01"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right|end"
-                android:src="@drawable/ic_delete_white_24dp"
-                android:onClick="deleteEvent"
-                android:background="?android:selectableItemBackground" />
-
-        </android.support.v7.widget.Toolbar>
-
-    </android.support.design.widget.AppBarLayout>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" android:layout_below="@+id/maintoolbar">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" android:id="@+id/mainLayout">
-
-    <android.support.v7.widget.AppCompatEditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="50dp"
-        android:hint="Add Title"
-        android:id="@+id/title" />
-
-    <android.support.v7.widget.AppCompatTextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" android:text="From"
-        android:textStyle="bold"
-        android:layout_marginTop="15dp"
-        android:layout_marginLeft="10dp"
-        android:textSize="20dp"
-        android:id="@+id/from"
-        android:layout_below="@+id/title"/>
-
-    <android.support.v7.widget.AppCompatTextView
-        android:layout_width="150dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="10dp"
-        android:textSize="20dp"
-        android:id="@+id/datebar"
-        android:layout_below="@+id/from" />
-
-    <Spinner
-        android:id="@+id/startTime"
-        android:layout_width="150dp"
-        android:layout_marginTop="15dp"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/from"
-        android:layout_toRightOf="@id/datebar"
-        />
-
-
-
-    <android.support.v7.widget.AppCompatTextView
-        android:layout_width="wrap_content"
-        android:layout_marginTop="15dp"
-        android:layout_height="wrap_content" android:text="To"
-        android:textStyle="bold"
-        android:textSize="20dp"
-        android:layout_marginLeft="10dp"
-        android:id="@+id/to"
-        android:layout_below="@+id/datebar"/>
-
-    <android.support.v7.widget.AppCompatTextView
-        android:layout_width="150dp"
-        android:layout_marginTop="15dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:textSize="20dp"
-        android:id="@+id/enddatebar"
-        android:layout_below="@+id/to" />
-
-    <Spinner
-        android:id="@+id/endTime"
-        android:layout_width="150dp"
-        android:layout_marginTop="15dp"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/enddatebar"
-        android:layout_below="@+id/to"
-        />
-
-    <android.support.v7.widget.AppCompatEditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="50dp"
-        android:id="@+id/reaction"
-        android:layout_below="@+id/endTime"
-        android:hint="Reaction Specification"/>
-
-    <android.support.v7.widget.AppCompatEditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="50dp"
-        android:id="@+id/comments"
-        android:layout_below="@+id/reaction"
-        android:hint="Additional Comments"/>
-
-
-    <include layout="@layout/content_edit_event" />
-
-</RelativeLayout>
-    </ScrollView>
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".bookmypcr.activities.EditEvent">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/maintoolbar"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" >
+
+
+            <Button
+                android:id="@+id/Save"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right|end"
+                android:background="?android:selectableItemBackground"
+                android:text="Save"
+                android:onClick="saveEvent"/>
+
+            <ImageButton
+                android:paddingRight="10dp"
+                android:id="@+id/ImageButton01"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right|end"
+                android:src="@drawable/ic_delete_white_24dp"
+                android:onClick="deleteEvent"
+                android:background="?android:selectableItemBackground" />
+
+        </android.support.v7.widget.Toolbar>
+
+    </android.support.design.widget.AppBarLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" android:layout_below="@+id/maintoolbar">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" android:id="@+id/mainLayout">
+
+    <android.support.v7.widget.AppCompatEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="50dp"
+        android:hint="Add Title"
+        android:id="@+id/title" />
+
+    <android.support.v7.widget.AppCompatTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" android:text="From"
+        android:textStyle="bold"
+        android:layout_marginTop="15dp"
+        android:layout_marginLeft="10dp"
+        android:textSize="20dp"
+        android:id="@+id/from"
+        android:layout_below="@+id/title"/>
+
+    <android.support.v7.widget.AppCompatTextView
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="10dp"
+        android:textSize="20dp"
+        android:id="@+id/datebar"
+        android:layout_below="@+id/from" />
+
+    <Spinner
+        android:id="@+id/startTime"
+        android:layout_width="150dp"
+        android:layout_marginTop="15dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/from"
+        android:layout_toRightOf="@id/datebar"
+        />
+
+
+
+    <android.support.v7.widget.AppCompatTextView
+        android:layout_width="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_height="wrap_content" android:text="To"
+        android:textStyle="bold"
+        android:textSize="20dp"
+        android:layout_marginLeft="10dp"
+        android:id="@+id/to"
+        android:layout_below="@+id/datebar"/>
+
+    <android.support.v7.widget.AppCompatTextView
+        android:layout_width="150dp"
+        android:layout_marginTop="15dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:textSize="20dp"
+        android:id="@+id/enddatebar"
+        android:layout_below="@+id/to" />
+
+    <Spinner
+        android:id="@+id/endTime"
+        android:layout_width="150dp"
+        android:layout_marginTop="15dp"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/enddatebar"
+        android:layout_below="@+id/to"
+        />
+
+    <android.support.v7.widget.AppCompatEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="50dp"
+        android:id="@+id/reaction"
+        android:layout_below="@+id/endTime"
+        android:hint="Reaction Specification"/>
+
+    <android.support.v7.widget.AppCompatEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="50dp"
+        android:id="@+id/comments"
+        android:layout_below="@+id/reaction"
+        android:hint="Additional Comments"/>
+
+
+    <include layout="@layout/content_edit_event" />
+
+</RelativeLayout>
+    </ScrollView>
+</RelativeLayout>
diff --git a/Android/app/src/main/res/layout/activity_help.xml b/Android/app/src/main/res/layout/activity_help.xml
index 23cfd40..c6f26db 100644
--- a/Android/app/src/main/res/layout/activity_help.xml
+++ b/Android/app/src/main/res/layout/activity_help.xml
@@ -1,106 +1,106 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".bookmypcr.activities.HelpActivity">
-
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/maintoolbar"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" >
-
-        </android.support.v7.widget.Toolbar>
-
-    </android.support.design.widget.AppBarLayout>
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/maintoolbar">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:gravity="center"
-            android:layout_marginRight="10dp"
-            >
-            <android.support.v7.widget.AppCompatTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:layout_marginBottom="15dp"
-            android:autoLink="all" android:clickable="true"
-            android:text="@string/help1"
-            android:id="@+id/q1" />
-            <View android:background="#000000"
-                android:layout_width = "match_parent"
-                android:layout_height="1dp"
-                android:id="@+id/line1"
-                android:layout_below="@+id/q1"/>
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:layout_marginBottom="15dp"
-                android:layout_below="@+id/line1"
-                android:autoLink="all" android:clickable="true"
-                android:text="@string/help2"
-                android:id="@+id/q2" />
-            <View android:background="#000000"
-                android:layout_width = "match_parent"
-                android:layout_height="1dp"
-                android:id="@+id/line2"
-                android:layout_below="@+id/q2"/>
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:layout_marginBottom="15dp"
-                android:layout_below="@+id/line2"
-                android:autoLink="all" android:clickable="true"
-                android:text="@string/help3"
-                android:id="@+id/q3" />
-            <View android:background="#000000"
-                android:layout_width = "match_parent"
-                android:layout_height="1dp"
-                android:id="@+id/line3"
-                android:layout_below="@+id/q3"/>
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:layout_marginBottom="15dp"
-                android:layout_below="@+id/line3"
-                android:autoLink="all" android:clickable="true"
-                android:text="@string/help4"
-                android:id="@+id/q4" />
-            <View android:background="#000000"
-                android:layout_width = "match_parent"
-                android:layout_height="1dp"
-                android:id="@+id/line4"
-                android:layout_below="@+id/q4"/>
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/line4"
-                android:layout_marginTop="15dp"
-                android:layout_marginBottom="15dp"
-                android:autoLink="all" android:clickable="true"
-                android:text="@string/help5"
-                android:id="@+id/q5" />
-
-        </RelativeLayout>
-    </ScrollView>
-
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".bookmypcr.activities.HelpActivity">
+
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/maintoolbar"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" >
+
+        </android.support.v7.widget.Toolbar>
+
+    </android.support.design.widget.AppBarLayout>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/maintoolbar">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="10dp"
+            android:gravity="center"
+            android:layout_marginRight="10dp"
+            >
+            <android.support.v7.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:layout_marginBottom="15dp"
+            android:autoLink="all" android:clickable="true"
+            android:text="@string/help1"
+            android:id="@+id/q1" />
+            <View android:background="#000000"
+                android:layout_width = "match_parent"
+                android:layout_height="1dp"
+                android:id="@+id/line1"
+                android:layout_below="@+id/q1"/>
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:layout_marginBottom="15dp"
+                android:layout_below="@+id/line1"
+                android:autoLink="all" android:clickable="true"
+                android:text="@string/help2"
+                android:id="@+id/q2" />
+            <View android:background="#000000"
+                android:layout_width = "match_parent"
+                android:layout_height="1dp"
+                android:id="@+id/line2"
+                android:layout_below="@+id/q2"/>
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:layout_marginBottom="15dp"
+                android:layout_below="@+id/line2"
+                android:autoLink="all" android:clickable="true"
+                android:text="@string/help3"
+                android:id="@+id/q3" />
+            <View android:background="#000000"
+                android:layout_width = "match_parent"
+                android:layout_height="1dp"
+                android:id="@+id/line3"
+                android:layout_below="@+id/q3"/>
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:layout_marginBottom="15dp"
+                android:layout_below="@+id/line3"
+                android:autoLink="all" android:clickable="true"
+                android:text="@string/help4"
+                android:id="@+id/q4" />
+            <View android:background="#000000"
+                android:layout_width = "match_parent"
+                android:layout_height="1dp"
+                android:id="@+id/line4"
+                android:layout_below="@+id/q4"/>
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/line4"
+                android:layout_marginTop="15dp"
+                android:layout_marginBottom="15dp"
+                android:autoLink="all" android:clickable="true"
+                android:text="@string/help5"
+                android:id="@+id/q5" />
+
+        </RelativeLayout>
+    </ScrollView>
+
+
+</RelativeLayout>
diff --git a/Android/app/src/main/res/layout/activity_join_lab.xml b/Android/app/src/main/res/layout/activity_join_lab.xml
index 29cd8fa..0291983 100644
--- a/Android/app/src/main/res/layout/activity_join_lab.xml
+++ b/Android/app/src/main/res/layout/activity_join_lab.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".bookmypcr.activities.JoinLab">
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/maintoolbar"
-        android:theme="@style/AppTheme.AppBarOverlay">
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" >
-        </android.support.v7.widget.Toolbar>
-    </android.support.design.widget.AppBarLayout>
-    <android.support.v7.widget.AppCompatEditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/searchValue"
-        android:layout_below="@id/maintoolbar"
-        android:hint="Enter Lab Name"
-        android:gravity="center"
-        android:padding="@dimen/activity_horizontal_margin"
-        />
-    <android.support.v7.widget.AppCompatButton
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Search"
-        android:id="@+id/search_button"
-        android:layout_below="@+id/searchValue"
-        android:padding="@dimen/activity_horizontal_margin"
-        android:onClick="search"/>
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_below="@+id/search_button"
-        android:layout_marginTop="10dp"
-        android:layout_height="wrap_content">
-    <ListView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/resultList" />
-    </ScrollView>
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".bookmypcr.activities.JoinLab">
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/maintoolbar"
+        android:theme="@style/AppTheme.AppBarOverlay">
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" >
+        </android.support.v7.widget.Toolbar>
+    </android.support.design.widget.AppBarLayout>
+    <android.support.v7.widget.AppCompatEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/searchValue"
+        android:layout_below="@id/maintoolbar"
+        android:hint="Enter Lab Name"
+        android:gravity="center"
+        android:padding="@dimen/activity_horizontal_margin"
+        />
+    <android.support.v7.widget.AppCompatButton
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Search"
+        android:id="@+id/search_button"
+        android:layout_below="@+id/searchValue"
+        android:padding="@dimen/activity_horizontal_margin"
+        android:onClick="search"/>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_below="@+id/search_button"
+        android:layout_marginTop="10dp"
+        android:layout_height="wrap_content">
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/resultList" />
+    </ScrollView>
+</RelativeLayout>
diff --git a/Android/app/src/main/res/layout/activity_login.xml b/Android/app/src/main/res/layout/activity_login.xml
index a7ef927..dc460af 100644
--- a/Android/app/src/main/res/layout/activity_login.xml
+++ b/Android/app/src/main/res/layout/activity_login.xml
@@ -1,101 +1,101 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".bookmypcr.activities.LoginActivity">
-
-    <!-- Login progress -->
-    <ProgressBar
-        android:id="@+id/login_progress"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:visibility="gone" />
-
-    <ScrollView
-        android:id="@+id/login_form"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/email_login_form"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" android:text="Welcome" android:gravity="center_horizontal" />
-
-            <android.support.design.widget.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <AutoCompleteTextView
-                    android:id="@+id/email"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/prompt_email"
-                    android:inputType="textEmailAddress"
-                    android:maxLines="1"
-                    android:singleLine="true" />
-
-            </android.support.design.widget.TextInputLayout>
-
-            <android.support.design.widget.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <EditText
-                    android:id="@+id/password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/prompt_password"
-                    android:imeActionId="6"
-                    android:imeActionLabel="@string/action_sign_in_short"
-                    android:imeOptions="actionUnspecified"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:singleLine="true" />
-
-            </android.support.design.widget.TextInputLayout>
-
-            <Button
-                android:id="@+id/email_sign_in_button"
-                style="?android:textAppearanceSmall"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="@string/action_sign_in"
-                android:textStyle="bold" />
-
-            <TextView
-                android:paddingTop="10dp"
-                android:textAlignment="center"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clickable="true"
-                android:textColor="@color/blue"
-                android:onClick="newUser"
-                android:text="@string/register"/>
-
-            <TextView
-                android:paddingTop="10dp"
-                android:textAlignment="center"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clickable="true"
-                android:textColor="@color/blue"
-                android:onClick="resetPassword"
-                android:text="@string/forgot"/>
-
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context=".bookmypcr.activities.LoginActivity">
+
+    <!-- Login progress -->
+    <ProgressBar
+        android:id="@+id/login_progress"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:visibility="gone" />
+
+    <ScrollView
+        android:id="@+id/login_form"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:id="@+id/email_login_form"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" android:text="Welcome" android:gravity="center_horizontal" />
+
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <AutoCompleteTextView
+                    android:id="@+id/email"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/prompt_email"
+                    android:inputType="textEmailAddress"
+                    android:maxLines="1"
+                    android:singleLine="true" />
+
+            </android.support.design.widget.TextInputLayout>
+
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <EditText
+                    android:id="@+id/password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/prompt_password"
+                    android:imeActionId="6"
+                    android:imeActionLabel="@string/action_sign_in_short"
+                    android:imeOptions="actionUnspecified"
+                    android:inputType="textPassword"
+                    android:maxLines="1"
+                    android:singleLine="true" />
+
+            </android.support.design.widget.TextInputLayout>
+
+            <Button
+                android:id="@+id/email_sign_in_button"
+                style="?android:textAppearanceSmall"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/action_sign_in"
+                android:textStyle="bold" />
+
+            <TextView
+                android:paddingTop="10dp"
+                android:textAlignment="center"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clickable="true"
+                android:textColor="@color/blue"
+                android:onClick="newUser"
+                android:text="@string/register"/>
+
+            <TextView
+                android:paddingTop="10dp"
+                android:textAlignment="center"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clickable="true"
+                android:textColor="@color/blue"
+                android:onClick="resetPassword"
+                android:text="@string/forgot"/>
+
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
diff --git a/Android/app/src/main/res/layout/activity_new_event.xml b/Android/app/src/main/res/layout/activity_new_event.xml
index 25c71ff..54c09a8 100644
--- a/Android/app/src/main/res/layout/activity_new_event.xml
+++ b/Android/app/src/main/res/layout/activity_new_event.xml
@@ -1,132 +1,132 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".bookmypcr.activities.NewEvent">
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/maintoolbar"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" >
-
-
-            <Button
-                android:id="@+id/Save"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right|end"
-                android:background="?android:selectableItemBackground"
-                android:text="Save"
-                android:onClick="saveEvent"/>
-
-        </android.support.v7.widget.Toolbar>
-
-    </android.support.design.widget.AppBarLayout>
-<ScrollView
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" android:layout_below="@+id/maintoolbar">
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" android:id="@+id/mainLayout">
-    <android.support.v7.widget.AppCompatEditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="50dp"
-        android:hint="Add Title"
-        android:id="@+id/title" />
-
-    <android.support.v7.widget.AppCompatTextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" android:text="From"
-        android:textStyle="bold"
-        android:layout_marginTop="15dp"
-        android:layout_marginLeft="10dp"
-        android:textSize="20dp"
-        android:id="@+id/from"
-        android:layout_below="@+id/title"/>
-
-    <android.support.v7.widget.AppCompatTextView
-        android:layout_width="150dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="10dp"
-        android:textSize="20dp"
-        android:id="@+id/datebar"
-        android:layout_below="@+id/from" />
-
-    <Spinner
-        android:id="@+id/startTime"
-        android:layout_width="150dp"
-        android:layout_marginTop="15dp"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/from"
-        android:layout_toRightOf="@id/datebar"
-        />
-
-
-
-    <android.support.v7.widget.AppCompatTextView
-        android:layout_width="wrap_content"
-        android:layout_marginTop="15dp"
-        android:layout_height="wrap_content" android:text="To"
-        android:textStyle="bold"
-        android:textSize="20dp"
-        android:layout_marginLeft="10dp"
-        android:id="@+id/to"
-        android:layout_below="@+id/datebar"/>
-
-    <android.support.v7.widget.AppCompatTextView
-        android:layout_width="150dp"
-        android:layout_marginTop="15dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:textSize="20dp"
-        android:id="@+id/enddatebar"
-        android:layout_below="@+id/to" />
-
-    <Spinner
-        android:id="@+id/endTime"
-        android:layout_width="150dp"
-        android:layout_marginTop="15dp"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/enddatebar"
-        android:layout_below="@+id/to"
-        />
-
-    <android.support.v7.widget.AppCompatEditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="50dp"
-        android:id="@+id/reaction"
-        android:layout_below="@+id/endTime"
-        android:hint="Reaction Specification"/>
-
-    <android.support.v7.widget.AppCompatEditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="50dp"
-        android:id="@+id/comments"
-        android:layout_below="@+id/reaction"
-        android:hint="Additional Comments"/>
-    </RelativeLayout>
-</ScrollView>
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".bookmypcr.activities.NewEvent">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/maintoolbar"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" >
+
+
+            <Button
+                android:id="@+id/Save"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right|end"
+                android:background="?android:selectableItemBackground"
+                android:text="Save"
+                android:onClick="saveEvent"/>
+
+        </android.support.v7.widget.Toolbar>
+
+    </android.support.design.widget.AppBarLayout>
+<ScrollView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" android:layout_below="@+id/maintoolbar">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" android:id="@+id/mainLayout">
+    <android.support.v7.widget.AppCompatEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="50dp"
+        android:hint="Add Title"
+        android:id="@+id/title" />
+
+    <android.support.v7.widget.AppCompatTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" android:text="From"
+        android:textStyle="bold"
+        android:layout_marginTop="15dp"
+        android:layout_marginLeft="10dp"
+        android:textSize="20dp"
+        android:id="@+id/from"
+        android:layout_below="@+id/title"/>
+
+    <android.support.v7.widget.AppCompatTextView
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="10dp"
+        android:textSize="20dp"
+        android:id="@+id/datebar"
+        android:layout_below="@+id/from" />
+
+    <Spinner
+        android:id="@+id/startTime"
+        android:layout_width="150dp"
+        android:layout_marginTop="15dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/from"
+        android:layout_toRightOf="@id/datebar"
+        />
+
+
+
+    <android.support.v7.widget.AppCompatTextView
+        android:layout_width="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_height="wrap_content" android:text="To"
+        android:textStyle="bold"
+        android:textSize="20dp"
+        android:layout_marginLeft="10dp"
+        android:id="@+id/to"
+        android:layout_below="@+id/datebar"/>
+
+    <android.support.v7.widget.AppCompatTextView
+        android:layout_width="150dp"
+        android:layout_marginTop="15dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:textSize="20dp"
+        android:id="@+id/enddatebar"
+        android:layout_below="@+id/to" />
+
+    <Spinner
+        android:id="@+id/endTime"
+        android:layout_width="150dp"
+        android:layout_marginTop="15dp"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/enddatebar"
+        android:layout_below="@+id/to"
+        />
+
+    <android.support.v7.widget.AppCompatEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="50dp"
+        android:id="@+id/reaction"
+        android:layout_below="@+id/endTime"
+        android:hint="Reaction Specification"/>
+
+    <android.support.v7.widget.AppCompatEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="50dp"
+        android:id="@+id/comments"
+        android:layout_below="@+id/reaction"
+        android:hint="Additional Comments"/>
+    </RelativeLayout>
+</ScrollView>
+
+</RelativeLayout>
diff --git a/Android/app/src/main/res/layout/activity_new_user.xml b/Android/app/src/main/res/layout/activity_new_user.xml
index 70f0e1e..fe726b6 100644
--- a/Android/app/src/main/res/layout/activity_new_user.xml
+++ b/Android/app/src/main/res/layout/activity_new_user.xml
@@ -1,111 +1,111 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".bookmypcr.activities.NewUser">
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/maintoolbar"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" >
-
-        </android.support.v7.widget.Toolbar>
-
-    </android.support.design.widget.AppBarLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="@dimen/activity_horizontal_margin">
-
-
-        <android.support.v7.widget.AppCompatTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" android:text="Welcome" android:gravity="center_horizontal" />
-
-        <android.support.design.widget.TextInputLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <EditText
-                android:id="@+id/name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="Name"
-                android:maxLines="1"
-                android:singleLine="true" />
-
-        </android.support.design.widget.TextInputLayout>
-
-        <android.support.design.widget.TextInputLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <EditText
-                android:id="@+id/email"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="Email address"
-                android:inputType="textEmailAddress"
-                android:maxLines="1"
-                android:singleLine="true" />
-
-        </android.support.design.widget.TextInputLayout>
-
-            <EditText
-                android:id="@+id/password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:focusableInTouchMode="true"
-                android:hint="Password"
-                android:inputType="textPassword"
-                android:maxLines="1"
-                android:singleLine="true" />
-
-            <EditText
-                android:id="@+id/confirmpassword"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:focusableInTouchMode="true"
-                android:hint="Confirm password"
-                android:inputType="textPassword"
-                android:maxLines="1"
-                android:singleLine="true" />
-
-
-        <Button
-            android:id="@+id/sign_up_button"
-            style="?android:textAppearanceSmall"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="Register"
-            android:textColor="@android:color/black"
-            android:textStyle="bold" />
-
-
-        <!-- Link to Login Screen -->
-
-    </LinearLayout>
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_gravity="center|bottom"
-        android:layout_marginBottom="20dp"
-        android:visibility="gone" />
-
-</android.support.constraint.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".bookmypcr.activities.NewUser">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/maintoolbar"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" >
+
+        </android.support.v7.widget.Toolbar>
+
+    </android.support.design.widget.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="@dimen/activity_horizontal_margin">
+
+
+        <android.support.v7.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" android:text="Welcome" android:gravity="center_horizontal" />
+
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Name"
+                android:maxLines="1"
+                android:singleLine="true" />
+
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/email"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Email address"
+                android:inputType="textEmailAddress"
+                android:maxLines="1"
+                android:singleLine="true" />
+
+        </android.support.design.widget.TextInputLayout>
+
+            <EditText
+                android:id="@+id/password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:focusableInTouchMode="true"
+                android:hint="Password"
+                android:inputType="textPassword"
+                android:maxLines="1"
+                android:singleLine="true" />
+
+            <EditText
+                android:id="@+id/confirmpassword"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:focusableInTouchMode="true"
+                android:hint="Confirm password"
+                android:inputType="textPassword"
+                android:maxLines="1"
+                android:singleLine="true" />
+
+
+        <Button
+            android:id="@+id/sign_up_button"
+            style="?android:textAppearanceSmall"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="Register"
+            android:textColor="@android:color/black"
+            android:textStyle="bold" />
+
+
+        <!-- Link to Login Screen -->
+
+    </LinearLayout>
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_gravity="center|bottom"
+        android:layout_marginBottom="20dp"
+        android:visibility="gone" />
+
+</android.support.constraint.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/activity_no_access.xml b/Android/app/src/main/res/layout/activity_no_access.xml
index 1875f09..82e67dc 100644
--- a/Android/app/src/main/res/layout/activity_no_access.xml
+++ b/Android/app/src/main/res/layout/activity_no_access.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".bookmypcr.activities.NoAccess">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="@dimen/activity_horizontal_margin">
-
-    <android.support.v7.widget.AppCompatTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Do not have access. Please contact your administrator\n Or"
-        android:textStyle="bold"
-        android:gravity="center"
-        android:layout_gravity="center_horizontal|center"
-        android:textSize="15dp"/>
-
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Join a Lab Account"
-            android:onClick="joinLab"/>
-        <android.support.v7.widget.AppCompatTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Or"
-            android:textStyle="bold"
-            android:gravity="center"
-            android:layout_gravity="center_horizontal|center"
-            android:textSize="15dp"/>
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Create a Lab Account"
-            android:onClick="createLab"/>
-    <Button
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Sign Out"
-        android:layout_marginTop="50dp"
-        android:onClick="signOut"/>
-
-    </LinearLayout>
-</android.support.constraint.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".bookmypcr.activities.NoAccess">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="@dimen/activity_horizontal_margin">
+
+    <android.support.v7.widget.AppCompatTextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Do not have access. Please contact your administrator\n Or"
+        android:textStyle="bold"
+        android:gravity="center"
+        android:layout_gravity="center_horizontal|center"
+        android:textSize="15dp"/>
+
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Join a Lab Account"
+            android:onClick="joinLab"/>
+        <android.support.v7.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Or"
+            android:textStyle="bold"
+            android:gravity="center"
+            android:layout_gravity="center_horizontal|center"
+            android:textSize="15dp"/>
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Create a Lab Account"
+            android:onClick="createLab"/>
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Sign Out"
+        android:layout_marginTop="50dp"
+        android:onClick="signOut"/>
+
+    </LinearLayout>
+</android.support.constraint.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/activity_reset_password.xml b/Android/app/src/main/res/layout/activity_reset_password.xml
index 03a373b..dcd00c2 100644
--- a/Android/app/src/main/res/layout/activity_reset_password.xml
+++ b/Android/app/src/main/res/layout/activity_reset_password.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".bookmypcr.activities.ResetPassword">
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/maintoolbar"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" >
-
-        </android.support.v7.widget.Toolbar>
-
-    </android.support.design.widget.AppBarLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="@dimen/activity_horizontal_margin">
-
-
-    <android.support.v7.widget.AppCompatTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" android:text="Welcome" android:gravity="center_horizontal" />
-
-    <android.support.design.widget.TextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <EditText
-            android:id="@+id/email"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="Enter Email Address"
-            android:maxLines="1"
-            android:inputType="textEmailAddress"
-            android:singleLine="true" />
-
-    </android.support.design.widget.TextInputLayout>
-        <Button
-            android:id="@+id/reset_button"
-            style="?android:textAppearanceSmall"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="Reset Password"
-            android:textColor="@android:color/black"
-            android:textStyle="bold" />
-
-    </LinearLayout>
-
-
-</android.support.constraint.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".bookmypcr.activities.ResetPassword">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/maintoolbar"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" >
+
+        </android.support.v7.widget.Toolbar>
+
+    </android.support.design.widget.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="@dimen/activity_horizontal_margin">
+
+
+    <android.support.v7.widget.AppCompatTextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" android:text="Welcome" android:gravity="center_horizontal" />
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <EditText
+            android:id="@+id/email"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Enter Email Address"
+            android:maxLines="1"
+            android:inputType="textEmailAddress"
+            android:singleLine="true" />
+
+    </android.support.design.widget.TextInputLayout>
+        <Button
+            android:id="@+id/reset_button"
+            style="?android:textAppearanceSmall"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="Reset Password"
+            android:textColor="@android:color/black"
+            android:textStyle="bold" />
+
+    </LinearLayout>
+
+
+</android.support.constraint.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/activity_settings.xml b/Android/app/src/main/res/layout/activity_settings.xml
index 0aac31a..d1e7b00 100644
--- a/Android/app/src/main/res/layout/activity_settings.xml
+++ b/Android/app/src/main/res/layout/activity_settings.xml
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:app="http://schemas.android.com/apk/res-auto"
-xmlns:tools="http://schemas.android.com/tools"
-android:id="@+id/mainLayout"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
-tools:context=".bookmypcr.activities.Settings">
-
-<android.support.design.widget.AppBarLayout
-    android:id="@+id/temp"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:theme="@style/AppTheme.AppBarOverlay">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        app:popupTheme="@style/AppTheme.PopupOverlay" >
-        <Button
-            android:id="@+id/Save"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right|end"
-            android:background="?android:selectableItemBackground"
-            android:text="Save"
-            android:onClick="saveLab"/>
-
-    </android.support.v7.widget.Toolbar>
-
-</android.support.design.widget.AppBarLayout>
-
-<!--<include-->
-<!--android:id="@+id/include"-->
-<!--layout="@layout/content_sharing" />-->
-<TextView
-    android:id="@+id/labNameText"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_below="@+id/temp"
-    android:padding="10dp"
-    android:text="LAB Name"
-    android:textStyle="bold" />
-<EditText
-    android:id="@+id/editLabName"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_below="@+id/labNameText"
-    android:ems="10"
-    android:inputType="textPersonName" />
-
-<TextView
-    android:id="@+id/textView"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_below="@+id/editLabName"
-    android:padding="10dp"
-    android:text="LAB Members"
-    android:background="@color/row_activated"
-    android:textStyle="bold" />
-<RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" android:layout_below="@+id/textView" android:id="@+id/rel"
-    android:clickable="true" android:background="?attr/selectableItemBackground" android:onClick="addPopup">
-    <ImageView
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:id="@+id/addimage"
-        android:src="@drawable/ic_add_black_24dp"/>
-    <TextView
-        android:id="@+id/addMembers"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/addimage"
-        android:padding="10dp"
-        android:text="Add Person to group"
-        android:textStyle="bold" />
-</RelativeLayout>
-<!--<EditText-->
-<!--android:id="@+id/editText"-->
-<!--android:layout_width="match_parent"-->
-<!--android:layout_height="wrap_content"-->
-<!--android:layout_below="@+id/addMembers"-->
-<!--android:ems="10"-->
-<!--android:inputType="textEmailAddress" />-->
-
-<!--<Button-->
-<!--android:id="@+id/button2"-->
-<!--android:layout_width="wrap_content"-->
-<!--android:layout_height="wrap_content"-->
-<!--android:layout_below="@+id/editText"-->
-<!--android:onClick="addUser"-->
-<!--android:text="Add User" />-->
-
-
-<ListView
-    android:id="@+id/listView1"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_below="@+id/rel" />
-
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:app="http://schemas.android.com/apk/res-auto"
+xmlns:tools="http://schemas.android.com/tools"
+android:id="@+id/mainLayout"
+android:layout_width="match_parent"
+android:layout_height="match_parent"
+tools:context=".bookmypcr.activities.Settings">
+
+<android.support.design.widget.AppBarLayout
+    android:id="@+id/temp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:theme="@style/AppTheme.AppBarOverlay">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:popupTheme="@style/AppTheme.PopupOverlay" >
+        <Button
+            android:id="@+id/Save"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right|end"
+            android:background="?android:selectableItemBackground"
+            android:text="Save"
+            android:onClick="saveLab"/>
+
+    </android.support.v7.widget.Toolbar>
+
+</android.support.design.widget.AppBarLayout>
+
+<!--<include-->
+<!--android:id="@+id/include"-->
+<!--layout="@layout/content_sharing" />-->
+<TextView
+    android:id="@+id/labNameText"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_below="@+id/temp"
+    android:padding="10dp"
+    android:text="LAB Name"
+    android:textStyle="bold" />
+<EditText
+    android:id="@+id/editLabName"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_below="@+id/labNameText"
+    android:ems="10"
+    android:inputType="textPersonName" />
+
+<TextView
+    android:id="@+id/textView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_below="@+id/editLabName"
+    android:padding="10dp"
+    android:text="LAB Members"
+    android:background="@color/row_activated"
+    android:textStyle="bold" />
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" android:layout_below="@+id/textView" android:id="@+id/rel"
+    android:clickable="true" android:background="?attr/selectableItemBackground" android:onClick="addPopup">
+    <ImageView
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:id="@+id/addimage"
+        android:src="@drawable/ic_add_black_24dp"/>
+    <TextView
+        android:id="@+id/addMembers"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/addimage"
+        android:padding="10dp"
+        android:text="Add Person to group"
+        android:textStyle="bold" />
+</RelativeLayout>
+<!--<EditText-->
+<!--android:id="@+id/editText"-->
+<!--android:layout_width="match_parent"-->
+<!--android:layout_height="wrap_content"-->
+<!--android:layout_below="@+id/addMembers"-->
+<!--android:ems="10"-->
+<!--android:inputType="textEmailAddress" />-->
+
+<!--<Button-->
+<!--android:id="@+id/button2"-->
+<!--android:layout_width="wrap_content"-->
+<!--android:layout_height="wrap_content"-->
+<!--android:layout_below="@+id/editText"-->
+<!--android:onClick="addUser"-->
+<!--android:text="Add User" />-->
+
+
+<ListView
+    android:id="@+id/listView1"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_below="@+id/rel" />
+
+
+</RelativeLayout>
diff --git a/Android/app/src/main/res/layout/activity_sign_up.xml b/Android/app/src/main/res/layout/activity_sign_up.xml
index 5281e79..23cd40d 100644
--- a/Android/app/src/main/res/layout/activity_sign_up.xml
+++ b/Android/app/src/main/res/layout/activity_sign_up.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".bookmypcr.activities.SignUp">
-
-</android.support.constraint.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".bookmypcr.activities.SignUp">
+
+</android.support.constraint.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/activity_view_event.xml b/Android/app/src/main/res/layout/activity_view_event.xml
index aad733a..1d9ce49 100644
--- a/Android/app/src/main/res/layout/activity_view_event.xml
+++ b/Android/app/src/main/res/layout/activity_view_event.xml
@@ -1,124 +1,124 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".bookmypcr.activities.ViewEvent">
-
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/maintoolbar"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" >
-
-        </android.support.v7.widget.Toolbar>
-
-    </android.support.design.widget.AppBarLayout>
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" android:layout_below="@+id/maintoolbar">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:hint="Add Title"
-                android:id="@+id/title" />
-
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:text="From"
-                android:textStyle="bold"
-                android:layout_marginTop="15dp"
-                android:layout_marginLeft="10dp"
-                android:textSize="20dp"
-                android:id="@+id/from"
-                android:layout_below="@+id/title"/>
-
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="150dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="10dp"
-                android:textSize="20dp"
-                android:id="@+id/datebar"
-                android:layout_below="@+id/from" />
-
-            <android.support.v7.widget.AppCompatTextView
-                android:id="@+id/startTime"
-                android:layout_width="150dp"
-                android:layout_marginTop="15dp"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/from"
-                android:layout_toRightOf="@id/datebar"
-                />
-
-
-
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_marginTop="15dp"
-                android:layout_height="wrap_content" android:text="To"
-                android:textStyle="bold"
-                android:textSize="20dp"
-                android:layout_marginLeft="10dp"
-                android:id="@+id/to"
-                android:layout_below="@+id/datebar"/>
-
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="150dp"
-                android:layout_marginTop="15dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:textSize="20dp"
-                android:id="@+id/enddatebar"
-                android:layout_below="@+id/to" />
-
-            <android.support.v7.widget.AppCompatTextView
-                android:id="@+id/endTime"
-                android:layout_width="150dp"
-                android:layout_marginTop="15dp"
-                android:layout_height="wrap_content"
-                android:layout_toRightOf="@id/enddatebar"
-                android:layout_below="@+id/to"
-                />
-
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="50dp"
-                android:id="@+id/reaction"
-                android:layout_below="@+id/endTime"
-                android:hint="Reaction Specification"/>
-
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="50dp"
-                android:id="@+id/comments"
-                android:layout_below="@+id/reaction"
-                android:hint="Additional Comments"/>
-        </RelativeLayout>
-    </ScrollView>
-
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".bookmypcr.activities.ViewEvent">
+
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/maintoolbar"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" >
+
+        </android.support.v7.widget.Toolbar>
+
+    </android.support.design.widget.AppBarLayout>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" android:layout_below="@+id/maintoolbar">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:hint="Add Title"
+                android:id="@+id/title" />
+
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" android:text="From"
+                android:textStyle="bold"
+                android:layout_marginTop="15dp"
+                android:layout_marginLeft="10dp"
+                android:textSize="20dp"
+                android:id="@+id/from"
+                android:layout_below="@+id/title"/>
+
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="150dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="10dp"
+                android:textSize="20dp"
+                android:id="@+id/datebar"
+                android:layout_below="@+id/from" />
+
+            <android.support.v7.widget.AppCompatTextView
+                android:id="@+id/startTime"
+                android:layout_width="150dp"
+                android:layout_marginTop="15dp"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/from"
+                android:layout_toRightOf="@id/datebar"
+                />
+
+
+
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_marginTop="15dp"
+                android:layout_height="wrap_content" android:text="To"
+                android:textStyle="bold"
+                android:textSize="20dp"
+                android:layout_marginLeft="10dp"
+                android:id="@+id/to"
+                android:layout_below="@+id/datebar"/>
+
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="150dp"
+                android:layout_marginTop="15dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:textSize="20dp"
+                android:id="@+id/enddatebar"
+                android:layout_below="@+id/to" />
+
+            <android.support.v7.widget.AppCompatTextView
+                android:id="@+id/endTime"
+                android:layout_width="150dp"
+                android:layout_marginTop="15dp"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/enddatebar"
+                android:layout_below="@+id/to"
+                />
+
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="50dp"
+                android:id="@+id/reaction"
+                android:layout_below="@+id/endTime"
+                android:hint="Reaction Specification"/>
+
+            <android.support.v7.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="50dp"
+                android:id="@+id/comments"
+                android:layout_below="@+id/reaction"
+                android:hint="Additional Comments"/>
+        </RelativeLayout>
+    </ScrollView>
+
+
+</RelativeLayout>
diff --git a/Android/app/src/main/res/layout/app_bar_calendar.xml b/Android/app/src/main/res/layout/app_bar_calendar.xml
index 12c2423..8d88daf 100644
--- a/Android/app/src/main/res/layout/app_bar_calendar.xml
+++ b/Android/app/src/main/res/layout/app_bar_calendar.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".bookmypcr.activities.CalendarActivity">
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-    </android.support.design.widget.AppBarLayout>
-
-    <include layout="@layout/content_calendar" />
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_input_add" />
-
-</android.support.design.widget.CoordinatorLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".bookmypcr.activities.CalendarActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_calendar" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        app:srcCompat="@android:drawable/ic_input_add" />
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/Android/app/src/main/res/layout/content_calendar.xml b/Android/app/src/main/res/layout/content_calendar.xml
index ecd63ed..0ac5f2d 100644
--- a/Android/app/src/main/res/layout/content_calendar.xml
+++ b/Android/app/src/main/res/layout/content_calendar.xml
@@ -1,549 +1,549 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:app="http://schemas.android.com/apk/res-auto"
-xmlns:tools="http://schemas.android.com/tools"
-app:layout_behavior="@string/appbar_scrolling_view_behavior"
-tools:context=".bookmypcr.activities.CalendarActivity"
-tools:showIn="@layout/app_bar_calendar" android:layout_width="match_parent"
-android:layout_height="wrap_content"
-android:paddingTop="8dp"
-android:paddingBottom="8dp"
-android:orientation="horizontal"
-    >
-    <Spinner
-        android:id="@+id/spinner"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="60dp"
-        android:paddingBottom="20dp"
-        />
-    <LinearLayout
-        android:layout_below="@+id/spinner"
-        android:id="@+id/datebar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-<ImageView
-    android:id="@+id/previous_day"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_gravity="left"
-    android:onClick="previousDay"
-    android:contentDescription="@string/app_name"
-    android:src="@drawable/ic_keyboard_arrow_left_black_24dp"
-    android:layout_weight="1"/>
-<TextView
-    android:id="@+id/display_current_date"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:textColor="@color/colorBlack"
-    android:layout_marginTop="4dp"
-    android:textStyle="bold"
-    android:layout_weight="3"/>
-<ImageView
-    android:id="@+id/next_day"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_gravity="left"
-    android:onClick="nextDay"
-    android:contentDescription="@string/app_name"
-    android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
-    android:layout_weight="1"/>
-
-</LinearLayout>
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="1dp"
-        android:layout_below="@+id/datebar"
-        android:id="@+id/divider"
-        android:background="@color/colorDivider" />
-<ScrollView
-    android:layout_below="@+id/divider"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/scroll">
-
-    <FrameLayout
-        android:id="@+id/frameitem"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-    </FrameLayout>
-
-    </ScrollView>
-</RelativeLayout>
-
-<!--<LinearLayout-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:orientation="horizontal">-->
-    <!--<RelativeLayout-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="1500dp"-->
-        <!--android:layout_weight="2">-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_12am"-->
-            <!--android:paddingTop="20dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="60dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_1am"-->
-            <!--android:paddingTop="80dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="120dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_2am"-->
-            <!--android:paddingTop="140dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="180dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_3am"-->
-            <!--android:paddingTop="200dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="240dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_4am"-->
-            <!--android:paddingTop="260dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="300dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_5am"-->
-            <!--android:paddingTop="320dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="360dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_6am"-->
-            <!--android:paddingTop="380dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="420dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_7am"-->
-            <!--android:paddingTop="440dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="480dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_8am"-->
-            <!--android:paddingTop="500dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="540dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_9am"-->
-            <!--android:paddingTop="560dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="600dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_10am"-->
-            <!--android:paddingTop="620dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="660dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_11am"-->
-            <!--android:paddingTop="680dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="720dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_12pm"-->
-            <!--android:paddingTop="740dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="780dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_13pm"-->
-            <!--android:paddingTop="800dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="840dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_14pm"-->
-            <!--android:paddingTop="860dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="900dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_15pm"-->
-            <!--android:paddingTop="920dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="960dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_16pm"-->
-            <!--android:paddingTop="980dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1020dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_17pm"-->
-            <!--android:paddingTop="1040dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1080dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_18pm"-->
-            <!--android:paddingTop="1100dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1140dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_19pm"-->
-            <!--android:paddingTop="1160dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1200dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_20pm"-->
-            <!--android:paddingTop="1220dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1260dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_21pm"-->
-            <!--android:paddingTop="1280dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1320dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_22pm"-->
-            <!--android:paddingTop="1340dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1380dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_23pm"-->
-            <!--android:paddingTop="1400dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1440dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<TextView-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:textColor="@color/colorBlack"-->
-            <!--android:textStyle="bold"-->
-            <!--android:text="@string/time_24pm"-->
-            <!--android:paddingTop="1460dp"-->
-            <!--android:layout_centerHorizontal="true"/>-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1500dp"-->
-            <!--android:background="@color/colorDivider" />-->
-    <!--</RelativeLayout>-->
-    <!--<View-->
-        <!--android:layout_width="1dp"-->
-        <!--android:layout_height="match_parent"-->
-        <!--android:background="@color/colorDivider" />-->
-    <!--<RelativeLayout-->
-        <!--android:id="@+id/left_event_column"-->
-        <!--android:layout_width="0dp"-->
-        <!--android:layout_height="1500dp"-->
-        <!--android:layout_weight="8">-->
-        <!--<View-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="60dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="120dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="180dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="240dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="300dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="360dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="420dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="480dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="540dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="600dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="660dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="720dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="780dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="840dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="900dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="960dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1020dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1080dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1140dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1200dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1260dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1320dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1380dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1440dp"-->
-            <!--android:background="@color/colorDivider" />-->
-        <!--<View-->
-            <!--android:layout_width="fill_parent"-->
-            <!--android:layout_height="1dp"-->
-            <!--android:layout_marginTop="1500dp"-->
-            <!--android:background="@color/colorDivider" />-->
-    <!--</RelativeLayout>-->
-<!--</LinearLayout>-->
-<!--</ScrollView>-->
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:app="http://schemas.android.com/apk/res-auto"
+xmlns:tools="http://schemas.android.com/tools"
+app:layout_behavior="@string/appbar_scrolling_view_behavior"
+tools:context=".bookmypcr.activities.CalendarActivity"
+tools:showIn="@layout/app_bar_calendar" android:layout_width="match_parent"
+android:layout_height="wrap_content"
+android:paddingTop="8dp"
+android:paddingBottom="8dp"
+android:orientation="horizontal"
+    >
+    <Spinner
+        android:id="@+id/spinner"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="60dp"
+        android:paddingBottom="20dp"
+        />
+    <LinearLayout
+        android:layout_below="@+id/spinner"
+        android:id="@+id/datebar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+<ImageView
+    android:id="@+id/previous_day"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_gravity="left"
+    android:onClick="previousDay"
+    android:contentDescription="@string/app_name"
+    android:src="@drawable/ic_keyboard_arrow_left_black_24dp"
+    android:layout_weight="1"/>
+<TextView
+    android:id="@+id/display_current_date"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:textColor="@color/colorBlack"
+    android:layout_marginTop="4dp"
+    android:textStyle="bold"
+    android:layout_weight="3"/>
+<ImageView
+    android:id="@+id/next_day"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_gravity="left"
+    android:onClick="nextDay"
+    android:contentDescription="@string/app_name"
+    android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
+    android:layout_weight="1"/>
+
+</LinearLayout>
+    <View
+        android:layout_width="fill_parent"
+        android:layout_height="1dp"
+        android:layout_below="@+id/datebar"
+        android:id="@+id/divider"
+        android:background="@color/colorDivider" />
+<ScrollView
+    android:layout_below="@+id/divider"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/scroll">
+
+    <FrameLayout
+        android:id="@+id/frameitem"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+    </FrameLayout>
+
+    </ScrollView>
+</RelativeLayout>
+
+<!--<LinearLayout-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:orientation="horizontal">-->
+    <!--<RelativeLayout-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="1500dp"-->
+        <!--android:layout_weight="2">-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_12am"-->
+            <!--android:paddingTop="20dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="60dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_1am"-->
+            <!--android:paddingTop="80dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="120dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_2am"-->
+            <!--android:paddingTop="140dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="180dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_3am"-->
+            <!--android:paddingTop="200dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="240dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_4am"-->
+            <!--android:paddingTop="260dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="300dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_5am"-->
+            <!--android:paddingTop="320dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="360dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_6am"-->
+            <!--android:paddingTop="380dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="420dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_7am"-->
+            <!--android:paddingTop="440dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="480dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_8am"-->
+            <!--android:paddingTop="500dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="540dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_9am"-->
+            <!--android:paddingTop="560dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="600dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_10am"-->
+            <!--android:paddingTop="620dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="660dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_11am"-->
+            <!--android:paddingTop="680dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="720dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_12pm"-->
+            <!--android:paddingTop="740dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="780dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_13pm"-->
+            <!--android:paddingTop="800dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="840dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_14pm"-->
+            <!--android:paddingTop="860dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="900dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_15pm"-->
+            <!--android:paddingTop="920dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="960dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_16pm"-->
+            <!--android:paddingTop="980dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1020dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_17pm"-->
+            <!--android:paddingTop="1040dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1080dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_18pm"-->
+            <!--android:paddingTop="1100dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1140dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_19pm"-->
+            <!--android:paddingTop="1160dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1200dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_20pm"-->
+            <!--android:paddingTop="1220dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1260dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_21pm"-->
+            <!--android:paddingTop="1280dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1320dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_22pm"-->
+            <!--android:paddingTop="1340dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1380dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_23pm"-->
+            <!--android:paddingTop="1400dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1440dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<TextView-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:textColor="@color/colorBlack"-->
+            <!--android:textStyle="bold"-->
+            <!--android:text="@string/time_24pm"-->
+            <!--android:paddingTop="1460dp"-->
+            <!--android:layout_centerHorizontal="true"/>-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1500dp"-->
+            <!--android:background="@color/colorDivider" />-->
+    <!--</RelativeLayout>-->
+    <!--<View-->
+        <!--android:layout_width="1dp"-->
+        <!--android:layout_height="match_parent"-->
+        <!--android:background="@color/colorDivider" />-->
+    <!--<RelativeLayout-->
+        <!--android:id="@+id/left_event_column"-->
+        <!--android:layout_width="0dp"-->
+        <!--android:layout_height="1500dp"-->
+        <!--android:layout_weight="8">-->
+        <!--<View-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="60dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="120dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="180dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="240dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="300dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="360dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="420dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="480dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="540dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="600dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="660dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="720dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="780dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="840dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="900dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="960dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1020dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1080dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1140dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1200dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1260dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1320dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1380dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1440dp"-->
+            <!--android:background="@color/colorDivider" />-->
+        <!--<View-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="1dp"-->
+            <!--android:layout_marginTop="1500dp"-->
+            <!--android:background="@color/colorDivider" />-->
+    <!--</RelativeLayout>-->
+<!--</LinearLayout>-->
+<!--</ScrollView>-->
 <!--</LinearLayout>-->
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/content_edit_event.xml b/Android/app/src/main/res/layout/content_edit_event.xml
index 5b44cdc..b9d1f4e 100644
--- a/Android/app/src/main/res/layout/content_edit_event.xml
+++ b/Android/app/src/main/res/layout/content_edit_event.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".bookmypcr.activities.EditEvent"
-    tools:showIn="@layout/activity_edit_event">
-
-</android.support.constraint.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".bookmypcr.activities.EditEvent"
+    tools:showIn="@layout/activity_edit_event">
+
+</android.support.constraint.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/content_new_event.xml b/Android/app/src/main/res/layout/content_new_event.xml
index 0ce16a4..d981aa7 100644
--- a/Android/app/src/main/res/layout/content_new_event.xml
+++ b/Android/app/src/main/res/layout/content_new_event.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".bookmypcr.activities.NewEvent"
-    tools:showIn="@layout/activity_new_event">
-
-</android.support.constraint.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".bookmypcr.activities.NewEvent"
+    tools:showIn="@layout/activity_new_event">
+
+</android.support.constraint.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/content_view_event.xml b/Android/app/src/main/res/layout/content_view_event.xml
index ba5ab45..4f10631 100644
--- a/Android/app/src/main/res/layout/content_view_event.xml
+++ b/Android/app/src/main/res/layout/content_view_event.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".bookmypcr.activities.ViewEvent"
-    tools:showIn="@layout/activity_view_event">
-
-</android.support.constraint.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".bookmypcr.activities.ViewEvent"
+    tools:showIn="@layout/activity_view_event">
+
+</android.support.constraint.ConstraintLayout>
diff --git a/Android/app/src/main/res/layout/item_frame.xml b/Android/app/src/main/res/layout/item_frame.xml
index 7f12f62..91e47fa 100644
--- a/Android/app/src/main/res/layout/item_frame.xml
+++ b/Android/app/src/main/res/layout/item_frame.xml
@@ -1,1050 +1,1050 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/listFrame">
-
-
-    <RelativeLayout
-        android:id="@+id/realtiveViewID"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_12am"
-            android:id="@+id/time_12am"
-            android:paddingTop="20dp"
-            android:paddingLeft="5dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_12am_click"
-            android:layout_marginRight="30dp"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_12am_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_12.30am_click"
-            android:layout_marginRight="30dp"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_12am"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_12am"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_1am"
-            android:id="@+id/time_1am"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_12am"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_1am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_1am_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_1.30am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_1am"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_1am"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_2am"
-            android:id="@+id/time_2am"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_1am"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_2am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_2am_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_2.30am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_2am"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_2am"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_3am"
-            android:id="@+id/time_3am"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_2am"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_3am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_3am_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_3.30am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_3am"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_3am"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_4am"
-            android:id="@+id/time_4am"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_3am"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_4am_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_4am_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_4.30am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_4am"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_4am"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_5am"
-            android:id="@+id/time_5am"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_4am"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_5am_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_5am_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_5.30am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_5am"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_5am"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_6am"
-            android:id="@+id/time_6am"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_5am"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_6am_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_6am_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_6.30am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_6am"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_6am"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_7am"
-            android:id="@+id/time_7am"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_6am"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_7am_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_7am_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_7.30am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_7am"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_7am"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_8am"
-            android:id="@+id/time_8am"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_7am"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_8am_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_8am_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_8.30am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_8am"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_8am"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_9am"
-            android:id="@+id/time_9am"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_8am"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_9am_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_9am_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_9.30am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_9am"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_9am"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_10am"
-            android:id="@+id/time_10am"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_9am"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_10am_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_10am_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_10.30am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_10am"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_10am"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_11am"
-            android:id="@+id/time_11am"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_10am"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_11am_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_11am_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_11.30am_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_11am"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_11am"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_12pm"
-            android:id="@+id/time_12pm"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_11am"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_12pm_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_12pm_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_12.30pm_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_12pm"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_12pm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_1pm"
-            android:id="@+id/time_1pm"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_12pm"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_1pm_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_1pm_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_1.30pm_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_1pm"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_1pm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_2pm"
-            android:id="@+id/time_2pm"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_1pm"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_2pm_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_2pm_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_2.30pm_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_2pm"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_2pm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_3pm"
-            android:id="@+id/time_3pm"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_2pm"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_3pm_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_3pm_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_3.30pm_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_3pm"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_3pm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_4pm"
-            android:id="@+id/time_4pm"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_3pm"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_4pm_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_4pm_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_4.30pm_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_4pm"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_4pm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_5pm"
-            android:id="@+id/time_5pm"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_4pm"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_5pm_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_5pm_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_5.30pm_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_5pm"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_5pm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_6pm"
-            android:id="@+id/time_6pm"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_5pm"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_6pm_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_6pm_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_6.30pm_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_6pm"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_6pm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_7pm"
-            android:id="@+id/time_7pm"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_6pm"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_7pm_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_7pm_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_7.30pm_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_7pm"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_7pm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_8pm"
-            android:id="@+id/time_8pm"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_7pm"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_8pm_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_8pm_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_8.30pm_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_8pm"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_8pm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_9pm"
-            android:id="@+id/time_9pm"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_8pm"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_9pm_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_9pm_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_9.30pm_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_9pm"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_9pm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_10pm"
-            android:id="@+id/time_10pm"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_9pm"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_10pm_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_10pm_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_10.30pm_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_10pm"
-            android:background="@color/colorDivider" />
-
-        <TextView
-            android:layout_below="@+id/time_10pm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorBlack"
-            android:text="@string/time_11pm"
-            android:id="@+id/time_11pm"
-            android:paddingLeft="5dp"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_10pm"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_11pm_click"
-            android:clickable="true"
-           android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            />
-        <TextView
-            android:layout_below="@+id/time_11pm_click"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="70dp"
-            android:id="@+id/time_11.30pm_click"
-            android:clickable="true"
-            android:onClick="addEvent"
-            android:layout_marginRight="30dp"
-            android:paddingBottom="5dp"
-            android:paddingTop="5dp"
-            /> <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/time_11pm"
-            android:background="@color/colorDivider" />
-
-    </RelativeLayout>
-
-</FrameLayout>
-
-
-
-<!--<TextView-->
-<!--android:layout_width="wrap_content"-->
-<!--android:layout_height="wrap_content"-->
-<!--android:textColor="@color/colorBlack"-->
-<!--android:textStyle="bold"-->
-<!--android:text="@string/time_1am"-->
-<!--android:paddingTop="20dp"-->
-<!--android:layout_centerHorizontal="true"/>-->
-<!--<View-->
-<!--android:layout_width="fill_parent"-->
-<!--android:layout_height="1dp"-->
-<!--android:layout_marginTop="60dp"-->
-<!--android:background="@color/colorDivider" />-->
-<!--<TextView-->
-<!--android:layout_width="wrap_content"-->
-<!--android:layout_height="wrap_content"-->
-<!--android:textColor="@color/colorBlack"-->
-<!--android:textStyle="bold"-->
-<!--android:id="@+id/time_2am"-->
-<!--android:text="@string/time_2am"-->
-<!--android:paddingTop="20dp"-->
-    <!--/>-->
-<!--<View-->
-<!--android:layout_width="fill_parent"-->
-<!--android:layout_height="1dp"-->
-<!--android:layout_marginTop="60dp"-->
-<!--android:background="@color/colorDivider" />-->
-<!--<TextView-->
-<!--android:layout_width="wrap_content"-->
-<!--android:layout_height="wrap_content"-->
-<!--android:textColor="@color/colorBlack"-->
-<!--android:textStyle="bold"-->
-<!--android:id="@id/time_3am"-->
-<!--android:text="@string/time_3am"-->
-<!--android:layout_below="@+id/time_2am"-->
-<!--android:paddingTop="20dp"-->
-    <!--/>-->
-<!--<View-->
-<!--android:layout_width="fill_parent"-->
-<!--android:layout_height="1dp"-->
-<!--android:layout_marginTop="60dp"-->
-<!--android:background="@color/colorDivider" />-->
-<!--<TextView-->
-<!--android:layout_width="wrap_content"-->
-<!--android:layout_height="wrap_content"-->
-<!--android:textColor="@color/colorBlack"-->
-<!--android:textStyle="bold"-->
-<!--android:text="@string/time_4am"-->
-<!--android:paddingTop="20dp"-->
-<!--android:layout_centerHorizontal="true"/>-->
-<!--<View-->
-<!--android:layout_width="fill_parent"-->
-<!--android:layout_height="1dp"-->
-<!--android:layout_marginTop="60dp"-->
-<!--android:background="@color/colorDivider" />-->
-    <!--&lt;!&ndash;</LinearLayout>&ndash;&gt;-->
-
-
-<!--<TextView-->
-<!--android:layout_width="match_parent"-->
-<!--android:layout_height="60dp"-->
-<!--android:textColor="@color/colorBlack"-->
-<!--android:background="@color/blueberry"-->
-<!--android:layout_marginLeft="60dp"-->
-<!--android:layout_marginRight="60dp"-->
-<!--android:textStyle="bold"-->
-<!--android:gravity="center"-->
-<!--android:layout_below="@+id/time_2am"-->
-<!--android:text="@string/time_4am"-->
-<!--android:layout_toRightOf="@+id/time_3am"-->
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/listFrame">
+
+
+    <RelativeLayout
+        android:id="@+id/realtiveViewID"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_12am"
+            android:id="@+id/time_12am"
+            android:paddingTop="20dp"
+            android:paddingLeft="5dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_12am_click"
+            android:layout_marginRight="30dp"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_12am_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_12.30am_click"
+            android:layout_marginRight="30dp"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_12am"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_12am"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_1am"
+            android:id="@+id/time_1am"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_12am"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_1am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_1am_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_1.30am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_1am"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_1am"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_2am"
+            android:id="@+id/time_2am"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_1am"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_2am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_2am_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_2.30am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_2am"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_2am"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_3am"
+            android:id="@+id/time_3am"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_2am"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_3am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_3am_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_3.30am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_3am"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_3am"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_4am"
+            android:id="@+id/time_4am"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_3am"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_4am_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_4am_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_4.30am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_4am"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_4am"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_5am"
+            android:id="@+id/time_5am"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_4am"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_5am_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_5am_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_5.30am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_5am"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_5am"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_6am"
+            android:id="@+id/time_6am"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_5am"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_6am_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_6am_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_6.30am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_6am"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_6am"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_7am"
+            android:id="@+id/time_7am"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_6am"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_7am_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_7am_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_7.30am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_7am"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_7am"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_8am"
+            android:id="@+id/time_8am"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_7am"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_8am_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_8am_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_8.30am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_8am"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_8am"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_9am"
+            android:id="@+id/time_9am"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_8am"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_9am_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_9am_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_9.30am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_9am"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_9am"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_10am"
+            android:id="@+id/time_10am"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_9am"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_10am_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_10am_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_10.30am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_10am"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_10am"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_11am"
+            android:id="@+id/time_11am"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_10am"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_11am_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_11am_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_11.30am_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_11am"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_11am"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_12pm"
+            android:id="@+id/time_12pm"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_11am"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_12pm_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_12pm_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_12.30pm_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_12pm"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_12pm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_1pm"
+            android:id="@+id/time_1pm"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_12pm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_1pm_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_1pm_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_1.30pm_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_1pm"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_1pm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_2pm"
+            android:id="@+id/time_2pm"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_1pm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_2pm_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_2pm_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_2.30pm_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_2pm"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_2pm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_3pm"
+            android:id="@+id/time_3pm"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_2pm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_3pm_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_3pm_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_3.30pm_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_3pm"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_3pm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_4pm"
+            android:id="@+id/time_4pm"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_3pm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_4pm_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_4pm_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_4.30pm_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_4pm"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_4pm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_5pm"
+            android:id="@+id/time_5pm"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_4pm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_5pm_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_5pm_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_5.30pm_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_5pm"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_5pm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_6pm"
+            android:id="@+id/time_6pm"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_5pm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_6pm_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_6pm_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_6.30pm_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_6pm"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_6pm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_7pm"
+            android:id="@+id/time_7pm"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_6pm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_7pm_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_7pm_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_7.30pm_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_7pm"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_7pm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_8pm"
+            android:id="@+id/time_8pm"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_7pm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_8pm_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_8pm_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_8.30pm_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_8pm"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_8pm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_9pm"
+            android:id="@+id/time_9pm"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_8pm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_9pm_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_9pm_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_9.30pm_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_9pm"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_9pm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_10pm"
+            android:id="@+id/time_10pm"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_9pm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_10pm_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_10pm_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_10.30pm_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_10pm"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:layout_below="@+id/time_10pm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/colorBlack"
+            android:text="@string/time_11pm"
+            android:id="@+id/time_11pm"
+            android:paddingLeft="5dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_10pm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_11pm_click"
+            android:clickable="true"
+           android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            />
+        <TextView
+            android:layout_below="@+id/time_11pm_click"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="70dp"
+            android:id="@+id/time_11.30pm_click"
+            android:clickable="true"
+            android:onClick="addEvent"
+            android:layout_marginRight="30dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            /> <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/time_11pm"
+            android:background="@color/colorDivider" />
+
+    </RelativeLayout>
+
+</FrameLayout>
+
+
+
+<!--<TextView-->
+<!--android:layout_width="wrap_content"-->
+<!--android:layout_height="wrap_content"-->
+<!--android:textColor="@color/colorBlack"-->
+<!--android:textStyle="bold"-->
+<!--android:text="@string/time_1am"-->
+<!--android:paddingTop="20dp"-->
+<!--android:layout_centerHorizontal="true"/>-->
+<!--<View-->
+<!--android:layout_width="fill_parent"-->
+<!--android:layout_height="1dp"-->
+<!--android:layout_marginTop="60dp"-->
+<!--android:background="@color/colorDivider" />-->
+<!--<TextView-->
+<!--android:layout_width="wrap_content"-->
+<!--android:layout_height="wrap_content"-->
+<!--android:textColor="@color/colorBlack"-->
+<!--android:textStyle="bold"-->
+<!--android:id="@+id/time_2am"-->
+<!--android:text="@string/time_2am"-->
+<!--android:paddingTop="20dp"-->
+    <!--/>-->
+<!--<View-->
+<!--android:layout_width="fill_parent"-->
+<!--android:layout_height="1dp"-->
+<!--android:layout_marginTop="60dp"-->
+<!--android:background="@color/colorDivider" />-->
+<!--<TextView-->
+<!--android:layout_width="wrap_content"-->
+<!--android:layout_height="wrap_content"-->
+<!--android:textColor="@color/colorBlack"-->
+<!--android:textStyle="bold"-->
+<!--android:id="@id/time_3am"-->
+<!--android:text="@string/time_3am"-->
+<!--android:layout_below="@+id/time_2am"-->
+<!--android:paddingTop="20dp"-->
+    <!--/>-->
+<!--<View-->
+<!--android:layout_width="fill_parent"-->
+<!--android:layout_height="1dp"-->
+<!--android:layout_marginTop="60dp"-->
+<!--android:background="@color/colorDivider" />-->
+<!--<TextView-->
+<!--android:layout_width="wrap_content"-->
+<!--android:layout_height="wrap_content"-->
+<!--android:textColor="@color/colorBlack"-->
+<!--android:textStyle="bold"-->
+<!--android:text="@string/time_4am"-->
+<!--android:paddingTop="20dp"-->
+<!--android:layout_centerHorizontal="true"/>-->
+<!--<View-->
+<!--android:layout_width="fill_parent"-->
+<!--android:layout_height="1dp"-->
+<!--android:layout_marginTop="60dp"-->
+<!--android:background="@color/colorDivider" />-->
+    <!--&lt;!&ndash;</LinearLayout>&ndash;&gt;-->
+
+
+<!--<TextView-->
+<!--android:layout_width="match_parent"-->
+<!--android:layout_height="60dp"-->
+<!--android:textColor="@color/colorBlack"-->
+<!--android:background="@color/blueberry"-->
+<!--android:layout_marginLeft="60dp"-->
+<!--android:layout_marginRight="60dp"-->
+<!--android:textStyle="bold"-->
+<!--android:gravity="center"-->
+<!--android:layout_below="@+id/time_2am"-->
+<!--android:text="@string/time_4am"-->
+<!--android:layout_toRightOf="@+id/time_3am"-->
     <!--/>-->
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/nav_header_calendar.xml b/Android/app/src/main/res/layout/nav_header_calendar.xml
index ae39e87..d966bcb 100644
--- a/Android/app/src/main/res/layout/nav_header_calendar.xml
+++ b/Android/app/src/main/res/layout/nav_header_calendar.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/nav_header_height"
-    android:background="@drawable/side_nav_bar"
-    android:gravity="bottom"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark">
-
-    <!--<ImageView-->
-        <!--android:id="@+id/imageView"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:paddingTop="@dimen/nav_header_vertical_spacing"-->
-        <!--app:srcCompat="@mipmap/ic_launcher_round" />-->
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:text="Book My PCR"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-
-    <!--<TextView-->
-        <!--android:id="@+id/textView"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:text="android.studio@android.com" />-->
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/nav_header_height"
+    android:background="@drawable/side_nav_bar"
+    android:gravity="bottom"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark">
+
+    <!--<ImageView-->
+        <!--android:id="@+id/imageView"-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:paddingTop="@dimen/nav_header_vertical_spacing"-->
+        <!--app:srcCompat="@mipmap/ic_launcher_round" />-->
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/nav_header_vertical_spacing"
+        android:text="Book My PCR"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+    <!--<TextView-->
+        <!--android:id="@+id/textView"-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:text="android.studio@android.com" />-->
+
+</LinearLayout>
diff --git a/Android/app/src/main/res/layout/popup.xml b/Android/app/src/main/res/layout/popup.xml
index b4e834c..128120b 100644
--- a/Android/app/src/main/res/layout/popup.xml
+++ b/Android/app/src/main/res/layout/popup.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/blue"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="10px">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Add new user"
-        android:gravity="center_horizontal"
-        android:textColor="@color/colorBlack" />
-
-    <EditText
-        android:id="@+id/emailid"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text=""
-        android:padding="10dp"
-        android:inputType="textEmailAddress"
-        android:focusedByDefault="true"
-        android:layout_margin="20dp"
-        android:textColor="@color/colorBlack"  />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_horizontal">
-
-        <Button
-            android:id="@+id/closePopupBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Close" />
-
-        <Button
-            android:id="@+id/confirmPopupBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Add User" />
-    </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/blue"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="10px">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Add new user"
+        android:gravity="center_horizontal"
+        android:textColor="@color/colorBlack" />
+
+    <EditText
+        android:id="@+id/emailid"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text=""
+        android:padding="10dp"
+        android:inputType="textEmailAddress"
+        android:focusedByDefault="true"
+        android:layout_margin="20dp"
+        android:textColor="@color/colorBlack"  />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_horizontal">
+
+        <Button
+            android:id="@+id/closePopupBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Close" />
+
+        <Button
+            android:id="@+id/confirmPopupBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Add User" />
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/popup_confirmation.xml b/Android/app/src/main/res/layout/popup_confirmation.xml
index 34ab2b4..65b4778 100644
--- a/Android/app/src/main/res/layout/popup_confirmation.xml
+++ b/Android/app/src/main/res/layout/popup_confirmation.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/blue"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="10px">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Confirmation"
-        android:gravity="center_horizontal"
-        android:textColor="@color/colorBlack" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Your are trying to book a predated event. Do you want to proceed?"
-        android:padding="10dp"
-        android:layout_margin="20dp"
-        android:textColor="@color/colorBlack"  />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_horizontal">
-
-        <Button
-            android:id="@+id/closePopupBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="No" />
-
-        <Button
-            android:id="@+id/confirmPopupBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Yes" />
-    </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/blue"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="10px">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Confirmation"
+        android:gravity="center_horizontal"
+        android:textColor="@color/colorBlack" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Your are trying to book a predated event. Do you want to proceed?"
+        android:padding="10dp"
+        android:layout_margin="20dp"
+        android:textColor="@color/colorBlack"  />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_horizontal">
+
+        <Button
+            android:id="@+id/closePopupBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="No" />
+
+        <Button
+            android:id="@+id/confirmPopupBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Yes" />
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/row_item.xml b/Android/app/src/main/res/layout/row_item.xml
index 5b3a4e6..1760add 100644
--- a/Android/app/src/main/res/layout/row_item.xml
+++ b/Android/app/src/main/res/layout/row_item.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/email"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/name"
-        android:layout_marginTop="5dp"
-        android:text=""
-        android:padding="5dp"
-        android:textColor="@android:color/black" />
-<LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="right">
-    <CheckBox
-        android:id="@+id/checkBox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="right"
-        android:layoutDirection="rtl"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="5dp"
-        android:padding="5dp"
-        android:text="Admin" />
-
-    <ImageView
-        android:id="@+id/remove"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:padding="5dp"
-        android:clickable="true"
-        android:src="@drawable/ic_close_black_24dp" />
-</LinearLayout>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/email"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/name"
+        android:layout_marginTop="5dp"
+        android:text=""
+        android:padding="5dp"
+        android:textColor="@android:color/black" />
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="right">
+    <CheckBox
+        android:id="@+id/checkBox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="right"
+        android:layoutDirection="rtl"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="5dp"
+        android:padding="5dp"
+        android:text="Admin" />
+
+    <ImageView
+        android:id="@+id/remove"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:padding="5dp"
+        android:clickable="true"
+        android:src="@drawable/ic_close_black_24dp" />
+</LinearLayout>
+
+</LinearLayout>
diff --git a/Android/app/src/main/res/layout/tvtemplate.xml b/Android/app/src/main/res/layout/tvtemplate.xml
index f52f070..2db3a9b 100644
--- a/Android/app/src/main/res/layout/tvtemplate.xml
+++ b/Android/app/src/main/res/layout/tvtemplate.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:id="@+id/linearTemplate"
-    android:layout_marginRight="30dp"
-    android:layout_marginLeft="70dp"
-    android:orientation="vertical"
-    android:onClick="editEvent"
-    android:clickable="true"
-    >
-
-    <TextView
-        android:id="@+id/tvTemplate"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:textStyle="bold"
-        android:paddingLeft="10dp" />
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingLeft="10dp"
-        android:id="@+id/moredetails"
-         />
-
-
-
-</LinearLayout>
-    <!--android:paddingBottom="20dp"-->
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:id="@+id/linearTemplate"
+    android:layout_marginRight="30dp"
+    android:layout_marginLeft="70dp"
+    android:orientation="vertical"
+    android:onClick="editEvent"
+    android:clickable="true"
+    >
+
+    <TextView
+        android:id="@+id/tvTemplate"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:textStyle="bold"
+        android:paddingLeft="10dp" />
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingLeft="10dp"
+        android:id="@+id/moredetails"
+         />
+
+
+
+</LinearLayout>
+    <!--android:paddingBottom="20dp"-->
     <!--android:paddingTop="20dp"-->
\ No newline at end of file
diff --git a/Android/app/src/main/res/menu/activity_calendar_drawer.xml b/Android/app/src/main/res/menu/activity_calendar_drawer.xml
index 2f070bf..584f9a0 100644
--- a/Android/app/src/main/res/menu/activity_calendar_drawer.xml
+++ b/Android/app/src/main/res/menu/activity_calendar_drawer.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:showIn="navigation_view">
-
-    <group >
-        <item
-            android:id="@+id/nav_addPCR"
-            android:icon="@drawable/ic_add_circle_black_24dp"
-            android:title="Add PCR" />
-        <item
-            android:id="@+id/nav_settings"
-            android:icon="@drawable/ic_settings_black_24dp"
-            android:title="Settings" />
-        <item
-            android:id="@+id/nav_help"
-            android:icon="@drawable/ic_help_black_24dp"
-            android:title="Help" />
-
-    </group>
-
-    <item android:title="Conceived By: ShanMukha Innovations">
-        <menu>
-            <item
-                android:id="@+id/nav_invite"
-                android:title="Invite Lab Members" />
-            <item
-                android:id="@+id/nav_aboutUs"
-                android:title="About Us" />
-            <item
-                android:id="@+id/nav_signOut"
-                android:title="Sign Out" />
-        </menu>
-    </item>
-
-</menu>
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:showIn="navigation_view">
+
+    <group >
+        <item
+            android:id="@+id/nav_addPCR"
+            android:icon="@drawable/ic_add_circle_black_24dp"
+            android:title="Add PCR" />
+        <item
+            android:id="@+id/nav_settings"
+            android:icon="@drawable/ic_settings_black_24dp"
+            android:title="Settings" />
+        <item
+            android:id="@+id/nav_help"
+            android:icon="@drawable/ic_help_black_24dp"
+            android:title="Help" />
+
+    </group>
+
+    <item android:title="Conceived By: ShanMukha Innovations">
+        <menu>
+            <item
+                android:id="@+id/nav_invite"
+                android:title="Invite Lab Members" />
+            <item
+                android:id="@+id/nav_aboutUs"
+                android:title="About Us" />
+            <item
+                android:id="@+id/nav_signOut"
+                android:title="Sign Out" />
+        </menu>
+    </item>
+
+</menu>
diff --git a/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..a26f6fb 100644
--- a/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..a26f6fb 100644
--- a/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/Android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index bb115dd..41ddbb4 100644
Binary files a/Android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/Android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/Android/app/src/main/res/mipmap-hdpi/ic_launcher3.png b/Android/app/src/main/res/mipmap-hdpi/ic_launcher3.png
index c75c915..864870a 100644
Binary files a/Android/app/src/main/res/mipmap-hdpi/ic_launcher3.png and b/Android/app/src/main/res/mipmap-hdpi/ic_launcher3.png differ
diff --git a/Android/app/src/main/res/mipmap-hdpi/ic_launcher_2.png b/Android/app/src/main/res/mipmap-hdpi/ic_launcher_2.png
index 5d4b260..bcb0b66 100644
Binary files a/Android/app/src/main/res/mipmap-hdpi/ic_launcher_2.png and b/Android/app/src/main/res/mipmap-hdpi/ic_launcher_2.png differ
diff --git a/Android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index de14c2f..1b52399 100644
Binary files a/Android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/Android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/Android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index bb115dd..41ddbb4 100644
Binary files a/Android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/Android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/Android/app/src/main/res/mipmap-mdpi/ic_launcher2.png b/Android/app/src/main/res/mipmap-mdpi/ic_launcher2.png
index 7457aef..ff10afd 100644
Binary files a/Android/app/src/main/res/mipmap-mdpi/ic_launcher2.png and b/Android/app/src/main/res/mipmap-mdpi/ic_launcher2.png differ
diff --git a/Android/app/src/main/res/mipmap-mdpi/ic_launcher3.png b/Android/app/src/main/res/mipmap-mdpi/ic_launcher3.png
index c75c915..864870a 100644
Binary files a/Android/app/src/main/res/mipmap-mdpi/ic_launcher3.png and b/Android/app/src/main/res/mipmap-mdpi/ic_launcher3.png differ
diff --git a/Android/app/src/main/res/mipmap-mdpi/ic_launcher_2.png b/Android/app/src/main/res/mipmap-mdpi/ic_launcher_2.png
index 5d4b260..bcb0b66 100644
Binary files a/Android/app/src/main/res/mipmap-mdpi/ic_launcher_2.png and b/Android/app/src/main/res/mipmap-mdpi/ic_launcher_2.png differ
diff --git a/Android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index f6655b8..115a4c7 100644
Binary files a/Android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/Android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index bb115dd..41ddbb4 100644
Binary files a/Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/Android/app/src/main/res/mipmap-xhdpi/ic_launcher3.png b/Android/app/src/main/res/mipmap-xhdpi/ic_launcher3.png
index c75c915..864870a 100644
Binary files a/Android/app/src/main/res/mipmap-xhdpi/ic_launcher3.png and b/Android/app/src/main/res/mipmap-xhdpi/ic_launcher3.png differ
diff --git a/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_2.png b/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_2.png
index 5d4b260..bcb0b66 100644
Binary files a/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_2.png and b/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_2.png differ
diff --git a/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index fc97d4f..459ca60 100644
Binary files a/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index bb115dd..41ddbb4 100644
Binary files a/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher3.png b/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher3.png
index c75c915..864870a 100644
Binary files a/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher3.png and b/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher3.png differ
diff --git a/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_2.png b/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_2.png
index 5d4b260..bcb0b66 100644
Binary files a/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_2.png and b/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_2.png differ
diff --git a/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index 5d9807c..8e19b41 100644
Binary files a/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index bb115dd..41ddbb4 100644
Binary files a/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher3.png b/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher3.png
index c75c915..864870a 100644
Binary files a/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher3.png and b/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher3.png differ
diff --git a/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_2.png b/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_2.png
index 5d4b260..bcb0b66 100644
Binary files a/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_2.png and b/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_2.png differ
diff --git a/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index c3fd9a9..4c19a13 100644
Binary files a/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/Android/app/src/main/res/values-v21/styles.xml b/Android/app/src/main/res/values-v21/styles.xml
index 5641c2d..8786c31 100644
--- a/Android/app/src/main/res/values-v21/styles.xml
+++ b/Android/app/src/main/res/values-v21/styles.xml
@@ -1,8 +1,8 @@
-<resources>
-
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <!--<item name="android:statusBarColor">@android:color/transparent</item>-->
-    </style>
-</resources>
+<resources>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <!--<item name="android:statusBarColor">@android:color/transparent</item>-->
+    </style>
+</resources>
diff --git a/Android/app/src/main/res/values/array.xml b/Android/app/src/main/res/values/array.xml
index c2881a6..439820f 100644
--- a/Android/app/src/main/res/values/array.xml
+++ b/Android/app/src/main/res/values/array.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="blue" type="color">#FF33B5E5</item>
-    <item name="purple" type="color">#FFAA66CC</item>
-    <item name="green" type="color">#FF99CC00</item>
-    <item name="orange" type="color">#FFFFBB33</item>
-    <item name="red" type="color">#FFFF4444</item>
-    <item name="darkblue" type="color">#FF0099CC</item>
-    <item name="darkpurple" type="color">#FF9933CC</item>
-    <item name="darkgreen" type="color">#FF669900</item>
-    <item name="darkorange" type="color">#FFFF8800</item>
-    <item name="darkred" type="color">#FFCC0000</item>
-
-    <integer-array name="androidcolors">
-        <item>@color/blue</item>
-        <item>@color/purple</item>
-        <item>@color/green</item>
-        <item>@color/orange</item>
-        <item>@color/red</item>
-        <item>@color/darkblue</item>
-        <item>@color/darkpurple</item>
-        <item>@color/darkgreen</item>
-        <item>@color/darkorange</item>
-        <item>@color/darkred</item>
-    </integer-array>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="blue" type="color">#FF33B5E5</item>
+    <item name="purple" type="color">#FFAA66CC</item>
+    <item name="green" type="color">#FF99CC00</item>
+    <item name="orange" type="color">#FFFFBB33</item>
+    <item name="red" type="color">#FFFF4444</item>
+    <item name="darkblue" type="color">#FF0099CC</item>
+    <item name="darkpurple" type="color">#FF9933CC</item>
+    <item name="darkgreen" type="color">#FF669900</item>
+    <item name="darkorange" type="color">#FFFF8800</item>
+    <item name="darkred" type="color">#FFCC0000</item>
+
+    <integer-array name="androidcolors">
+        <item>@color/blue</item>
+        <item>@color/purple</item>
+        <item>@color/green</item>
+        <item>@color/orange</item>
+        <item>@color/red</item>
+        <item>@color/darkblue</item>
+        <item>@color/darkpurple</item>
+        <item>@color/darkgreen</item>
+        <item>@color/darkorange</item>
+        <item>@color/darkred</item>
+    </integer-array>
 </resources>
\ No newline at end of file
diff --git a/Android/app/src/main/res/values/colors.xml b/Android/app/src/main/res/values/colors.xml
index eacebac..89275c0 100644
--- a/Android/app/src/main/res/values/colors.xml
+++ b/Android/app/src/main/res/values/colors.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-    <color name="gray">#444440</color>
-    <color name="white">#ffffff</color>
-    <color name="from">#000000</color>
-    <color name="subject">#111111</color>
-    <color name="timestamp">#4285f4</color>
-    <color name="message">#7a7a7a</color>
-    <color name="icon_tint_normal">#7a7a7a</color>
-    <color name="icon_tint_selected">#fed776</color>
-    <color name="row_activated">#e0e0e0</color>
-    <color name="bg_action_mode">#757575</color>
-    <color name="bg_circle_default">#666666</color>
-
-    <color name="colorWhite">#ffffff</color>
-    <color name="colorBlack">#000000</color>
-    <color name="colorDivider">#aaaaaa</color>
-    <color name="colorSplash">#8dcaff</color>
-
-
-    <!--<array name="eventColor">-->
-
-        <!--<color name="tomato">#D50000</color>-->
-        <!--<color name="flamingo">#E67C73</color>-->
-        <!--<color name="tangerine">#F4511E</color>-->
-        <!--<color name="banana">#F6BF26</color>-->
-        <!--<color name="sage">#33B679</color>-->
-        <!--<color name="basil">#0B8043</color>-->
-        <!--<color name="peacock">#039BE5</color>-->
-        <!--<color name="blueberry">#3F51B5</color>-->
-
-    <!--</array>-->
-
-
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+    <color name="gray">#444440</color>
+    <color name="white">#ffffff</color>
+    <color name="from">#000000</color>
+    <color name="subject">#111111</color>
+    <color name="timestamp">#4285f4</color>
+    <color name="message">#7a7a7a</color>
+    <color name="icon_tint_normal">#7a7a7a</color>
+    <color name="icon_tint_selected">#fed776</color>
+    <color name="row_activated">#e0e0e0</color>
+    <color name="bg_action_mode">#757575</color>
+    <color name="bg_circle_default">#666666</color>
+
+    <color name="colorWhite">#ffffff</color>
+    <color name="colorBlack">#000000</color>
+    <color name="colorDivider">#aaaaaa</color>
+    <color name="colorSplash">#8dcaff</color>
+
+
+    <!--<array name="eventColor">-->
+
+        <!--<color name="tomato">#D50000</color>-->
+        <!--<color name="flamingo">#E67C73</color>-->
+        <!--<color name="tangerine">#F4511E</color>-->
+        <!--<color name="banana">#F6BF26</color>-->
+        <!--<color name="sage">#33B679</color>-->
+        <!--<color name="basil">#0B8043</color>-->
+        <!--<color name="peacock">#039BE5</color>-->
+        <!--<color name="blueberry">#3F51B5</color>-->
+
+    <!--</array>-->
+
+
+
+</resources>
diff --git a/Android/app/src/main/res/values/dimens.xml b/Android/app/src/main/res/values/dimens.xml
index a5be179..d1da4b2 100644
--- a/Android/app/src/main/res/values/dimens.xml
+++ b/Android/app/src/main/res/values/dimens.xml
@@ -1,8 +1,8 @@
-<resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="nav_header_vertical_spacing">8dp</dimen>
-    <dimen name="nav_header_height">176dp</dimen>
-    <dimen name="fab_margin">16dp</dimen>
-</resources>
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="nav_header_vertical_spacing">8dp</dimen>
+    <dimen name="nav_header_height">176dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+</resources>
diff --git a/Android/app/src/main/res/values/drawables.xml b/Android/app/src/main/res/values/drawables.xml
index 52c6a6c..6cc55d6 100644
--- a/Android/app/src/main/res/values/drawables.xml
+++ b/Android/app/src/main/res/values/drawables.xml
@@ -1,8 +1,8 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <item name="ic_menu_camera" type="drawable">@android:drawable/ic_menu_camera</item>
-    <item name="ic_menu_gallery" type="drawable">@android:drawable/ic_menu_gallery</item>
-    <item name="ic_menu_slideshow" type="drawable">@android:drawable/ic_menu_slideshow</item>
-    <item name="ic_menu_manage" type="drawable">@android:drawable/ic_menu_manage</item>
-    <item name="ic_menu_share" type="drawable">@android:drawable/ic_menu_share</item>
-    <item name="ic_menu_send" type="drawable">@android:drawable/ic_menu_send</item>
-</resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <item name="ic_menu_camera" type="drawable">@android:drawable/ic_menu_camera</item>
+    <item name="ic_menu_gallery" type="drawable">@android:drawable/ic_menu_gallery</item>
+    <item name="ic_menu_slideshow" type="drawable">@android:drawable/ic_menu_slideshow</item>
+    <item name="ic_menu_manage" type="drawable">@android:drawable/ic_menu_manage</item>
+    <item name="ic_menu_share" type="drawable">@android:drawable/ic_menu_share</item>
+    <item name="ic_menu_send" type="drawable">@android:drawable/ic_menu_send</item>
+</resources>
diff --git a/Android/app/src/main/res/values/strings.xml b/Android/app/src/main/res/values/strings.xml
index 0675a67..f993b25 100644
--- a/Android/app/src/main/res/values/strings.xml
+++ b/Android/app/src/main/res/values/strings.xml
@@ -1,93 +1,93 @@
-<resources>
-    <string name="app_name">Book My PCR</string>
-
-    <!-- Strings related to login -->
-    <string name="prompt_email">Email</string>
-    <string name="prompt_password">Password</string>
-    <string name="action_sign_in">Sign in</string>
-    <string name="action_sign_in_short">Sign in</string>
-    <string name="error_invalid_email">This email address is invalid</string>
-    <string name="error_invalid_password">This password is too short</string>
-    <string name="error_incorrect_password">This password is incorrect</string>
-    <string name="error_field_required">This field is required</string>
-    <string name="permission_rationale">"Contacts permissions are needed for providing email
-        completions."
-    </string>
-
-    <string name="time_12am">12 am</string>
-    <string name="time_1am">1 am</string>
-    <string name="time_2am">2 am</string>
-    <string name="time_3am">3 am</string>
-    <string name="time_4am">4 am</string>
-    <string name="time_5am">5 am</string>
-    <string name="time_6am">6 am</string>
-    <string name="time_7am">7 am</string>
-    <string name="time_8am">8 am</string>
-    <string name="time_9am">9 am</string>
-    <string name="time_10am">10 am</string>
-    <string name="time_11am">11 am</string>
-    <string name="time_12pm">12 pm</string>
-    <string name="time_1pm">1 pm</string>
-    <string name="time_2pm">2 pm</string>
-    <string name="time_3pm">3 pm</string>
-    <string name="time_4pm">4 pm</string>
-    <string name="time_5pm">5 pm</string>
-    <string name="time_6pm">6 pm</string>
-    <string name="time_7pm">7 pm</string>
-    <string name="time_8pm">8 pm</string>
-    <string name="time_9pm">9 pm</string>
-    <string name="time_10pm">10 pm</string>
-    <string name="time_11pm">11 pm</string>
-
-    <string name="title_activity_calendar">CalendarActivity</string>
-
-    <string name="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">Close navigation drawer</string>
-
-    <string name="action_settings">Settings</string>
-
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="title_activity_create_event">CreateEvent</string>
-    <string name="title_activity_create_new_event">CreateNewEvent</string>
-    <string name="title_activity_new_event">NewEvent</string>
-    <string name="title_activity_edit_event">EditEvent</string>
-    <string name="title_activity_view_event">ViewEvent</string>
-    <string name="register"><u>New User? Click Here to Register</u></string>
-    <string name="forgot"><u>Forgot Password?</u></string>
-    <string name="aboutus">ShanMukha Innovations is a startup incubated at the Society for Innovation and Developed (SID) inside Indian Institute of Science (IISc), Bangalore. ShanMukha is working, among other things, to bring some of the fundamental technologies in DNA analysis within the reach of more students and researchers in India and across the world. This app is an effort to simplify some of the routine activities done by each member in every lab, everyday.  It is a small contribution from ShanMukha in the service of the biological research community.
-\n\n The app has been developed by Pavan Nagendra for ShanMukha Innovations. \n\n For more details visit \n <a href="https://sminnovations.in/dna">https://sminnovations.in/dna</a></string>
-
-    <string name="help1"><b>How to book a slot?</b>
-\nBooking a slot has been made possible through two options.
-\nOption 1:
-\n1.	Click on an empty slot in calendar view for a specific date.
-\n2.	Fill in the details in the New Event Page.
-\n3.	Click Save.
-\nOption 2:
-\n1.	Click on the plus button in calendar view.
-\n2.	Select the date and fill the details in the New Event Page.
-\n3.	Click Save.
-    </string>
-    <string name="help2"><b>How to edit a slot?</b>
-\n1.	Click on the booked event.
-\n2.	Edit the changes in the Edit Event Page.
-\n3.	Save.
-\nA slot which is past the current time cannot be edited.
-    </string>
-    <string name="help3"><b>How to delete a slot?</b>
-\n1.	Click on the booked event.
-\n2.	Click Delete.
-\nA slot which is past the current time cannot be deleted.
-    </string>
-    <string name="help4"><b>How to add/ remove a person from a lab?</b>
-\n1.	Click on settings in the navigation menu.
-\n2.	Click on ‘+’ to add a mail id.
-\n3.	Enter the mail id and confirm.
-    </string>
-    <string name="help5"><b>How to add a PCR to the lab?</b>
-\n1.	Click on ‘Add PCR’ in the navigation menu.
-\n2.	Enter the PCR details.
-\n3.	Click on Save.
-    </string>
-</resources>
+<resources>
+    <string name="app_name">Book My PCR</string>
+
+    <!-- Strings related to login -->
+    <string name="prompt_email">Email</string>
+    <string name="prompt_password">Password</string>
+    <string name="action_sign_in">Sign in</string>
+    <string name="action_sign_in_short">Sign in</string>
+    <string name="error_invalid_email">This email address is invalid</string>
+    <string name="error_invalid_password">This password is too short</string>
+    <string name="error_incorrect_password">This password is incorrect</string>
+    <string name="error_field_required">This field is required</string>
+    <string name="permission_rationale">"Contacts permissions are needed for providing email
+        completions."
+    </string>
+
+    <string name="time_12am">12 am</string>
+    <string name="time_1am">1 am</string>
+    <string name="time_2am">2 am</string>
+    <string name="time_3am">3 am</string>
+    <string name="time_4am">4 am</string>
+    <string name="time_5am">5 am</string>
+    <string name="time_6am">6 am</string>
+    <string name="time_7am">7 am</string>
+    <string name="time_8am">8 am</string>
+    <string name="time_9am">9 am</string>
+    <string name="time_10am">10 am</string>
+    <string name="time_11am">11 am</string>
+    <string name="time_12pm">12 pm</string>
+    <string name="time_1pm">1 pm</string>
+    <string name="time_2pm">2 pm</string>
+    <string name="time_3pm">3 pm</string>
+    <string name="time_4pm">4 pm</string>
+    <string name="time_5pm">5 pm</string>
+    <string name="time_6pm">6 pm</string>
+    <string name="time_7pm">7 pm</string>
+    <string name="time_8pm">8 pm</string>
+    <string name="time_9pm">9 pm</string>
+    <string name="time_10pm">10 pm</string>
+    <string name="time_11pm">11 pm</string>
+
+    <string name="title_activity_calendar">CalendarActivity</string>
+
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+
+    <string name="action_settings">Settings</string>
+
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="title_activity_create_event">CreateEvent</string>
+    <string name="title_activity_create_new_event">CreateNewEvent</string>
+    <string name="title_activity_new_event">NewEvent</string>
+    <string name="title_activity_edit_event">EditEvent</string>
+    <string name="title_activity_view_event">ViewEvent</string>
+    <string name="register"><u>New User? Click Here to Register</u></string>
+    <string name="forgot"><u>Forgot Password?</u></string>
+    <string name="aboutus">ShanMukha Innovations is a startup incubated at the Society for Innovation and Developed (SID) inside Indian Institute of Science (IISc), Bangalore. ShanMukha is working, among other things, to bring some of the fundamental technologies in DNA analysis within the reach of more students and researchers in India and across the world. This app is an effort to simplify some of the routine activities done by each member in every lab, everyday.  It is a small contribution from ShanMukha in the service of the biological research community.
+\n\n The app has been developed by Pavan Nagendra for ShanMukha Innovations. \n\n For more details visit \n <a href="https://sminnovations.in/dna">https://sminnovations.in/dna</a></string>
+
+    <string name="help1"><b>How to book a slot?</b>
+\nBooking a slot has been made possible through two options.
+\nOption 1:
+\n1.	Click on an empty slot in calendar view for a specific date.
+\n2.	Fill in the details in the New Event Page.
+\n3.	Click Save.
+\nOption 2:
+\n1.	Click on the plus button in calendar view.
+\n2.	Select the date and fill the details in the New Event Page.
+\n3.	Click Save.
+    </string>
+    <string name="help2"><b>How to edit a slot?</b>
+\n1.	Click on the booked event.
+\n2.	Edit the changes in the Edit Event Page.
+\n3.	Save.
+\nA slot which is past the current time cannot be edited.
+    </string>
+    <string name="help3"><b>How to delete a slot?</b>
+\n1.	Click on the booked event.
+\n2.	Click Delete.
+\nA slot which is past the current time cannot be deleted.
+    </string>
+    <string name="help4"><b>How to add/ remove a person from a lab?</b>
+\n1.	Click on settings in the navigation menu.
+\n2.	Click on ‘+’ to add a mail id.
+\n3.	Enter the mail id and confirm.
+    </string>
+    <string name="help5"><b>How to add a PCR to the lab?</b>
+\n1.	Click on ‘Add PCR’ in the navigation menu.
+\n2.	Enter the PCR details.
+\n3.	Click on Save.
+    </string>
+</resources>
diff --git a/Android/app/src/main/res/values/styles.xml b/Android/app/src/main/res/values/styles.xml
index e19c580..5598cff 100644
--- a/Android/app/src/main/res/values/styles.xml
+++ b/Android/app/src/main/res/values/styles.xml
@@ -1,24 +1,24 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowBackground">@drawable/background_splash</item>
-    </style>
-
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
-</resources>
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowBackground">@drawable/background_splash</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+</resources>