diff --git a/app/build.gradle b/app/build.gradle
index 1f99dc3..2494cf6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,7 +41,6 @@ android {
 
 dependencies {
 //    def version = "1.5.0"
-
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "androidx.core:core-ktx:$version"
     implementation 'androidx.appcompat:appcompat:1.3.0'
@@ -57,4 +56,7 @@ dependencies {
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
+    // Cirecle button
+    implementation 'com.github.markushi:circlebutton:1.1'
 }
\ No newline at end of file
diff --git a/app/src/debug/res/values/google_maps_api.xml b/app/src/debug/res/values/google_maps_api.xml
index addec30..2434f05 100644
--- a/app/src/debug/res/values/google_maps_api.xml
+++ b/app/src/debug/res/values/google_maps_api.xml
@@ -20,5 +20,5 @@
     Once you have your key (it starts with "AIza"), replace the "google_maps_key"
     string in this file.
     -->
-    <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">AIzaSyDOZu9sF39GeQEULFM00ml8LfUGsc_CTD0</string>
+    <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">AIzaSyD0BKMBU380HNHHzT9PQd42Acm2g38SCBI</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 34be3c5..ea546d9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.autoservice">
-
     <!--
          The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
          Google Maps Android API v2, but you must specify either coarse or fine
@@ -9,7 +8,7 @@
     -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"
@@ -18,7 +17,11 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AutoService">
-
+        <activity android:name=".SosActivity"></activity>
+        <activity
+            android:name=".AppMap.SosActivity"
+            android:label="@string/title_activity_sos"
+            android:theme="@style/Theme.AutoService.NoActionBar" />
         <!--
              The API key for Google Maps-based APIs is defined as a string resource.
              (See the file "res/values/google_maps_api.xml").
diff --git a/app/src/main/java/com/example/autoservice/AppMap/MapsFragment.kt b/app/src/main/java/com/example/autoservice/AppMap/MapsFragment.kt
new file mode 100644
index 0000000..8373966
--- /dev/null
+++ b/app/src/main/java/com/example/autoservice/AppMap/MapsFragment.kt
@@ -0,0 +1,98 @@
+package com.example.autoservice.AppMap
+
+import android.Manifest
+import android.content.pm.PackageManager
+import android.location.Location
+import androidx.fragment.app.Fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.app.ActivityCompat
+import com.example.autoservice.R
+import com.example.autoservice.databinding.FragmentMapsBinding
+import com.google.android.gms.location.FusedLocationProviderClient
+import com.google.android.gms.location.LocationServices
+
+import com.google.android.gms.maps.CameraUpdateFactory
+import com.google.android.gms.maps.GoogleMap
+import com.google.android.gms.maps.OnMapReadyCallback
+import com.google.android.gms.maps.SupportMapFragment
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.Marker
+import com.google.android.gms.maps.model.MarkerOptions
+
+class MapsFragment : Fragment(R.layout.fragment_maps),GoogleMap.OnMarkerClickListener{
+    private var _binding :FragmentMapsBinding?=null
+    private lateinit var lastlocation:Location
+    private  val Location_request_code = 1
+    private lateinit var map:GoogleMap
+    private lateinit var fusedLocationProviderClient: FusedLocationProviderClient
+    private val binding get() = _binding!!
+    private val callback = OnMapReadyCallback { googleMap ->
+        map = googleMap
+        map.uiSettings.isZoomControlsEnabled = true
+        map.setOnMarkerClickListener(this)
+
+        setupmap()
+
+        val sydney = LatLng(-34.0, 151.0)
+        map.addMarker(MarkerOptions().position(sydney).title("Marker in Sydney"))
+        map.moveCamera(CameraUpdateFactory.newLatLng(sydney))
+    }
+
+
+
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        _binding = FragmentMapsBinding.bind(view)
+        fusedLocationProviderClient =LocationServices.getFusedLocationProviderClient(binding.root.context)
+        val mapFragment = childFragmentManager.findFragmentById(R.id.map) as SupportMapFragment?
+
+        mapFragment?.getMapAsync(callback)
+    }
+
+
+
+    private fun setupmap() {
+        if (ActivityCompat.checkSelfPermission(
+                binding.root.context,
+                Manifest.permission.ACCESS_FINE_LOCATION
+            ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(
+                binding.root.context,
+                Manifest.permission.ACCESS_COARSE_LOCATION
+            ) != PackageManager.PERMISSION_GRANTED
+        ) {
+            ActivityCompat.requestPermissions(requireActivity(), arrayOf(android.Manifest.permission.ACCESS_FINE_LOCATION),Location_request_code)
+            return
+        }
+        map.isMyLocationEnabled = true
+        fusedLocationProviderClient.lastLocation.addOnSuccessListener(requireActivity()){
+                loc ->
+            if (loc !=null){
+                lastlocation = loc
+                val currentlanglat = LatLng(loc.latitude,loc.longitude)
+                placemarekermap(currentlanglat)
+                map.animateCamera(CameraUpdateFactory.newLatLngZoom(currentlanglat,12f))
+            }
+        }
+    }
+
+    private fun placemarekermap(currentlanglat:LatLng){
+        var markeroption = MarkerOptions().position(currentlanglat)
+        markeroption.title("$currentlanglat") // izoh
+        map.addMarker(markeroption)
+    }
+
+    override fun onMarkerClick(p0: Marker?)=false
+
+
+
+    override fun onDestroy() {
+        super.onDestroy()
+        _binding = null
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/autoservice/AdminRegistrationFragment.kt b/app/src/main/java/com/example/autoservice/Fragments/AdminRegistrationFragment.kt
similarity index 97%
rename from app/src/main/java/com/example/autoservice/AdminRegistrationFragment.kt
rename to app/src/main/java/com/example/autoservice/Fragments/AdminRegistrationFragment.kt
index 00e09d6..fd7da6b 100644
--- a/app/src/main/java/com/example/autoservice/AdminRegistrationFragment.kt
+++ b/app/src/main/java/com/example/autoservice/Fragments/AdminRegistrationFragment.kt
@@ -1,4 +1,4 @@
-package com.example.autoservice
+package com.example.autoservice.Fragments
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.navigation.fragment.findNavController
+import com.example.autoservice.R
 import com.example.autoservice.databinding.FragmentAdminRegistrationBinding
 
 // TODO: Rename parameter arguments, choose names that match
diff --git a/app/src/main/java/com/example/autoservice/Fragments/ForgotFragment.kt b/app/src/main/java/com/example/autoservice/Fragments/ForgotFragment.kt
new file mode 100644
index 0000000..09de4b7
--- /dev/null
+++ b/app/src/main/java/com/example/autoservice/Fragments/ForgotFragment.kt
@@ -0,0 +1,65 @@
+package com.example.autoservice.Fragments
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.example.autoservice.R
+import com.example.autoservice.databinding.FragmentForgotBinding
+
+// TODO: Rename parameter arguments, choose names that match
+// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [ForgotFragment.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class ForgotFragment : Fragment(R.layout.fragment_forgot) {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+    private var _binding:FragmentForgotBinding?=null
+    private val binding get() = _binding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        arguments?.let {
+            param1 = it.getString(ARG_PARAM1)
+            param2 = it.getString(ARG_PARAM2)
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        _binding = FragmentForgotBinding.bind(view)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        _binding = null
+    }
+
+
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment ForgotFragment.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            ForgotFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
+                }
+            }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/autoservice/HomeFragment.kt b/app/src/main/java/com/example/autoservice/Fragments/HomeFragment.kt
similarity index 96%
rename from app/src/main/java/com/example/autoservice/HomeFragment.kt
rename to app/src/main/java/com/example/autoservice/Fragments/HomeFragment.kt
index 0375bc6..a592b23 100644
--- a/app/src/main/java/com/example/autoservice/HomeFragment.kt
+++ b/app/src/main/java/com/example/autoservice/Fragments/HomeFragment.kt
@@ -1,4 +1,4 @@
-package com.example.autoservice
+package com.example.autoservice.Fragments
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.findNavController
+import com.example.autoservice.R
 import com.example.autoservice.databinding.FragmentHomeBinding
 import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.LocationServices
@@ -25,7 +26,6 @@ class HomeFragment : Fragment(R.layout.fragment_home) {
         _binding = FragmentHomeBinding.bind(view)
 
 
-
         binding.admin.setOnClickListener{
             findNavController().navigate(R.id.adminRegistrationFragment)
         }
diff --git a/app/src/main/java/com/example/autoservice/LoginFragment.kt b/app/src/main/java/com/example/autoservice/Fragments/LoginFragment.kt
similarity index 82%
rename from app/src/main/java/com/example/autoservice/LoginFragment.kt
rename to app/src/main/java/com/example/autoservice/Fragments/LoginFragment.kt
index fa90f05..1cf3683 100644
--- a/app/src/main/java/com/example/autoservice/LoginFragment.kt
+++ b/app/src/main/java/com/example/autoservice/Fragments/LoginFragment.kt
@@ -1,11 +1,12 @@
-package com.example.autoservice
+package com.example.autoservice.Fragments
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.navigation.fragment.findNavController
+import com.example.autoservice.R
+import com.example.autoservice.SosActivity
 import com.example.autoservice.databinding.FragmentLoginBinding
 
 // TODO: Rename parameter arguments, choose names that match
@@ -39,11 +40,18 @@ class LoginFragment : Fragment(R.layout.fragment_login) {
             findNavController().popBackStack()
             findNavController().navigate(R.id.homeFragment)
         }
+        binding.logintoforgot.setOnClickListener {
+            findNavController().popBackStack()
+            findNavController().navigate(R.id.homeFragment)
+        }
         binding.next.setOnClickListener {
             val passsword = binding.loginpassword.text.toString()
             val phonenumber = binding.loginphonenumber.text.toString()
             if (passsword.length >= 8 && phonenumber[0] == '+'){
-                findNavController().navigate(R.id.mapsFragment)
+               //findNavController().popBackStack()
+                var intent = Intent(activity,SosActivity::class.java)
+                startActivity(intent)
+                activity?.finish()
             }
 
         }
diff --git a/app/src/main/java/com/example/autoservice/MapsFragment.kt b/app/src/main/java/com/example/autoservice/MapsFragment.kt
deleted file mode 100644
index 9ec7f36..0000000
--- a/app/src/main/java/com/example/autoservice/MapsFragment.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.example.autoservice
-
-import android.content.pm.PackageManager
-import android.location.Location
-import androidx.fragment.app.Fragment
-
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.core.app.ActivityCompat
-import androidx.navigation.fragment.findNavController
-import com.example.autoservice.databinding.FragmentMapsBinding
-import com.google.android.gms.location.FusedLocationProviderClient
-import com.google.android.gms.location.LocationServices
-
-import com.google.android.gms.maps.CameraUpdateFactory
-import com.google.android.gms.maps.GoogleMap
-import com.google.android.gms.maps.OnMapReadyCallback
-import com.google.android.gms.maps.SupportMapFragment
-import com.google.android.gms.maps.model.LatLng
-import com.google.android.gms.maps.model.MarkerOptions
-
-class MapsFragment : Fragment(R.layout.fragment_maps) {
-    private var _binding:FragmentMapsBinding?=null
-    private val binding get() = _binding
-    private lateinit var map:GoogleMap
-    private lateinit var lastlocation:Location
-
-    lateinit var fusedLocationProviderClient: FusedLocationProviderClient
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentMapsBinding.bind(view)
-        val mapFragment = childFragmentManager.findFragmentById(R.id.map) as SupportMapFragment?
-        fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(binding?.root?.context)
-         val callback = OnMapReadyCallback { googleMap ->
-            /**
-             * Manipulates the map once available.
-             * This callback is triggered when the map is ready to be used.
-             * This is where we can add markers or lines, add listeners or move the camera.
-             * In this case, we just add a marker near Sydney, Australia.
-             * If Google Play services is not installed on the device, the user will be prompted to
-             * install it inside the SupportMapFragment. This method will only be triggered once the
-             * user has installed Google Play services and returned to the app.
-             */
-             if (ActivityCompat.checkSelfPermission(binding?.root?.context!!,android.Manifest.permission.ACCESS_FINE_LOCATION)!=PackageManager.PERMISSION_GRANTED &&
-                 ActivityCompat.checkSelfPermission(binding?.root?.context!!,android.Manifest.permission.ACCESS_COARSE_LOCATION) !=PackageManager.PERMISSION_GRANTED){
-                 ActivityCompat.requestPermissions(this.requireActivity(), arrayOf(android.Manifest.permission.ACCESS_FINE_LOCATION),101)
-
-             }
-//             fusedLocationProviderClient.lastLocation
-//                 .addOnSuccessListener { location : Location? ->
-//                     // Got last known location. In some rare situations this can be null.
-                     val chilonzor = LatLng(41.27437363664406, 69.2048837600789)
-//                     Log.e("MAIN", "onViewCreated: ${location?.latitude!!}, ${location.longitude}", )
-//
-//                     val livespace = LatLng(location?.latitude!!, location.longitude)
-
-//                     googleMap.addMarker(MarkerOptions().position(livespace).title("Tashkent Uzbekistan Oybek metro"))
-                     googleMap.addMarker(MarkerOptions().position(chilonzor).title("Tashkent Uzbekistan Chilonzro metro"))
-                     googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(chilonzor,15f))
-//                 }
-             fusedLocationProviderClient.lastLocation.addOnSuccessListener {
-                 if (it !=null){
-                     lastlocation = it
-                     var currentlatlang = LatLng(it.latitude,it.longitude)
-
-                     map.animateCamera(CameraUpdateFactory.newLatLngZoom(currentlatlang,15f))
-                 }
-             }
-        }
-        mapFragment?.getMapAsync(callback)
-
-        binding?.back?.setOnClickListener {
-            findNavController().popBackStack()
-        }
-
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/autoservice/SoSFragment.kt b/app/src/main/java/com/example/autoservice/SoSFragment.kt
new file mode 100644
index 0000000..e5dc383
--- /dev/null
+++ b/app/src/main/java/com/example/autoservice/SoSFragment.kt
@@ -0,0 +1,31 @@
+package com.example.autoservice
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.navigation.fragment.findNavController
+import com.example.autoservice.databinding.FragmentSoSBinding
+
+
+class SoSFragment : Fragment(R.layout.fragment_so_s) {
+
+    private var _binding:FragmentSoSBinding?=null
+    private val binding get() = _binding!!
+
+
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        _binding = FragmentSoSBinding.bind(view)
+
+        binding.sosbtn.setOnClickListener{
+            findNavController().navigate(R.id.mapsFragment)
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        _binding = null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/autoservice/SosActivity.kt b/app/src/main/java/com/example/autoservice/SosActivity.kt
new file mode 100644
index 0000000..aa54f63
--- /dev/null
+++ b/app/src/main/java/com/example/autoservice/SosActivity.kt
@@ -0,0 +1,21 @@
+package com.example.autoservice
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import androidx.navigation.Navigation
+import com.example.autoservice.databinding.ActivitySosBinding
+
+class SosActivity : AppCompatActivity() {
+
+    private lateinit var binding:ActivitySosBinding
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivitySosBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        return Navigation.findNavController(this,R.id.nav_graph_sos).navigateUp()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_menu_24.xml b/app/src/main/res/drawable/ic_baseline_menu_24.xml
new file mode 100644
index 0000000..470db52
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_menu_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_emergency_call.xml b/app/src/main/res/drawable/ic_emergency_call.xml
new file mode 100644
index 0000000..853b4d3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emergency_call.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112dp"
+    android:height="112dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M41.707,37.293a1,1 0,0 0,-1.414 0l-3.939,3.939a2.684,2.684 0,0 1,-3.708 0l-9.878,-9.878a2.622,2.622 0,0 1,0 -3.708l3.939,-3.939a1,1 0,0 0,0 -1.414l-13,-13a1,1 0,0 0,-1.414 0L3.414,18.172a8.242,8.242 0,0 0,0 11.656L34.172,60.586a8.242,8.242 0,0 0,11.656 0l8.879,-8.879a1,1 0,0 0,0 -1.414ZM13,11.414 L24.586,23 23,24.586 11.414,13ZM44.414,59.172a6.243,6.243 0,0 1,-8.828 0L4.828,28.414a6.243,6.243 0,0 1,0 -8.828L10,14.414 21.586,26l-0.232,0.232a4.621,4.621 0,0 0,0 6.536l9.878,9.878a4.621,4.621 0,0 0,6.536 0L38,42.414 49.586,54ZM51,52.586 L39.414,41 41,39.414 52.586,51Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M46,1A17.019,17.019 0,0 0,29 18a16.842,16.842 0,0 0,2.968 9.57l-1.905,5.079a1,1 0,0 0,1.288 1.288l5.079,-1.905A16.842,16.842 0,0 0,46 35,17 17,0 0,0 46,1ZM46,33a14.869,14.869 0,0 1,-8.834 -2.9,1 1,0 0,0 -0.942,-0.129l-3.515,1.318 1.318,-3.515a1,1 0,0 0,-0.129 -0.942A14.986,14.986 0,1 1,46 33Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M37.5,12a3.5,3.5 0,0 0,0 7A1.5,1.5 0,1 1,36 20.5V20H34v0.5A3.5,3.5 0,1 0,37.5 17,1.5 1.5,0 1,1 39,15.5V16h2v-0.5A3.5,3.5 0,0 0,37.5 12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M58,16v-0.5A3.5,3.5 0,1 0,54.5 19,1.5 1.5,0 1,1 53,20.5V20H51v0.5A3.5,3.5 0,1 0,54.5 17,1.5 1.5,0 1,1 56,15.5V16Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M46,12a4,4 0,0 0,-4 4v4a4,4 0,0 0,8 0L50,16A4,4 0,0 0,46 12ZM48,20a2,2 0,0 1,-4 0L44,16a2,2 0,0 1,4 0Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_sos.xml b/app/src/main/res/layout/activity_sos.xml
new file mode 100644
index 0000000..40b96dc
--- /dev/null
+++ b/app/src/main/res/layout/activity_sos.xml
@@ -0,0 +1,18 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".SosActivity">
+
+    <fragment
+        android:id="@+id/nav_host_fragment_sosfragments"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:defaultNavHost="true"
+        app:navGraph="@navigation/nav_graph_sos" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_admin_registration.xml b/app/src/main/res/layout/fragment_admin_registration.xml
index 24a7eb1..14d9150 100644
--- a/app/src/main/res/layout/fragment_admin_registration.xml
+++ b/app/src/main/res/layout/fragment_admin_registration.xml
@@ -6,7 +6,7 @@
 
     android:orientation="vertical"
     android:layout_height="match_parent"
-    tools:context=".AdminRegistrationFragment">
+    tools:context=".Fragments.AdminRegistrationFragment">
 
      <LinearLayout
          android:background="#F6C019"
diff --git a/app/src/main/res/layout/fragment_forgot.xml b/app/src/main/res/layout/fragment_forgot.xml
new file mode 100644
index 0000000..6f37330
--- /dev/null
+++ b/app/src/main/res/layout/fragment_forgot.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:padding="20dp"
+    android:layout_height="match_parent"
+    tools:context=".Fragments.ForgotFragment">
+    <com.google.android.material.textfield.TextInputEditText
+        android:id="@+id/forgotpassswordenter"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="match_parent"
+        android:hint="phone number"
+        android:inputType="phone"
+        android:padding="20dp"
+        android:layout_height="wrap_content"/>
+    <TextView
+        android:id="@+id/forgottocreate"
+        android:textSize="19sp"
+        android:text="Create account"
+        android:layout_marginTop="20dp"
+        app:layout_constraintRight_toRightOf="@+id/forgotpassswordenter"
+        app:layout_constraintLeft_toLeftOf="@+id/forgotpassswordenter"
+        app:layout_constraintTop_toBottomOf="@+id/forgotpassswordenter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+    <TextView
+        android:id="@+id/forgottologin"
+        android:textSize="19sp"
+        android:text="Login"
+        android:layout_marginTop="20dp"
+        app:layout_constraintRight_toRightOf="@+id/forgottocreate"
+        app:layout_constraintLeft_toLeftOf="@+id/forgottocreate"
+        app:layout_constraintTop_toBottomOf="@+id/forgottocreate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/submit"
+        android:layout_marginBottom="10dp"
+        app:cardCornerRadius="30dp"
+        android:backgroundTint="#F6C019"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="150dp"
+        android:layout_height="60dp">
+        <TextView
+            android:textColor="@color/white"
+            android:textSize="23sp"
+            android:layout_gravity="center"
+            android:text="Submit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index fa0d33e..2b85450 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -7,15 +7,15 @@
     android:layout_height="match_parent"
     android:padding="20dp"
     android:gravity="center"
-    tools:context=".HomeFragment">
+    tools:context=".Fragments.HomeFragment">
 
 
    <androidx.cardview.widget.CardView
        android:id="@+id/admin"
        android:backgroundTint="#F6C019"
-       app:cardCornerRadius="25dp"
+       app:cardCornerRadius="30dp"
        android:layout_width="match_parent"
-       android:layout_height="80dp">
+       android:layout_height="70dp">
        <TextView
            android:textColor="@color/white"
            android:fontFamily="sans-serif-black"
@@ -29,9 +29,9 @@
         android:id="@+id/user"
        android:backgroundTint="#F6C019"
         android:layout_marginTop="20dp"
-       app:cardCornerRadius="25dp"
+       app:cardCornerRadius="30dp"
        android:layout_width="match_parent"
-       android:layout_height="80dp">
+       android:layout_height="70dp">
        <TextView
            android:textColor="@color/white"
            android:fontFamily="sans-serif-black"
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 0982b4c..ed17851 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:gravity="center"
-    tools:context=".LoginFragment">
+    tools:context=".Fragments.LoginFragment">
 
     <EditText
         android:id="@+id/loginphonenumber"
@@ -44,6 +44,16 @@
         app:layout_constraintTop_toBottomOf="@+id/loginpassword"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
+    <TextView
+        android:id="@+id/logintoforgot"
+        android:textSize="19sp"
+        android:text="Forgot"
+        android:layout_marginTop="20dp"
+        app:layout_constraintTop_toTopOf="@+id/next"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/next"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
 
     <androidx.cardview.widget.CardView
diff --git a/app/src/main/res/layout/fragment_maps.xml b/app/src/main/res/layout/fragment_maps.xml
index 8ac2b33..c359927 100644
--- a/app/src/main/res/layout/fragment_maps.xml
+++ b/app/src/main/res/layout/fragment_maps.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:map="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    tools:context=".MapsFragment"
-    android:orientation="vertical"
-    android:background="#F6C019"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
     <LinearLayout
-        android:layout_marginLeft="10dp"
+        android:background="#F6C019"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize">
         <ImageView
-            android:id="@+id/back"
-            android:src="@drawable/ic_left_arrow"
+            android:src="@drawable/ic_baseline_menu_24"
+
             android:layout_gravity="center"
-            android:layout_width="60dp"
-            android:layout_height="40dp"/>
+            android:layout_width="70dp"
+            android:layout_height="50dp"/>
     </LinearLayout>
 
     <fragment
@@ -24,6 +23,5 @@
         android:name="com.google.android.gms.maps.SupportMapFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-      >
-    </fragment>
+        tools:context=".AppMap.MapsActivity" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_so_s.xml b/app/src/main/res/layout/fragment_so_s.xml
new file mode 100644
index 0000000..1cc3548
--- /dev/null
+++ b/app/src/main/res/layout/fragment_so_s.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_height="match_parent"
+    tools:context=".SoSFragment">
+    <LinearLayout
+        android:background="#F6C019"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize">
+        <ImageView
+            android:src="@drawable/ic_baseline_menu_24"
+            android:layout_gravity="center"
+            android:layout_width="70dp"
+            android:layout_height="50dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <at.markushi.ui.CircleButton
+            android:id="@+id/sosbtn"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:src="@drawable/ic_emergency_call"
+            app:cb_color="#CC0000"
+            app:cb_pressedRingWidth="1dip" />
+    </LinearLayout>
+
+
+</LinearLayout>
\ 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
index c823be3..dded6ac 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -3,11 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_graph"
-    app:startDestination="@id/homeFragment">
+    app:startDestination="@id/homeFragment"
+    >
 
     <fragment
         android:id="@+id/homeFragment"
-        android:name="com.example.autoservice.HomeFragment"
+        android:name="com.example.autoservice.Fragments.HomeFragment"
         android:label="fragment_home"
         tools:layout="@layout/fragment_home" >
         <action
@@ -20,7 +21,7 @@
     </fragment>
     <fragment
         android:id="@+id/adminRegistrationFragment"
-        android:name="com.example.autoservice.AdminRegistrationFragment"
+        android:name="com.example.autoservice.Fragments.AdminRegistrationFragment"
         android:label="fragment_admin_registration"
         tools:layout="@layout/fragment_admin_registration" >
         <action
@@ -29,13 +30,17 @@
     </fragment>
     <fragment
         android:id="@+id/loginFragment"
-        android:name="com.example.autoservice.LoginFragment"
+        android:name="com.example.autoservice.Fragments.LoginFragment"
         android:label="fragment_login"
-        tools:layout="@layout/fragment_login" />
+        tools:layout="@layout/fragment_login" >
+        <action
+            android:id="@+id/action_loginFragment_to_forgotFragment"
+            app:destination="@id/forgotFragment" />
+    </fragment>
     <fragment
-        android:id="@+id/mapsFragment"
-        android:name="com.example.autoservice.MapsFragment"
-        android:label="fragment_maps"
-        tools:layout="@layout/fragment_maps" />
+        android:id="@+id/forgotFragment"
+        android:name="com.example.autoservice.Fragments.ForgotFragment"
+        android:label="fragment_forgot"
+        tools:layout="@layout/fragment_forgot" />
 
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph_sos.xml b/app/src/main/res/navigation/nav_graph_sos.xml
new file mode 100644
index 0000000..4564d08
--- /dev/null
+++ b/app/src/main/res/navigation/nav_graph_sos.xml
@@ -0,0 +1,22 @@
+<?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_sos"
+    app:startDestination="@id/soSFragment2">
+
+    <fragment
+        android:id="@+id/soSFragment2"
+        android:name="com.example.autoservice.SoSFragment"
+        android:label="fragment_so_s"
+        tools:layout="@layout/fragment_so_s">
+
+        <action
+            android:id="@+id/action_soSFragment2_to_mapsFragment"
+            app:destination="@id/mapsFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/mapsFragment"
+        android:name="com.example.autoservice.AppMap.MapsFragment"
+        android:label="fragment_map_fr" tools:layout="@layout/fragment_maps"/>
+</navigation>
\ 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 62e4b60..2a91763 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,4 +2,14 @@
     <string name="app_name">AutoService</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="title_activity_maps">Map</string>
+    <string name="title_activity_sos">SosActivity</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>
 </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 de53277..64d3c8f 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.AutoService.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="Theme.AutoService.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="Theme.AutoService.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 </resources>
\ No newline at end of file