diff --git a/.idea/misc.xml b/.idea/misc.xml
index d6e772b..963f9c3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,13 +3,16 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/CODING/Android Projects/Android_Course/ProjectClean/app/src/main/res/layout/activity_create_post.xml" value="0.33" />
-        <entry key="..\:/CODING/Android Projects/Android_Course/ProjectClean/app/src/main/res/layout/activity_display_grievance.xml" value="0.25" />
-        <entry key="..\:/CODING/Android Projects/Android_Course/ProjectClean/app/src/main/res/layout/activity_login.xml" value="0.16576086956521738" />
-        <entry key="..\:/CODING/Android Projects/Android_Course/ProjectClean/app/src/main/res/layout/activity_main.xml" value="0.1" />
-        <entry key="..\:/CODING/Android Projects/Android_Course/ProjectClean/app/src/main/res/layout/activity_profile_setup.xml" value="0.25" />
-        <entry key="..\:/CODING/Android Projects/Android_Course/ProjectClean/app/src/main/res/layout/activity_register.xml" value="0.25" />
-        <entry key="..\:/CODING/Android Projects/Android_Course/ProjectClean/app/src/main/res/layout/single_grievance_item_view.xml" value="0.22" />
+        <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout-w936dp/content_scrolling.xml" value="0.10211748633879782" />
+        <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_create_post.xml" value="0.25" />
+        <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_display_grievance.xml" value="0.1609375" />
+        <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_grievance_detail.xml" value="0.22" />
+        <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_login.xml" value="0.33" />
+        <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_main.xml" value="0.33" />
+        <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_profile_setup.xml" value="0.25" />
+        <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_register.xml" value="0.33" />
+        <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/list_item.xml" value="0.3411458333333333" />
+        <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/single_grievance_item_view.xml" value="0.33" />
       </map>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 12eb30d..08990ab 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'com.google.android.gms:play-services-maps:18.0.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 321a7af..cda26f4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.harshad.projectclean">
+    package="com.harshad.projectclean" >
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="28" />
 
     <application
@@ -12,7 +13,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.ProjectClean">
+        android:theme="@style/Theme.ProjectClean" >
         <activity
             android:name=".CreatePost"
             android:exported="false" />
@@ -27,16 +28,16 @@
             android:exported="false" />
         <activity
             android:name=".LoginActivity"
-            android:exported="true">
+            android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".MainActivity"
-            android:exported="false">
+            android:exported="false" >
         </activity>
     </application>
 
diff --git a/app/src/main/java/com/harshad/projectclean/CreatePost.kt b/app/src/main/java/com/harshad/projectclean/CreatePost.kt
index ef24aed..5507c9e 100644
--- a/app/src/main/java/com/harshad/projectclean/CreatePost.kt
+++ b/app/src/main/java/com/harshad/projectclean/CreatePost.kt
@@ -41,6 +41,16 @@ class CreatePost : AppCompatActivity() {
         binding = ActivityCreatePostBinding.inflate(layoutInflater)
         val view = binding.root
         setContentView(view)
+
+        ImagePicker.with(this).cameraOnly()
+            .compress(512)
+            .saveDir(getExternalFilesDir(Environment.DIRECTORY_PICTURES)!!).start()
+
+        binding.fabImg.setOnClickListener {
+            ImagePicker.with(this).cameraOnly()
+                .compress(512)
+                .saveDir(getExternalFilesDir(Environment.DIRECTORY_PICTURES)!!).start()
+        }
         sharedPref = getSharedPreferences("SP", Context.MODE_PRIVATE)
 
         actv = binding.dropMenu
@@ -51,9 +61,7 @@ class CreatePost : AppCompatActivity() {
             Toast.makeText(applicationContext, "Item: $item", Toast.LENGTH_SHORT).show()
         })
 
-        ImagePicker.with(this).cameraOnly()
-            .compress(512)
-            .saveDir(getExternalFilesDir(Environment.DIRECTORY_PICTURES)!!).start()
+
 
         binding.btnSave.setOnClickListener {
             val griTitle = binding.edDesc.text.trim().toString()
diff --git a/app/src/main/java/com/harshad/projectclean/LoginActivity.kt b/app/src/main/java/com/harshad/projectclean/LoginActivity.kt
index 51daa3e..d7c4fb8 100644
--- a/app/src/main/java/com/harshad/projectclean/LoginActivity.kt
+++ b/app/src/main/java/com/harshad/projectclean/LoginActivity.kt
@@ -6,9 +6,6 @@ import android.content.SharedPreferences
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
-import android.widget.Button
-import android.widget.CheckBox
-import android.widget.TextView
 import android.widget.Toast
 import com.harshad.projectclean.APIRequests.ApiClient
 import com.harshad.projectclean.APIRequests.authentication_data_class.CurrentLoggedUserResponse
@@ -18,7 +15,6 @@ import com.harshad.projectclean.databinding.ActivityLoginBinding
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import kotlin.math.log
 
 class LoginActivity : AppCompatActivity() {
     lateinit var sharedPref: SharedPreferences
@@ -48,13 +44,13 @@ class LoginActivity : AppCompatActivity() {
 
 
         binding.btnLogin.setOnClickListener {
-            if (binding.edUsername.text.trim().isNotEmpty() || binding.edPassword.text.trim()
+            if (binding.edEmail.text.trim().isNotEmpty() || binding.edPassword.text.trim()
                     .isNotEmpty()
             ) {
-                val username: String = binding.edUsername.text.trim().toString()
+                val email: String = binding.edEmail.text.trim().toString()
                 val password: String = binding.edPassword.text.trim().toString()
                 validate()
-                login(this, username, password)
+                login(this, email, password)
                 //Toast.makeText(this,"Remember",Toast.LENGTH_LONG).show()
 
             } else {
@@ -127,7 +123,7 @@ class LoginActivity : AppCompatActivity() {
             })
     }
     private fun validate(): Boolean {
-        if (binding.edUsername.text.trim().isNotEmpty() || binding.edPassword.text.trim()
+        if (binding.edEmail.text.trim().isNotEmpty() || binding.edPassword.text.trim()
                 .isNotEmpty()
         ) {
             return true
diff --git a/app/src/main/java/com/harshad/projectclean/MainActivity.kt b/app/src/main/java/com/harshad/projectclean/MainActivity.kt
index c3fdb26..940ddef 100644
--- a/app/src/main/java/com/harshad/projectclean/MainActivity.kt
+++ b/app/src/main/java/com/harshad/projectclean/MainActivity.kt
@@ -10,14 +10,14 @@ import android.view.View
 import com.harshad.projectclean.APIRequests.ApiClient
 import com.harshad.projectclean.APIRequests.grievance_data_class.*
 import com.harshad.projectclean.databinding.ActivityMainBinding
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.MultipartBody
-import okhttp3.RequestBody.Companion.asRequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import java.io.File
+//import okhttp3.MediaType.Companion.toMediaType
+//import okhttp3.MultipartBody
+//import okhttp3.RequestBody.Companion.asRequestBody
+//import okhttp3.RequestBody.Companion.toRequestBody
+//import retrofit2.Call
+//import retrofit2.Callback
+//import retrofit2.Response
+//import java.io.File
 
 
 class MainActivity : AppCompatActivity() {
diff --git a/app/src/main/java/com/harshad/projectclean/ProfileSetup.kt b/app/src/main/java/com/harshad/projectclean/ProfileSetup.kt
index 686abeb..0c0fbb9 100644
--- a/app/src/main/java/com/harshad/projectclean/ProfileSetup.kt
+++ b/app/src/main/java/com/harshad/projectclean/ProfileSetup.kt
@@ -25,7 +25,8 @@ class ProfileSetup : AppCompatActivity() {
         setContentView(view)
         sharedPref = getSharedPreferences("SP", Context.MODE_PRIVATE)
         binding.edUsername.setText(sharedPref.getString("username","none"))
-        binding.edPhoneno.setText(sharedPref.getString("phoneno","none"))
+        binding.edEmail.setText(sharedPref.getString("email","none"))
+        binding.edPassword.setText(sharedPref.getString("password","none"))
         binding.edFirstname.requestFocus()
         binding.btnSave.setOnClickListener {
             val intent = Intent(this, DisplayGrievance::class.java)
diff --git a/app/src/main/java/com/harshad/projectclean/RegisterActivity.kt b/app/src/main/java/com/harshad/projectclean/RegisterActivity.kt
index f54d6e8..25a9c04 100644
--- a/app/src/main/java/com/harshad/projectclean/RegisterActivity.kt
+++ b/app/src/main/java/com/harshad/projectclean/RegisterActivity.kt
@@ -32,12 +32,13 @@ class RegisterActivity : AppCompatActivity() {
 
         binding.btnSignup.setOnClickListener{
             if(validate()){
-                //val phoneno:String = binding.edPhoneno.text.toString()
+                val email:String = binding.edEmail.text.toString()
                 val username:String = binding.edUsername.text.toString()
                 val password:String = binding.edPassword.text.toString()
                 val editor : SharedPreferences.Editor =sharedPref.edit()
                 editor.putString("username", username)
-                //editor.putString("phoneno", phoneno)
+                editor.putString("email", email)
+                editor.putString("password", password)
 
                 editor.apply()
                 Toast.makeText(this,"Profile", Toast.LENGTH_LONG).show()
diff --git a/app/src/main/java/com/harshad/projectclean/grievance_recycler_view_classes/GrievanceRecycleViewAdapter.kt b/app/src/main/java/com/harshad/projectclean/grievance_recycler_view_classes/GrievanceRecycleViewAdapter.kt
index 4e5435c..4916184 100644
--- a/app/src/main/java/com/harshad/projectclean/grievance_recycler_view_classes/GrievanceRecycleViewAdapter.kt
+++ b/app/src/main/java/com/harshad/projectclean/grievance_recycler_view_classes/GrievanceRecycleViewAdapter.kt
@@ -41,7 +41,7 @@ class GrievanceRecycleViewAdapter(private val context: Context, private val grie
     class GrievanceViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView){
         var gri_title = itemView.findViewById<TextView>(R.id.tv_gri_title)
         var gri_location = itemView.findViewById<TextView>(R.id.tv_gri_location)
-        var gri_desc = itemView.findViewById<TextView>(R.id.tv_gri_desc)
+        var gri_desc = itemView.findViewById<TextView>(R.id.tvDesc)
         var gri_img = itemView.findViewById<ImageView>(R.id.iv_gri_img)
         var gri_like_btn = itemView.findViewById<Button>(R.id.btn_griLike)
         var gri_comment_btn = itemView.findViewById<Button>(R.id.btn_griComment)
diff --git a/app/src/main/res/layout/activity_create_post.xml b/app/src/main/res/layout/activity_create_post.xml
index ca8b5f5..38630c2 100644
--- a/app/src/main/res/layout/activity_create_post.xml
+++ b/app/src/main/res/layout/activity_create_post.xml
@@ -21,70 +21,123 @@
         tools:srcCompat="@tools:sample/backgrounds/scenic"
         android:contentDescription="@string/grievance_image" />
 
-    <TextView
-        android:id="@+id/tvLocation"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="30dp"
-        android:layout_marginTop="20dp"
-        android:text="19.71280, 71.89764"
-        android:textSize="16sp"
-        app:layout_constraintBottom_toTopOf="@+id/tvDesc"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/ivGriImg"
-        app:layout_constraintVertical_bias="0.22000003" />
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabImg"
+        android:layout_width="0dp"
+        android:layout_height="55dp"
+        android:layout_marginEnd="32dp"
+        android:clickable="true"
+        android:contentDescription="FAB"
+        android:focusable="true"
+        android:foregroundGravity="center"
+        app:backgroundTint="#FFFFFFFF"
+        app:layout_constraintBottom_toBottomOf="@+id/ivGriImg"
+        app:layout_constraintEnd_toEndOf="@+id/ivGriImg"
+        app:srcCompat="@android:drawable/ic_menu_camera" />
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/tvDesc"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="30dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="30dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvLocation">
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@+id/ivGriImg"
+        android:fillViewport="true"
+        app:layout_constraintBottom_toBottomOf="parent">
 
-        <EditText
-            android:id="@+id/edDesc"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autofillHints="phone"
-            android:hint="@string/describe"
-            android:inputType="textMultiLine"
-            android:lines="3"
-            android:textSize="18sp" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/layoutDropdown"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="30dp"
-        android:hint="@string/select"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvDesc">
+            android:layout_height="0dp">
 
-        <AutoCompleteTextView
-            android:id="@+id/dropMenu"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="none"
-            android:textSize="18sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textDesc" />
-    </com.google.android.material.textfield.TextInputLayout>
-    <Button
-        android:id="@+id/btnSave"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/teal_200"
-        android:layout_margin="30dp"
-        app:layout_constraintTop_toBottomOf="@+id/layoutDropdown"
-        android:text="@string/save"
-        android:textColor="@color/white" />
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:id="@+id/tvTitle"
+                android:layout_width="match_parent"
+                android:layout_margin="30dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_height="wrap_content">
+
+                <EditText
+                    android:id="@+id/edTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="username"
+                    android:hint="Title"
+                    android:inputType="text"
+                    android:maxLines="1" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+
+            <TextView
+                android:id="@+id/tvLocation"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="19.71280, 71.89764"
+                android:textSize="16sp"
+                app:layout_constraintStart_toStartOf="parent"
+                android:layout_margin="30dp"
+                app:layout_constraintTop_toBottomOf="@id/tvTitle"/>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:id="@+id/tvDesc"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="30dp"
+                app:layout_constraintTop_toBottomOf="@id/tvLocation"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent">
+
+                <EditText
+                    android:id="@+id/edDesc"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="phone"
+                    android:hint="@string/describe"
+                    android:inputType="textMultiLine"
+                    android:lines="3"
+                    android:textSize="18sp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/layoutDropdown"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="30dp"
+                android:hint="@string/select"
+                app:layout_constraintTop_toBottomOf="@id/tvDesc"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent">
+
+                <AutoCompleteTextView
+                    android:id="@+id/dropMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="none"
+                    android:textSize="18sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/textDesc" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+
+
+
+            <Button
+                android:id="@+id/btnSave"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="30dp"
+                android:layout_marginBottom="10dp"
+                android:background="@color/teal_200"
+                android:text="@string/save"
+                android:textColor="@color/white"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/layoutDropdown"/>
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index a38625d..fb84e9c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -21,7 +21,8 @@
         />
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/tvUsername"
+        android:id="@+id/tvEmail"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_marginStart="30dp"
         android:layout_marginEnd="30dp"
@@ -32,17 +33,19 @@
         android:layout_height="wrap_content">
 
         <EditText
-            android:id="@+id/edUsername"
+            android:id="@+id/edEmail"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:maxLines="1"
-            android:inputType="textPersonName"
-            android:hint="@string/username"
+            android:inputType="textEmailAddress"
+            android:hint="Email"
+            android:autofillHints="emailAddress"
             />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tvPassword"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_marginStart="30dp"
         android:layout_marginEnd="30dp"
@@ -50,7 +53,7 @@
         app:passwordToggleEnabled="true"
         app:counterEnabled="true"
         app:counterMaxLength="16"
-        app:layout_constraintTop_toBottomOf="@+id/tvUsername"
+        app:layout_constraintTop_toBottomOf="@+id/tvEmail"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_height="wrap_content">
@@ -61,6 +64,7 @@
             android:hint="@string/password"
             android:maxLength="16"
             android:lines="1"
+            android:autofillHints="password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             />
diff --git a/app/src/main/res/layout/activity_profile_setup.xml b/app/src/main/res/layout/activity_profile_setup.xml
index 0f910fd..3702dba 100644
--- a/app/src/main/res/layout/activity_profile_setup.xml
+++ b/app/src/main/res/layout/activity_profile_setup.xml
@@ -1,155 +1,216 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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=".RegisterActivity">
-
-
-    <ImageView
-        android:id="@+id/imgTop"
-        android:layout_height="150dp"
-        android:scaleType="centerCrop"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:srcCompat="@tools:sample/backgrounds/scenic"
-        android:layout_width="match_parent"
-        android:contentDescription="Cover Image" />
-
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/profile_image"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
-        android:backgroundTint="#C12F2F"
-        android:src="@android:drawable/ic_menu_report_image"
-        app:civ_border_color="#ffffff"
-        app:civ_border_width="5dp"
-        app:layout_constraintBottom_toBottomOf="@+id/imgTop"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imgTop" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fabImg"
-        android:layout_width="49dp"
-        android:layout_height="55dp"
-        android:clickable="true"
-        android:foregroundGravity="center"
-        app:backgroundTint="#00FFFFFF"
-        app:layout_constraintBottom_toBottomOf="@+id/profile_image"
-        app:layout_constraintEnd_toEndOf="@+id/profile_image"
-        app:srcCompat="@android:drawable/ic_menu_camera"
-        android:contentDescription="FAB"
-        android:focusable="true" />
-
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/tvUsername"
-        android:layout_width="match_parent"
-        android:layout_marginStart="30dp"
-        android:layout_marginEnd="30dp"
-        android:layout_marginTop="30dp"
-        app:layout_constraintTop_toBottomOf="@id/profile_image"
-        app:layout_constraintBottom_toTopOf="@id/tvPhoneno"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_height="wrap_content">
-
-        <EditText
-            android:id="@+id/edUsername"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/username"
-            android:inputType="none"
-            android:enabled="false"
-            android:maxLines="1"
-            android:autofillHints="username"
-            />
-
-    </com.google.android.material.textfield.TextInputLayout>
+    android:layout_height="wrap_content"
+    android:fillViewport="true">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:context=".RegisterActivity">
 
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/tvPhoneno"
-        android:layout_width="match_parent"
-        android:layout_marginStart="30dp"
-        android:layout_marginEnd="30dp"
-        android:layout_marginTop="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tvUsername"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_height="wrap_content">
-
-        <EditText
-            android:id="@+id/edPhoneno"
+        <ImageView
+            android:id="@+id/imgTop"
             android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:contentDescription="Cover Image"
+            android:scaleType="centerCrop"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:srcCompat="@tools:sample/backgrounds/scenic" />
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/profile_image"
+            android:layout_width="120dp"
+            android:layout_height="120dp"
+            android:backgroundTint="#C12F2F"
+            android:src="@android:drawable/ic_menu_report_image"
+            app:civ_border_color="#ffffff"
+            app:civ_border_width="5dp"
+            app:layout_constraintBottom_toBottomOf="@+id/imgTop"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/imgTop" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fabImg"
+            android:layout_width="49dp"
+            android:layout_height="55dp"
+            android:clickable="true"
+            android:contentDescription="FAB"
+            android:focusable="true"
+            android:foregroundGravity="center"
+            app:backgroundTint="#00FFFFFF"
+            app:layout_constraintBottom_toBottomOf="@+id/profile_image"
+            app:layout_constraintEnd_toEndOf="@+id/profile_image"
+            app:srcCompat="@android:drawable/ic_menu_camera" />
+
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:id="@+id/tvFirstname"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:hint="@string/phone_no"
-            android:inputType="none"
-            android:enabled="false"
-            android:maxLines="1"
-            android:maxLength="10"
-            android:autofillHints="phone"
-            />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/tvFirstname"
-        android:layout_width="match_parent"
-        android:layout_marginStart="30dp"
-        android:layout_marginEnd="30dp"
-        android:layout_marginTop="30dp"
-        app:layout_constraintTop_toBottomOf="@+id/tvPhoneno"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_height="wrap_content">
-
-        <EditText
-            android:id="@+id/edFirstname"
-            android:inputType="textPersonName"
-            android:hint="@string/first_name"
-            android:maxLines="1"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="30dp"
+            android:layout_marginEnd="4dp"
+            app:layout_constraintEnd_toEndOf="@id/guideline2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/profile_image">
+
+            <EditText
+                android:id="@+id/edFirstname"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="name"
+                android:hint="@string/first_name"
+                android:inputType="textPersonName"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:id="@+id/tvLastname"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginTop="30dp"
+            android:layout_marginEnd="30dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/guideline2"
+            app:layout_constraintTop_toBottomOf="@id/profile_image">
+
+            <EditText
+                android:id="@+id/edLastname"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="name"
+                android:hint="@string/last_name"
+                android:inputType="textPersonName"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:id="@+id/tvEmail"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:autofillHints="name"
-            />
-    </com.google.android.material.textfield.TextInputLayout>
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/tvLastname"
-        android:layout_width="match_parent"
-        android:layout_marginStart="30dp"
-        android:layout_marginEnd="30dp"
-        android:layout_marginTop="30dp"
-        app:layout_constraintTop_toBottomOf="@+id/tvFirstname"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_height="wrap_content">
-
-        <EditText
-            android:id="@+id/edLastname"
-            android:inputType="textPersonName"
-            android:hint="@string/last_name"
-            android:maxLines="1"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="30dp"
+            android:layout_marginEnd="30dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvFirstname">
+
+            <EditText
+                android:id="@+id/edEmail"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="emailAddress"
+                android:hint="Email"
+                android:inputType="textEmailAddress"
+                android:maxLines="1" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:id="@+id/tvUsername"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="30dp"
+            android:layout_marginEnd="30dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvEmail">
+
+            <EditText
+                android:id="@+id/edUsername"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="username"
+                android:enabled="false"
+                android:hint="@string/username"
+                android:inputType="none"
+                android:maxLines="1" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:id="@+id/tvPassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="30dp"
+            android:layout_marginEnd="30dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvUsername">
+
+            <EditText
+                android:id="@+id/edPassword"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="password"
+                android:hint="@string/password"
+                android:inputType="textPassword"
+                android:maxLines="1" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:id="@+id/tvPhoneno"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:autofillHints="name"
-            />
-    </com.google.android.material.textfield.TextInputLayout>
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="30dp"
+            android:layout_marginEnd="30dp"
+            app:counterEnabled="true"
+            app:counterMaxLength="10"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvPassword">
+
+            <EditText
+                android:id="@+id/edPhoneno"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="phone"
+                android:hint="@string/phone_no"
+                android:inputType="phone"
+                android:maxLength="10"
+                android:maxLines="1" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+        <Button
+            android:id="@+id/btnSave"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="30dp"
+            android:background="@color/teal_200"
+            android:text="@string/save"
+            android:textColor="@color/white"
+            app:layout_constraintTop_toBottomOf="@+id/tvPhoneno" />
 
-    <Button
-        android:id="@+id/btnSave"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/teal_200"
-        android:layout_margin="30dp"
-        app:layout_constraintTop_toBottomOf="@+id/tvLastname"
-        android:text="@string/save"
-        android:textColor="@color/white" />
 
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.5" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 54a6d3c..7cb7451 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -24,6 +24,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tvEmail"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="30dp"
@@ -39,13 +40,14 @@
             android:layout_height="wrap_content"
             android:autofillHints="username"
             android:hint="Email"
-            android:inputType="text"
+            android:inputType="textEmailAddress"
             android:maxLines="1" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tvUsername"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="30dp"
@@ -68,6 +70,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tvPassword"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="30dp"
diff --git a/app/src/main/res/layout/single_grievance_item_view.xml b/app/src/main/res/layout/single_grievance_item_view.xml
index 07a39fa..29cbece 100644
--- a/app/src/main/res/layout/single_grievance_item_view.xml
+++ b/app/src/main/res/layout/single_grievance_item_view.xml
@@ -3,36 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="20dp"
-    android:layout_marginRight="20dp"
-    android:layout_marginBottom="20dp"
-    android:background="#FFFFFF"
-    android:elevation="20dp"
-    android:padding="10dp"
-    android:paddingBottom="10dp"
-    >
-
-
-    <Button
-        android:id="@+id/btn_griLike"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="8dp"
-        android:text="Like"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_gri_desc" />
-
-    <Button
-        android:id="@+id/btn_griComment"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="25dp"
-        android:text="Comment"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_gri_desc" />
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/iv_gri_img"
@@ -43,42 +14,99 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:srcCompat="@tools:sample/avatars" />
 
-    <TextView
-        android:id="@+id/tv_gri_desc"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="25dp"
-        android:layout_marginTop="4dp"
-        android:text="TextView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_gri_location" />
-
-    <TextView
-        android:id="@+id/tv_gri_title"
-        style="@style/TextAppearance.AppCompat.Headline"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="12dp"
-        android:layout_marginTop="12dp"
-        android:text="TextView"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.045"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/iv_gri_img" />
-
-    <TextView
-        android:id="@+id/tv_gri_location"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="25dp"
-        android:layout_marginTop="4dp"
-        android:text="TextView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_gri_title" />
+        android:layout_height="0dp"
+        android:fillViewport="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/iv_gri_img">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/btn_griLike"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Like"
+                android:layout_margin="30dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_totopOf="parent" />
+
+            <Button
+                android:id="@+id/btn_griComment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Comment"
+                android:layout_marginHorizontal="30dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_griLike" />
+
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.5" />
+
+            <TextView
+                android:id="@+id/tv_gri_title"
+                style="@style/TextAppearance.AppCompat.Headline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="30dp"
+                android:text="Title"
+                android:textSize="18sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_gri_location"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="30dp"
+                android:layout_marginVertical="10dp"
+                android:text="location"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_gri_title" />
+
+
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:id="@id/tvDesc"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_gri_location"
+                android:layout_marginVertical="10dp"
+                android:layout_marginHorizontal="30dp">
+                <TextView
+                    android:id="@+id/edDesc"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="Description"
+                    android:lines="5"
+                    android:textSize="16sp">
+                </TextView>
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.gms.maps.MapView
+                android:id="@+id/mapView"
+                android:layout_width="match_parent"
+                android:layout_height="200dp"
+                android:layout_margin="30dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tvDesc"/>
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+
 </androidx.constraintlayout.widget.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 4f6da6f..01d36ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,4 +16,95 @@
     <string name="dscribe">Dscribe</string>
     <string name="describe">Describe</string>
     <string name="grievance_image">Grievance Image</string>
+    <string name="title_activity_grievance_detail">GrievanceDetail</string>
+    <string name="large_text">
+        "Material is the metaphor.\n\n"
+
+        "A material metaphor is the unifying theory of a rationalized space and a system of motion."
+        "The material is grounded in tactile reality, inspired by the study of paper and ink, yet "
+        "technologically advanced and open to imagination and magic.\n"
+        "Surfaces and edges of the material provide visual cues that are grounded in reality. The "
+        "use of familiar tactile attributes helps users quickly understand affordances. Yet the "
+        "flexibility of the material creates new affordances that supercede those in the physical "
+        "world, without breaking the rules of physics.\n"
+        "The fundamentals of light, surface, and movement are key to conveying how objects move, "
+        "interact, and exist in space and in relation to each other. Realistic lighting shows "
+        "seams, divides space, and indicates moving parts.\n\n"
+
+        "Bold, graphic, intentional.\n\n"
+
+        "The foundational elements of print based design typography, grids, space, scale, color, "
+        "and use of imagery guide visual treatments. These elements do far more than please the "
+        "eye. They create hierarchy, meaning, and focus. Deliberate color choices, edge to edge "
+        "imagery, large scale typography, and intentional white space create a bold and graphic "
+        "interface that immerse the user in the experience.\n"
+        "An emphasis on user actions makes core functionality immediately apparent and provides "
+        "waypoints for the user.\n\n"
+
+        "Motion provides meaning.\n\n"
+
+        "Motion respects and reinforces the user as the prime mover. Primary user actions are "
+        "inflection points that initiate motion, transforming the whole design.\n"
+        "All action takes place in a single environment. Objects are presented to the user without "
+        "breaking the continuity of experience even as they transform and reorganize.\n"
+        "Motion is meaningful and appropriate, serving to focus attention and maintain continuity. "
+        "Feedback is subtle yet clear. Transitions are efficient yet coherent.\n\n"
+
+        "3D world.\n\n"
+
+        "The material environment is a 3D space, which means all objects have x, y, and z "
+        "dimensions. The z-axis is perpendicularly aligned to the plane of the display, with the "
+        "positive z-axis extending towards the viewer. Every sheet of material occupies a single "
+        "position along the z-axis and has a standard 1dp thickness.\n"
+        "On the web, the z-axis is used for layering and not for perspective. The 3D world is "
+        "emulated by manipulating the y-axis.\n\n"
+
+        "Light and shadow.\n\n"
+
+        "Within the material environment, virtual lights illuminate the scene. Key lights create "
+        "directional shadows, while ambient light creates soft shadows from all angles.\n"
+        "Shadows in the material environment are cast by these two light sources. In Android "
+        "development, shadows occur when light sources are blocked by sheets of material at "
+        "various positions along the z-axis. On the web, shadows are depicted by manipulating the "
+        "y-axis only. The following example shows the card with a height of 6dp.\n\n"
+
+        "Resting elevation.\n\n"
+
+        "All material objects, regardless of size, have a resting elevation, or default elevation "
+        "that does not change. If an object changes elevation, it should return to its resting "
+        "elevation as soon as possible.\n\n"
+
+        "Component elevations.\n\n"
+
+        "The resting elevation for a component type is consistent across apps (e.g., FAB elevation "
+        "does not vary from 6dp in one app to 16dp in another app).\n"
+        "Components may have different resting elevations across platforms, depending on the depth "
+        "of the environment (e.g., TV has a greater depth than mobile or desktop).\n\n"
+
+        "Responsive elevation and dynamic elevation offsets.\n\n"
+
+        "Some component types have responsive elevation, meaning they change elevation in response "
+        "to user input (e.g., normal, focused, and pressed) or system events. These elevation "
+        "changes are consistently implemented using dynamic elevation offsets.\n"
+        "Dynamic elevation offsets are the goal elevation that a component moves towards, relative "
+        "to the component’s resting state. They ensure that elevation changes are consistent "
+        "across actions and component types. For example, all components that lift on press have "
+        "the same elevation change relative to their resting elevation.\n"
+        "Once the input event is completed or cancelled, the component will return to its resting "
+        "elevation.\n\n"
+
+        "Avoiding elevation interference.\n\n"
+
+        "Components with responsive elevations may encounter other components as they move between "
+        "their resting elevations and dynamic elevation offsets. Because material cannot pass "
+        "through other material, components avoid interfering with one another any number of ways, "
+        "whether on a per component basis or using the entire app layout.\n"
+        "On a component level, components can move or be removed before they cause interference. "
+        "For example, a floating action button (FAB) can disappear or move off screen before a "
+        "user picks up a card, or it can move if a snackbar appears.\n"
+        "On the layout level, design your app layout to minimize opportunities for interference. "
+        "For example, position the FAB to one side of stream of a cards so the FAB won’t interfere "
+        "when a user tries to pick up one of cards.\n\n"
+    </string>
+    <string name="action_settings">Settings</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 9f1525c..eaf4451 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -13,4 +13,10 @@
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
+    <style name="Theme.ProjectClean.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+    <style name="Theme.ProjectClean.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+    <style name="Theme.ProjectClean.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 </resources>
\ No newline at end of file