diff --git a/.idea/modules.xml b/.idea/modules.xml
index cbadffc..a95c3b6 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,9 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/daily-goals-fork.iml" filepath="$PROJECT_DIR$/daily-goals-fork.iml" />
+      <module fileurl="file://C:\Users\sukhbeer singh\AndroidStudioProjects\daily-goals2\app\app.iml" filepath="C:\Users\sukhbeer singh\AndroidStudioProjects\daily-goals2\app\app.iml" />
+      <module fileurl="file://C:\Users\sukhbeer singh\AndroidStudioProjects\daily-goals2\daily-goals-fork.iml" filepath="C:\Users\sukhbeer singh\AndroidStudioProjects\daily-goals2\daily-goals-fork.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/daily-goals2.iml" filepath="$PROJECT_DIR$/.idea/daily-goals2.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_achievements.xml b/app/src/main/res/layout/activity_achievements.xml
index 2e89e35..6a1367b 100644
--- a/app/src/main/res/layout/activity_achievements.xml
+++ b/app/src/main/res/layout/activity_achievements.xml
@@ -1,7 +1,6 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_goals__completed.xml b/app/src/main/res/layout/activity_goals__completed.xml
index 13fffb2..e9dfdb0 100644
--- a/app/src/main/res/layout/activity_goals__completed.xml
+++ b/app/src/main/res/layout/activity_goals__completed.xml
@@ -1,7 +1,6 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_goals__missed.xml b/app/src/main/res/layout/activity_goals__missed.xml
index d08a663..42806cd 100644
--- a/app/src/main/res/layout/activity_goals__missed.xml
+++ b/app/src/main/res/layout/activity_goals__missed.xml
@@ -1,7 +1,6 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_today.xml b/app/src/main/res/layout/activity_today.xml
index 5adf11d..2942294 100644
--- a/app/src/main/res/layout/activity_today.xml
+++ b/app/src/main/res/layout/activity_today.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
     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"
     tools:context="TodayActivity"
     android:layout_width = "fill_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/name"
-                android:text="Task :"
+                android:text="@string/task"
                 android:fontFamily="sans-serif-smallcaps"
                 android:layout_marginTop="10dp"
                 android:layout_marginLeft="10dp"
@@ -84,7 +84,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/from"
-                android:text="From :"
+                android:text="@string/from"
                 android:fontFamily="sans-serif-smallcaps"
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="10dp"
@@ -96,8 +96,9 @@
                 android:id = "@+id/simpleTimePicker"
                 android:layout_width = "wrap_content"
                 android:layout_height = "wrap_content"
-                android:paddingLeft="38dp"
-                android:timePickerMode ="spinner"  />
+                android:paddingStart="38dp"
+                android:timePickerMode ="spinner"
+                tools:ignore="RtlSymmetry" />
 
         </LinearLayout>
         <View
@@ -116,7 +117,7 @@
                 android:layout_width = "wrap_content"
                 android:layout_height = "wrap_content"
                 android:layout_gravity="center_vertical"
-                android:text = "Notify at : "
+                android:text = "@string/notify_at"
                 android:fontFamily="sans-serif-smallcaps"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/items.xml b/app/src/main/res/layout/items.xml
index 243769d..487d61f 100644
--- a/app/src/main/res/layout/items.xml
+++ b/app/src/main/res/layout/items.xml
@@ -17,7 +17,7 @@
    <TextView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-       android:text="TODAY"
+       android:text="@string/today"
        android:gravity="center"
        android:textColor="#000000"
        android:id="@+id/text"
diff --git a/app/src/main/res/layout/items1.xml b/app/src/main/res/layout/items1.xml
index 34a7097..c5551f1 100644
--- a/app/src/main/res/layout/items1.xml
+++ b/app/src/main/res/layout/items1.xml
@@ -17,7 +17,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:text="BREAKFAST"
+            android:text="@string/breakfast"
             android:gravity="center"
             android:textColor="#000000"
             android:id="@+id/text1"
diff --git a/app/src/main/res/layout/items2.xml b/app/src/main/res/layout/items2.xml
index 649f1a3..0a17593 100644
--- a/app/src/main/res/layout/items2.xml
+++ b/app/src/main/res/layout/items2.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="200dp"
     android:layout_height="200dp"
     android:layout_margin="10dp"
@@ -18,7 +19,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:src="@drawable/tick"
-            android:id="@+id/image2"/>
+            android:id="@+id/image2"
+            tools:ignore="ContentDescription" />
     </LinearLayout>
 
 </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/items3.xml b/app/src/main/res/layout/items3.xml
index f34bb52..718f5a3 100644
--- a/app/src/main/res/layout/items3.xml
+++ b/app/src/main/res/layout/items3.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="200dp"
     android:layout_height="200dp"
     android:layout_margin="10dp"
@@ -18,7 +19,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:src="@drawable/achievements"
-            android:id="@+id/image3"/>
+            android:id="@+id/image3"
+            tools:ignore="ContentDescription" />
     </LinearLayout>
 
 </android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/parallax1.xml b/app/src/main/res/layout/parallax1.xml
index f557081..88ca018 100644
--- a/app/src/main/res/layout/parallax1.xml
+++ b/app/src/main/res/layout/parallax1.xml
@@ -20,7 +20,8 @@
         android:layout_alignLeft="@+id/imageView3"
         android:layout_alignStart="@+id/imageView3"
         android:layout_below="@+id/imageView2"
-        android:src="@drawable/ic_goals" />
+        android:src="@drawable/ic_goals"
+        tools:ignore="RtlHardcoded" />
 
     <ImageView
         android:id="@+id/imageView"
diff --git a/app/src/main/res/layout/parallax2.xml b/app/src/main/res/layout/parallax2.xml
index cd402d3..7680565 100644
--- a/app/src/main/res/layout/parallax2.xml
+++ b/app/src/main/res/layout/parallax2.xml
@@ -15,7 +15,8 @@
         android:layout_marginLeft="11dp"
         android:layout_marginStart="11dp"
         android:layout_marginTop="16dp"
-        android:src="@drawable/ic_guide" />
+        android:src="@drawable/ic_guide"
+        tools:ignore="RtlHardcoded" />
 
     <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/compass2"
@@ -26,7 +27,8 @@
         android:layout_alignTop="@+id/compass4"
         android:layout_marginLeft="24dp"
         android:layout_marginStart="24dp"
-        android:src="@drawable/ic_guide" />
+        android:src="@drawable/ic_guide"
+        tools:ignore="RtlHardcoded" />
 
     <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/compass3"
@@ -35,7 +37,8 @@
         android:layout_below="@+id/compass2"
         android:layout_toEndOf="@+id/compass2"
         android:layout_toRightOf="@+id/compass2"
-        android:src="@drawable/ic_guide" />
+        android:src="@drawable/ic_guide"
+        tools:ignore="RtlHardcoded" />
 
     <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/compass4"
@@ -45,7 +48,8 @@
         android:layout_marginTop="132dp"
         android:layout_toEndOf="@+id/compass3"
         android:layout_toRightOf="@+id/compass3"
-        android:src="@drawable/ic_guide" />
+        android:src="@drawable/ic_guide"
+        tools:ignore="RtlHardcoded" />
 
     <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/compass5"
@@ -54,5 +58,6 @@
         android:layout_above="@+id/compass2"
         android:layout_toEndOf="@+id/compass2"
         android:layout_toRightOf="@+id/compass2"
-        android:src="@drawable/ic_guide" />
+        android:src="@drawable/ic_guide"
+        tools:ignore="RtlHardcoded" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/parallax4.xml b/app/src/main/res/layout/parallax4.xml
index 6141e06..aa4ec45 100644
--- a/app/src/main/res/layout/parallax4.xml
+++ b/app/src/main/res/layout/parallax4.xml
@@ -52,7 +52,8 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.289"
         android:layout_marginRight="8dp"
-        android:layout_marginLeft="48dp" />
+        android:layout_marginLeft="48dp"
+        tools:ignore="RtlHardcoded" />
 
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d877344..5e07845 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
     <string name="lunch">LUNCH</string>
     <string name="games">GAMES</string>
     <string name="dinner">DINNER</string>
-
+    <string name="notifyat">Notify at :</string>
     <!-- Strings for titles of each page of the welcome screen -->
     <string name="title_welcome">Welcome to Daily Goals</string>
     <string name="title_life_guide">Life Guide and Assistant</string>
@@ -35,4 +35,9 @@
     <string name="goals_missed">GOALS MISSED</string>
     <string name="goals_completed">GOALS COMPLETED</string>
     <string name="your_achievements">YOUR ACHIEVEMENTS</string>
+    <string name="notify_at">Notify at :</string>
+    <string name="from">From :</string>
+    <string name="task">Task :</string>
+    <string name="today">TODAY</string>
+    <string name="breakfast">BREAKFAST</string>
 </resources>
diff --git a/local.properties b/local.properties
index 0e56246..5e9545e 100644
--- a/local.properties
+++ b/local.properties
@@ -1,9 +1,11 @@
-## This file must *NOT* be checked into Version Control Systems,
+## This file is automatically generated by Android Studio.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Sun Apr 29 18:38:18 IST 2018
-ndk.dir=C\:\\Users\\shivam\\AppData\\Local\\Android\\Sdk\\ndk-bundle
-sdk.dir=C\:\\Users\\shivam\\AppData\\Local\\Android\\Sdk
+#Mon May 14 15:05:45 IST 2018
+sdk.dir=C\:\\Users\\sukhbeer singh\\AppData\\Local\\Android\\Sdk