diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index af813f1..9c85e3e 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -12,7 +12,7 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-05-17T02:03:31.931148300Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-05-18T01:32:08.741560100Z" />
     <targetsSelectedWithDialog>
       <Target>
         <type value="QUICK_BOOT_TARGET" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 34ced82..84c2fbb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,13 +4,20 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/drawable/gradient_background.xml" value="0.1" />
+        <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/activity_add_baby.xml" value="0.25" />
+        <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/activity_dashboard.xml" value="0.16304347826086957" />
+        <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/activity_first_page.xml" value="0.17074275362318841" />
+        <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/activity_height_tracker.xml" value="0.25" />
         <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/activity_main.xml" value="0.22" />
+        <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/activity_vaccination.xml" value="0.16304347826086957" />
+        <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/activity_vaccination_tracker.xml" value="0.17074275362318841" />
+        <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/activity_weight_tracker.xml" value="0.22" />
         <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/add_baby.xml" value="0.22" />
         <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/baby_list.xml" value="0.20416666666666666" />
         <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/dashboard.xml" value="0.33" />
-        <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/first_page.xml" value="0.22" />
-        <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/height_tracker.xml" value="0.25" />
-        <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/vaccination.xml" value="0.18" />
+        <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/first_page.xml" value="0.18" />
+        <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/height_tracker.xml" value="0.1" />
+        <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/vaccination.xml" value="0.1" />
         <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/vaccination_female.xml" value="0.2" />
         <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/vaccination_male.xml" value="0.2" />
         <entry key="..\:/Users/Chamudi/Desktop/BabyCare/app/src/main/res/layout/vaccination_tracker.xml" value="0.2" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index e1daae5..0000000
--- a/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Android application for baby development tracking system
-
-Project Name: Baby Care
-
-Mostly Used programming Language: java
diff --git a/app/build.gradle b/app/build.gradle
index 83ce274..4d23bbc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,6 +25,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
@@ -33,6 +36,8 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.navigation:navigation-fragment:2.4.2'
+    implementation 'androidx.navigation:navigation-ui:2.4.2'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5bc1508..2ac4c12 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,27 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.BabyCare">
+        <activity
+            android:name=".VaccinationTrackerActivity"
+            android:exported="false" />
+        <activity
+            android:name=".WeightTrackerActivity"
+            android:exported="false" />
+        <activity
+            android:name=".HeightTrackerActivity"
+            android:exported="false" />
+        <activity
+            android:name=".VaccinationActivity"
+            android:exported="false" />
+        <activity
+            android:name=".DashboardActivity"
+            android:exported="false" />
+        <activity
+            android:name=".AddBabyActivity"
+            android:exported="false" />
+        <activity
+            android:name=".FirstPageActivity"
+            android:exported="false" />
         <activity
             android:name=".MainActivity"
             android:exported="true">
diff --git a/app/src/main/java/com/example/babycare/AddBabyActivity.java b/app/src/main/java/com/example/babycare/AddBabyActivity.java
new file mode 100644
index 0000000..12e26c0
--- /dev/null
+++ b/app/src/main/java/com/example/babycare/AddBabyActivity.java
@@ -0,0 +1,28 @@
+package com.example.babycare;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class AddBabyActivity extends AppCompatActivity {
+    public Button button;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_add_baby);
+
+        button = (Button) findViewById(R.id.btn_addbaby_done);
+
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v){
+                Intent intent = new Intent(AddBabyActivity.this,VaccinationActivity.class);
+                startActivity(intent);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/babycare/DashboardActivity.java b/app/src/main/java/com/example/babycare/DashboardActivity.java
new file mode 100644
index 0000000..274b611
--- /dev/null
+++ b/app/src/main/java/com/example/babycare/DashboardActivity.java
@@ -0,0 +1,49 @@
+package com.example.babycare;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.cardview.widget.CardView;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+public class DashboardActivity extends AppCompatActivity implements View.OnClickListener {
+    public CardView card1,card2,card3;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_dashboard);
+
+        card1 = (CardView) findViewById(R.id.card_height);
+        card2 = (CardView) findViewById(R.id.card_weight);
+        card3 = (CardView) findViewById(R.id.card_vaccine);
+
+        card1.setOnClickListener(this);
+        card2.setOnClickListener(this);
+        card3.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View view) {
+        Intent intent;
+
+        switch (view.getId()){
+            case R.id.card_height:
+                intent = new Intent(DashboardActivity.this,HeightTrackerActivity.class);
+                startActivity(intent);
+                break;
+
+            case R.id.card_weight:
+                intent = new Intent(DashboardActivity.this,WeightTrackerActivity.class);
+                startActivity(intent);
+                break;
+
+            case R.id.card_vaccine:
+                intent = new Intent(DashboardActivity.this,VaccinationTrackerActivity.class);
+                startActivity(intent);
+                break;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/babycare/FirstPageActivity.java b/app/src/main/java/com/example/babycare/FirstPageActivity.java
new file mode 100644
index 0000000..69a1757
--- /dev/null
+++ b/app/src/main/java/com/example/babycare/FirstPageActivity.java
@@ -0,0 +1,38 @@
+package com.example.babycare;
+
+import androidx.appcompat.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.content.Intent;
+import android.view.View;
+
+public class FirstPageActivity extends AppCompatActivity {
+    public Button button1,button2;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_first_page);
+
+        button1 = (Button) findViewById(R.id.btn_signin);
+
+        button1.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v1){
+                Intent intent1 = new Intent(FirstPageActivity.this,AddBabyActivity.class);
+                startActivity(intent1);
+            }
+        });
+
+        button2 = (Button) findViewById(R.id.btn_login);
+
+        button2.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v2){
+                Intent intent2 = new Intent(FirstPageActivity.this,DashboardActivity.class);
+                startActivity(intent2);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/babycare/HeightTrackerActivity.java b/app/src/main/java/com/example/babycare/HeightTrackerActivity.java
new file mode 100644
index 0000000..0a267e2
--- /dev/null
+++ b/app/src/main/java/com/example/babycare/HeightTrackerActivity.java
@@ -0,0 +1,27 @@
+package com.example.babycare;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class HeightTrackerActivity extends AppCompatActivity {
+    public Button button;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_height_tracker);
+
+        button = (Button)findViewById(R.id.btn_height_back);
+        button.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v){
+                Intent intent = new Intent(HeightTrackerActivity.this,DashboardActivity.class);
+                startActivity(intent);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/babycare/MainActivity.java b/app/src/main/java/com/example/babycare/MainActivity.java
index 7f66aca..268ef99 100644
--- a/app/src/main/java/com/example/babycare/MainActivity.java
+++ b/app/src/main/java/com/example/babycare/MainActivity.java
@@ -1,14 +1,28 @@
 package com.example.babycare;
 
 import androidx.appcompat.app.AppCompatActivity;
-
 import android.os.Bundle;
+import android.widget.Button;
+import android.content.Intent;
+import android.view.View;
 
 public class MainActivity extends AppCompatActivity {
 
+    public Button button;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        button = (Button) findViewById(R.id.btn_start);
+
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v){
+                Intent intent = new Intent( MainActivity.this,FirstPageActivity.class);
+                startActivity(intent);
+            }
+        });
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/babycare/VaccinationActivity.java b/app/src/main/java/com/example/babycare/VaccinationActivity.java
new file mode 100644
index 0000000..a60ee8c
--- /dev/null
+++ b/app/src/main/java/com/example/babycare/VaccinationActivity.java
@@ -0,0 +1,26 @@
+package com.example.babycare;
+
+import androidx.appcompat.app.AppCompatActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class VaccinationActivity extends AppCompatActivity {
+    public Button button;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_vaccination);
+
+        button = (Button)findViewById(R.id.btn_firstVaccineDone);
+        button.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v){
+                Intent intent = new Intent(VaccinationActivity.this,DashboardActivity.class);
+                startActivity(intent);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/babycare/VaccinationTrackerActivity.java b/app/src/main/java/com/example/babycare/VaccinationTrackerActivity.java
new file mode 100644
index 0000000..ac7bf03
--- /dev/null
+++ b/app/src/main/java/com/example/babycare/VaccinationTrackerActivity.java
@@ -0,0 +1,27 @@
+package com.example.babycare;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class VaccinationTrackerActivity extends AppCompatActivity {
+    public Button button;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_vaccination_tracker);
+
+        button = (Button)findViewById(R.id.btn_vaccine_back);
+        button.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v){
+                Intent intent = new Intent(VaccinationTrackerActivity.this,DashboardActivity.class);
+                startActivity(intent);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/babycare/WeightTrackerActivity.java b/app/src/main/java/com/example/babycare/WeightTrackerActivity.java
new file mode 100644
index 0000000..005ed54
--- /dev/null
+++ b/app/src/main/java/com/example/babycare/WeightTrackerActivity.java
@@ -0,0 +1,27 @@
+package com.example.babycare;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class WeightTrackerActivity extends AppCompatActivity {
+    public Button button;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_weight_tracker);
+
+        button = (Button)findViewById(R.id.btn_weight_back);
+        button.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v){
+                Intent intent = new Intent(WeightTrackerActivity.this,DashboardActivity.class);
+                startActivity(intent);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/add_baby.xml b/app/src/main/res/layout/activity_add_baby.xml
similarity index 86%
rename from app/src/main/res/layout/add_baby.xml
rename to app/src/main/res/layout/activity_add_baby.xml
index bb6468e..4889f0e 100644
--- a/app/src/main/res/layout/add_baby.xml
+++ b/app/src/main/res/layout/activity_add_baby.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:context=".AddBabyActivity"
     android:background="@drawable/gradient_background">
 
     <TextView
@@ -18,9 +19,9 @@
         android:textColor="#100F0F"
         android:textSize="30sp"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/imageView4"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.054" />
@@ -37,7 +38,7 @@
         android:textColor="#2C2B2B"
         app:layout_constraintBottom_toTopOf="@+id/editTxt_BDate"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.555"
+        app:layout_constraintHorizontal_bias="0.583"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/imageView4"
         tools:ignore="MissingConstraints" />
@@ -49,10 +50,14 @@
         android:ems="10"
         android:importantForAutofill="no"
         android:inputType="date"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="19dp"
-        tools:layout_editor_absoluteY="398dp"
-        tools:text="Date of Birth*" />
+        android:text="Date of Birth*"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.421"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.582"
+        tools:ignore="MissingConstraints" />
 
     <LinearLayout
         android:id="@+id/linearLayout"
@@ -61,11 +66,12 @@
         android:layout_marginStart="22dp"
         android:layout_marginEnd="15dp"
         android:orientation="horizontal"
-        app:layout_constraintBottom_toTopOf="@+id/button"
+        app:layout_constraintBottom_toTopOf="@+id/btn_addbaby_done"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView2"
-        app:layout_constraintVertical_bias="0.825">
+        app:layout_constraintVertical_bias="0.889">
 
         <CheckBox
             android:id="@+id/checkbox_boy"
@@ -125,8 +131,10 @@
         android:text="done"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView2"
+        app:layout_constraintVertical_bias="1.0"
         tools:ignore="TextContrastCheck" />
 
     <ImageView
@@ -154,7 +162,7 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/editTxt_BDate"
-        app:layout_constraintVertical_bias="0.187"
+        app:layout_constraintVertical_bias="0.237"
         tools:ignore="MissingConstraints" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_dashboard.xml b/app/src/main/res/layout/activity_dashboard.xml
new file mode 100644
index 0000000..10bf583
--- /dev/null
+++ b/app/src/main/res/layout/activity_dashboard.xml
@@ -0,0 +1,146 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".DashboardActivity"
+    android:background="@drawable/dashboard_bg">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="30dp">
+
+        <TextView
+            android:id="@+id/text_dashName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Name"
+            android:textStyle="bold"
+            android:textSize="30sp"/>
+
+        <GridLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:columnOrderPreserved="false"
+            android:alignmentMode="alignMargins"
+            android:rowCount="4"
+            android:columnCount="1">
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/card_height"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_columnWeight="1"
+                android:layout_rowWeight="1"
+                app:cardElevation="60dp"
+                app:cardCornerRadius="20dp"
+                android:layout_margin="12dp">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:padding="16dp">
+
+                    <ImageView
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:contentDescription="@string/todo"
+                        android:src="@drawable/height"
+                        tools:ignore="ImageContrastCheck" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="12dp"
+                        android:text="@string/height_tracker"
+                        android:textColor="@color/black"
+                        android:textSize="18sp"/>
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/card_weight"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_columnWeight="1"
+                android:layout_rowWeight="1"
+                app:cardElevation="60dp"
+                app:cardCornerRadius="20dp"
+                android:layout_margin="12dp">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:padding="16dp">
+
+                    <ImageView
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:contentDescription="TODO"
+                        android:src="@drawable/weight"
+                        tools:ignore="ImageContrastCheck" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="12dp"
+                        android:text="@string/weight_tracker"
+                        android:textColor="@color/black"
+                        android:textSize="18sp"/>
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/card_vaccine"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_columnWeight="1"
+                android:layout_rowWeight="1"
+                app:cardElevation="60dp"
+                app:cardCornerRadius="20dp"
+                android:layout_margin="12dp">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:padding="16dp">
+
+                    <ImageView
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:contentDescription="TODO"
+                        android:src="@drawable/vaccine"
+                        tools:ignore="ImageContrastCheck" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="12dp"
+                        android:text="@string/vaccination_tracker"
+                        android:textColor="@color/black"
+                        android:textSize="18sp"/>
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+        </GridLayout>
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/first_page.xml b/app/src/main/res/layout/activity_first_page.xml
similarity index 75%
rename from app/src/main/res/layout/first_page.xml
rename to app/src/main/res/layout/activity_first_page.xml
index a040df4..c0eeb0a 100644
--- a/app/src/main/res/layout/first_page.xml
+++ b/app/src/main/res/layout/activity_first_page.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:context=".FirstPageActivity"
     android:background="@drawable/gradient_background">
 
     <TextView
@@ -11,19 +12,18 @@
         android:layout_width="342dp"
         android:layout_height="52dp"
         android:layout_marginStart="34dp"
-        android:layout_marginTop="308dp"
         android:layout_marginEnd="35dp"
         android:padding="10dp"
-        android:text="Click here to add a new baby"
-        android:textSize="20dp"
-        android:textColor="@color/black"
+        android:text="@string/click_here_to_add_a_new_baby"
         android:textAlignment="center"
-        app:layout_constraintBottom_toTopOf="@+id/btn_signin"
+        android:textColor="@color/black"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/imageView"
-        app:layout_constraintVertical_bias="0.0" />
+        app:layout_constraintTop_toBottomOf="@+id/imageView"
+        app:layout_constraintVertical_bias="0.09" />
 
     <Button
         android:id="@+id/btn_signin"
@@ -36,21 +36,20 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.483"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.585" />
+        app:layout_constraintTop_toBottomOf="@+id/txt_signin"
+        app:layout_constraintVertical_bias="0.067" />
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="415dp"
-        android:layout_height="238dp"
+        android:layout_width="404dp"
+        android:layout_height="237dp"
+        android:contentDescription="@string/todo"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
-        app:srcCompat="@drawable/logo"
-        android:contentDescription="@string/todo" />
+        app:srcCompat="@drawable/logo" />
 
     <ImageView
         android:id="@+id/imageView3"
@@ -71,13 +70,13 @@
         android:layout_marginTop="68dp"
         android:layout_marginEnd="35dp"
         android:padding="10dp"
-        android:text="Click here to go to the Baby List"
-        android:textSize="20dp"
-        android:textColor="@color/black"
+        android:text="@string/click_here_to_go_to_the_dashboard"
         android:textAlignment="center"
-        app:layout_constraintBottom_toTopOf="@+id/btn_login"
+        android:textColor="@color/black"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintHorizontal_bias="0.545"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/btn_signin"
         app:layout_constraintVertical_bias="0.0"
@@ -89,12 +88,12 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="158dp"
         android:layout_marginEnd="159dp"
-        android:text="@string/go_to_baby_list"
+        android:text="Go to the dashboard"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.492"
+        app:layout_constraintHorizontal_bias="0.495"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btn_signin"
-        app:layout_constraintVertical_bias="0.689" />
+        app:layout_constraintTop_toBottomOf="@+id/textView3"
+        app:layout_constraintVertical_bias="0.21" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/height_tracker.xml b/app/src/main/res/layout/activity_height_tracker.xml
similarity index 90%
rename from app/src/main/res/layout/height_tracker.xml
rename to app/src/main/res/layout/activity_height_tracker.xml
index 845e009..781f265 100644
--- a/app/src/main/res/layout/height_tracker.xml
+++ b/app/src/main/res/layout/activity_height_tracker.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:context=".HeightTrackerActivity"
     android:background="@drawable/gradient_background">
 
     <LinearLayout
@@ -61,20 +62,6 @@
 
     </LinearLayout>
 
-    <EditText
-        android:id="@+id/editText_Height"
-        android:layout_width="345dp"
-        android:layout_height="68dp"
-        android:ems="10"
-        android:importantForAutofill="no"
-        android:inputType="textPersonName"
-        android:text="@string/height_in_cm"
-        app:layout_constraintBottom_toTopOf="@+id/text_height_comment"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.547" />
-
     <Button
         android:id="@+id/btn_height_add"
         android:layout_width="wrap_content"
@@ -119,16 +106,16 @@
         android:id="@+id/textView12"
         android:layout_width="340dp"
         android:layout_height="45dp"
-        android:layout_marginTop="32dp"
+        android:layout_marginBottom="124dp"
         android:text="Age"
-        android:textSize="20dp"
         android:textColor="#000000"
+        android:textSize="20dp"
         app:layout_constraintBottom_toTopOf="@+id/text_height_comment"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.535"
+        app:layout_constraintHorizontal_bias="0.521"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editText_Height"
-        app:layout_constraintVertical_bias="0.0" />
+        app:layout_constraintTop_toBottomOf="@+id/editTxt_Height"
+        app:layout_constraintVertical_bias="1.0" />
 
     <EditText
         android:id="@+id/editText_Years"
@@ -141,7 +128,6 @@
         android:text="Years"
         app:layout_constraintBottom_toTopOf="@+id/text_height_comment"
         app:layout_constraintEnd_toStartOf="@+id/editText_Months"
-        app:layout_constraintHorizontal_bias="0.513"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView12"
         app:layout_constraintVertical_bias="1.0" />
@@ -163,5 +149,18 @@
         app:layout_constraintTop_toBottomOf="@+id/textView12"
         app:layout_constraintVertical_bias="1.0" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <EditText
+        android:id="@+id/editTxt_Height"
+        android:layout_width="343dp"
+        android:layout_height="57dp"
+        android:ems="10"
+        android:inputType="number"
+        android:text="Height in cm"
+        app:layout_constraintBottom_toTopOf="@+id/text_height_comment"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.47"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.517" />
 
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/vaccination.xml b/app/src/main/res/layout/activity_vaccination.xml
similarity index 99%
rename from app/src/main/res/layout/vaccination.xml
rename to app/src/main/res/layout/activity_vaccination.xml
index c662672..269d78d 100644
--- a/app/src/main/res/layout/vaccination.xml
+++ b/app/src/main/res/layout/activity_vaccination.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:context=".VaccinationActivity"
     android:background="@drawable/gradient_background">
 
     <TextView
diff --git a/app/src/main/res/layout/vaccination_tracker.xml b/app/src/main/res/layout/activity_vaccination_tracker.xml
similarity index 96%
rename from app/src/main/res/layout/vaccination_tracker.xml
rename to app/src/main/res/layout/activity_vaccination_tracker.xml
index 3c42d33..aecf463 100644
--- a/app/src/main/res/layout/vaccination_tracker.xml
+++ b/app/src/main/res/layout/activity_vaccination_tracker.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:context=".VaccinationTrackerActivity"
     android:background="@drawable/gradient_background">
 
     <LinearLayout
@@ -63,7 +64,7 @@
     </LinearLayout>
 
     <Button
-        android:id="@+id/button3"
+        android:id="@+id/btn_vaccine_back"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="15dp"
@@ -75,30 +76,16 @@
         app:layout_constraintTop_toBottomOf="@+id/scrollView2"
         tools:ignore="TextContrastCheck" />
 
-    <TextView
-        android:id="@+id/textView8"
-        android:layout_width="411dp"
-        android:layout_height="31dp"
-        android:layout_marginTop="32dp"
-        android:paddingTop="5dp"
-        android:text="@string/update_the_vaccination_status_of_the_baby"
-        android:background="#94B4CD"
-        android:textAlignment="center"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout2" />
 
     <ScrollView
         android:id="@+id/scrollView2"
         android:layout_width="match_parent"
         android:layout_height="450dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/btn_vaccine_back"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView8"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
         app:layout_constraintVertical_bias="0.0">
 
         <LinearLayout
@@ -535,7 +522,7 @@
                 <CheckBox
                     android:id="@+id/checkbox_vacTrack16"
                     android:layout_width="wrap_content"
-                    android:layout_height="50sp"/>
+                    android:layout_height="50sp" />
 
             </LinearLayout>
 
@@ -561,7 +548,7 @@
                 <CheckBox
                     android:id="@+id/checkbox_vacTrack17"
                     android:layout_width="wrap_content"
-                    android:layout_height="50sp"/>
+                    android:layout_height="50sp" />
 
             </LinearLayout>
 
@@ -587,7 +574,7 @@
                 <CheckBox
                     android:id="@+id/checkbox_vacTrack18"
                     android:layout_width="wrap_content"
-                    android:layout_height="50sp"/>
+                    android:layout_height="50sp" />
 
             </LinearLayout>
 
@@ -613,12 +600,11 @@
                 <CheckBox
                     android:id="@+id/checkbox_vacTrack19"
                     android:layout_width="wrap_content"
-                    android:layout_height="50sp"/>
+                    android:layout_height="50sp" />
 
             </LinearLayout>
 
         </LinearLayout>
     </ScrollView>
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/weight_tracker.xml b/app/src/main/res/layout/activity_weight_tracker.xml
similarity index 93%
rename from app/src/main/res/layout/weight_tracker.xml
rename to app/src/main/res/layout/activity_weight_tracker.xml
index c5063a4..877a0f3 100644
--- a/app/src/main/res/layout/weight_tracker.xml
+++ b/app/src/main/res/layout/activity_weight_tracker.xml
@@ -4,13 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:context=".WeightTrackerActivity"
     android:background="@drawable/gradient_background">
 
     <LinearLayout
         android:id="@+id/linearLayout3"
-        android:layout_width="488dp"
-        android:layout_height="158dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="vertical"
+        android:layout_marginTop="10dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -25,8 +27,8 @@
 
             <ImageView
                 android:id="@+id/imageView6"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="246dp"
+                android:layout_height="170dp"
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:contentDescription="@string/todo"
@@ -135,10 +137,10 @@
         android:text="Years"
         app:layout_constraintBottom_toTopOf="@+id/text_weight_comment"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.213"
+        app:layout_constraintHorizontal_bias="0.13"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView13"
-        app:layout_constraintVertical_bias="0.01" />
+        app:layout_constraintVertical_bias="0.0" />
 
     <EditText
         android:id="@+id/editText_weight_months"
@@ -149,7 +151,7 @@
         android:text="Months"
         app:layout_constraintBottom_toTopOf="@+id/text_weight_comment"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.767"
+        app:layout_constraintHorizontal_bias="0.858"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView13"
         app:layout_constraintVertical_bias="0.0" />
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
new file mode 100644
index 0000000..4f68632
--- /dev/null
+++ b/app/src/main/res/layout/content_main.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+    <fragment
+        android:id="@+id/nav_host_fragment_content_main"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:defaultNavHost="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navGraph="@navigation/nav_graph" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dashboard.xml b/app/src/main/res/layout/dashboard.xml
deleted file mode 100644
index 3e9d79a..0000000
--- a/app/src/main/res/layout/dashboard.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView 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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/dashboard_bg">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="30dp">
-
-            <TextView
-                android:id="@+id/text_dashName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Name"
-                android:textStyle="bold"
-                android:textSize="30sp"/>
-
-            <GridLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:columnOrderPreserved="false"
-                android:alignmentMode="alignMargins"
-                android:rowCount="4"
-                android:columnCount="1">
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/card_height"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_columnWeight="1"
-                    android:layout_rowWeight="1"
-                    app:cardElevation="60dp"
-                    app:cardCornerRadius="20dp"
-                    android:layout_margin="12dp">
-
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:padding="16dp">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:contentDescription="@string/todo"
-                            android:src="@drawable/height"
-                            tools:ignore="ImageContrastCheck" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="12dp"
-                            android:text="@string/height_tracker"
-                            android:textColor="@color/black"
-                            android:textSize="18sp"/>
-
-                    </LinearLayout>
-
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/card_weight"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_columnWeight="1"
-                    android:layout_rowWeight="1"
-                    app:cardElevation="60dp"
-                    app:cardCornerRadius="20dp"
-                    android:layout_margin="12dp">
-
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:padding="16dp">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:contentDescription="TODO"
-                            android:src="@drawable/weight"
-                            tools:ignore="ImageContrastCheck" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="12dp"
-                            android:text="@string/weight_tracker"
-                            android:textColor="@color/black"
-                            android:textSize="18sp"/>
-
-                    </LinearLayout>
-
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/card_vaccine"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_columnWeight="1"
-                    android:layout_rowWeight="1"
-                    app:cardElevation="60dp"
-                    app:cardCornerRadius="20dp"
-                    android:layout_margin="12dp">
-
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:padding="16dp">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:contentDescription="TODO"
-                            android:src="@drawable/vaccine"
-                            tools:ignore="ImageContrastCheck" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="12dp"
-                            android:text="@string/vaccination_tracker"
-                            android:textColor="@color/black"
-                            android:textSize="18sp"/>
-
-                    </LinearLayout>
-
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/card_babylist"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_columnWeight="1"
-                    android:layout_rowWeight="1"
-                    app:cardElevation="60dp"
-                    app:cardCornerRadius="20dp"
-                    android:layout_margin="12dp">
-
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:padding="16dp">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:contentDescription="TODO"
-                            android:src="@drawable/baby_list"
-                            tools:ignore="ImageContrastCheck" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="12dp"
-                            android:text="@string/baby_list"
-                            android:textColor="@color/black"
-                            android:textSize="18sp"/>
-
-                    </LinearLayout>
-
-                </androidx.cardview.widget.CardView>
-
-            </GridLayout>
-
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
new file mode 100644
index 0000000..165849b
--- /dev/null
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation 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/nav_graph"
+    app:startDestination="@id/FirstFragment">
+
+    <fragment
+        android:id="@+id/FirstFragment"
+        android:name="com.example.babycare.FirstFragment"
+        android:label="@string/first_fragment_label"
+        tools:layout="@layout/fragment_first">
+
+        <action
+            android:id="@+id/action_FirstFragment_to_SecondFragment"
+            app:destination="@id/SecondFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/SecondFragment"
+        android:name="com.example.babycare.SecondFragment"
+        android:label="@string/second_fragment_label"
+        tools:layout="@layout/fragment_second">
+
+        <action
+            android:id="@+id/action_SecondFragment_to_FirstFragment"
+            app:destination="@id/FirstFragment" />
+    </fragment>
+</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
new file mode 100644
index 0000000..22d7f00
--- /dev/null
+++ b/app/src/main/res/values-land/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="fab_margin">48dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w1240dp/dimens.xml b/app/src/main/res/values-w1240dp/dimens.xml
new file mode 100644
index 0000000..d73f4a3
--- /dev/null
+++ b/app/src/main/res/values-w1240dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="fab_margin">200dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml
new file mode 100644
index 0000000..22d7f00
--- /dev/null
+++ b/app/src/main/res/values-w600dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="fab_margin">48dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..125df87
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="fab_margin">16dp</dimen>
+</resources>
\ 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 2de2069..b1a6a7f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,4 +41,15 @@
     <string name="height_in_cm">Height in cm</string>
     <string name="weight_tracker">Weight Tracker</string>
     <string name="baby_list">Baby List</string>
+    <string name="title_activity_main2">MainActivity2</string>
+    <!-- Strings used for fragments for navigation -->
+    <string name="first_fragment_label">First Fragment</string>
+    <string name="second_fragment_label">Second Fragment</string>
+    <string name="next">Next</string>
+    <string name="previous">Previous</string>
+
+    <string name="hello_first_fragment">Hello first fragment</string>
+    <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
+    <string name="click_here_to_add_a_new_baby">Click here to add a new baby</string>
+    <string name="click_here_to_go_to_the_dashboard">Click here to go to the Dashboard</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c431713..46c452b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -13,4 +13,13 @@
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
+
+    <style name="Theme.BabyCare.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="Theme.BabyCare.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="Theme.BabyCare.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 </resources>
\ No newline at end of file