diff --git a/README.md b/README.md
index 39d9259ea..7a2ee547e 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ With this SDK you can implement turn-by-turn navigation in your own Android app
 - No Telemetry
 
 
-## Why have we forked
+## Why have we forked¬
 
 1. Mapbox decided to put a closed-source component to their navigation SDK and introduced a non-open-source license. Maplibre wants an open-source solution.
 2. Mapbox decided to put telemetry in their SDK. We couldn't turn this off without adjusting the source.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e5f4b3c75..0d8a94c2a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -28,7 +28,7 @@ android {
     defaultConfig {
         applicationId = "org.maplibre.navigation.android.example"
         compileSdk = 35
-        minSdk = 21
+        minSdk = 23
 
         versionCode = 1
         versionName = project.properties.get("versionName") as String? ?: "0.0.0"
diff --git a/app/src/main/java/org/maplibre/navigation/android/example/GraphHopperNavigationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/GraphHopperNavigationActivity.kt
index 7d9d8f310..210ec6fd7 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/GraphHopperNavigationActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/GraphHopperNavigationActivity.kt
@@ -60,9 +60,9 @@ class GraphHopperNavigationActivity :
 
         binding = ActivityNavigationUiBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.mapView.apply {
+        binding.navigationView.apply {
             onCreate(savedInstanceState)
-            getMapAsync(this@GraphHopperNavigationActivity)
+//            getMapAsync(this@GraphHopperNavigationActivity)
         }
 
         binding.startRouteButton.setOnClickListener {
@@ -86,18 +86,18 @@ class GraphHopperNavigationActivity :
             simulateRoute = checked
         }
 
-        binding.clearPoints.setOnClickListener {
-            if (::mapLibreMap.isInitialized) {
-                mapLibreMap.markers.forEach {
-                    mapLibreMap.removeMarker(it)
-                }
-            }
-            destination = null
-            it.visibility = View.GONE
-            binding.startRouteLayout.visibility = View.GONE
-
-            navigationMapRoute?.removeRoute()
-        }
+//        binding.clearPoints.setOnClickListener {
+//            if (::mapLibreMap.isInitialized) {
+//                mapLibreMap.markers.forEach {
+//                    mapLibreMap.removeMarker(it)
+//                }
+//            }
+//            destination = null
+//            it.visibility = View.GONE
+//            binding.startRouteLayout.visibility = View.GONE
+//
+//            navigationMapRoute?.removeRoute()
+//        }
     }
 
     override fun onMapReady(mapLibreMap: MapLibreMap) {
@@ -106,7 +106,7 @@ class GraphHopperNavigationActivity :
             Style.Builder().fromUri(getString(R.string.map_style_light))
         ) { style ->
             enableLocationComponent(style)
-            navigationMapRoute = NavigationMapRoute(binding.mapView, mapLibreMap)
+//            navigationMapRoute = NavigationMapRoute(binding.mapView, mapLibreMap)
             mapLibreMap.addOnMapClickListener(this)
 
             Snackbar.make(
@@ -143,7 +143,7 @@ class GraphHopperNavigationActivity :
         destination = Point(point.longitude, point.latitude)
 
         mapLibreMap.addMarker(MarkerOptions().position(point))
-        binding.clearPoints.visibility = View.VISIBLE
+//        binding.clearPoints.visibility = View.VISIBLE
         calculateRoute()
         return true
     }
@@ -187,7 +187,7 @@ class GraphHopperNavigationActivity :
         // Create request object. Requires graphhopper_url to be set in developer-config.xml
         val request = Request.Builder()
             .header("User-Agent", "MapLibre Android Navigation SDK Demo App")
-            .url(getString(R.string.graphhopper_url))
+//            .url(getString(R.string.graphhopper_url))
             .post(requestBodyJson.toRequestBody("application/json; charset=utf-8".toMediaType()))
             .build()
 
@@ -246,27 +246,27 @@ class GraphHopperNavigationActivity :
 
     override fun onResume() {
         super.onResume()
-        binding.mapView.onResume()
+//        binding.mapView.onResume()
     }
 
     override fun onPause() {
         super.onPause()
-        binding.mapView.onPause()
+//        binding.mapView.onPause()
     }
 
     override fun onStart() {
         super.onStart()
-        binding.mapView.onStart()
+//        binding.mapView.onStart()
     }
 
     override fun onStop() {
         super.onStop()
-        binding.mapView.onStop()
+//        binding.mapView.onStop()
     }
 
     override fun onLowMemory() {
         super.onLowMemory()
-        binding.mapView.onLowMemory()
+//        binding.mapView.onLowMemory()
     }
 
     override fun onDestroy() {
@@ -274,11 +274,11 @@ class GraphHopperNavigationActivity :
         if (::mapLibreMap.isInitialized) {
             mapLibreMap.removeOnMapClickListener(this)
         }
-        binding.mapView.onDestroy()
+//        binding.mapView.onDestroy()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        binding.mapView.onSaveInstanceState(outState)
+//        binding.mapView.onSaveInstanceState(outState)
     }
 }
diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
index e0860b469..8e0526139 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt
@@ -1,14 +1,9 @@
 package org.maplibre.navigation.android.example
 
-import android.annotation.SuppressLint
 import android.os.Bundle
-import android.view.View
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import com.google.android.material.snackbar.Snackbar
-import org.maplibre.navigation.core.models.DirectionsResponse
-import org.maplibre.geojson.Point
-import org.maplibre.android.annotations.MarkerOptions
+import android.preference.PreferenceManager
+import androidx.activity.ComponentActivity
+import okhttp3.Request
 import org.maplibre.android.camera.CameraPosition
 import org.maplibre.android.geometry.LatLng
 import org.maplibre.android.location.LocationComponent
@@ -16,28 +11,31 @@ import org.maplibre.android.location.LocationComponentActivationOptions
 import org.maplibre.android.location.modes.CameraMode
 import org.maplibre.android.location.modes.RenderMode
 import org.maplibre.android.maps.MapLibreMap
-import org.maplibre.android.maps.OnMapReadyCallback
 import org.maplibre.android.maps.Style
+import org.maplibre.android.plugins.annotation.SymbolOptions
+import org.maplibre.android.style.layers.Property.ICON_ANCHOR_CENTER
+import org.maplibre.geojson.Point
+import org.maplibre.navigation.android.example.databinding.ActivityNavigationUiBinding
+import org.maplibre.navigation.android.navigation.ui.v5.NavigationRequest
 import org.maplibre.navigation.android.navigation.ui.v5.NavigationLauncher
-import org.maplibre.navigation.android.navigation.ui.v5.NavigationLauncherOptions
+import org.maplibre.navigation.android.navigation.ui.v5.RoutingService
+import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewOptions
+import org.maplibre.navigation.android.navigation.ui.v5.OnNavigationReadyCallback
+import org.maplibre.navigation.android.navigation.ui.v5.listeners.NavigationListener
+import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute
 import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute
+import org.maplibre.navigation.core.models.DirectionsResponse
 import org.maplibre.navigation.core.models.DirectionsRoute
-import org.maplibre.turf.TurfConstants
-import org.maplibre.turf.TurfMeasurement
-import okhttp3.Request
-import org.maplibre.navigation.android.example.databinding.ActivityNavigationUiBinding
-import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute
 import org.maplibre.navigation.core.models.UnitType
+import org.maplibre.navigation.core.navigation.NavigationConstants
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import timber.log.Timber
+import java.util.Locale
 
-class NavigationUIActivity :
-    AppCompatActivity(),
-    OnMapReadyCallback,
-    MapLibreMap.OnMapClickListener {
-    private lateinit var mapLibreMap: MapLibreMap
+class NavigationUIActivity : ComponentActivity(), MapLibreMap.OnMapClickListener,
+    OnNavigationReadyCallback, NavigationListener {
 
     // Navigation related variables
     private var route: DirectionsRoute? = null
@@ -49,8 +47,10 @@ class NavigationUIActivity :
     private lateinit var binding: ActivityNavigationUiBinding
 
     private var simulateRoute = false
+    var mapLibreMap: MapLibreMap? = null
+
+    private var isStarted = false
 
-    @SuppressLint("MissingPermission")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -60,71 +60,117 @@ class NavigationUIActivity :
 
         binding = ActivityNavigationUiBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.mapView.apply {
-            onCreate(savedInstanceState)
-            getMapAsync(this@NavigationUIActivity)
-        }
 
-        binding.startRouteButton.setOnClickListener {
-            route?.let { route ->
-                val userLocation = mapLibreMap.locationComponent.lastKnownLocation ?: return@let
-
-                val options = NavigationLauncherOptions.builder()
-                    .directionsRoute(route)
-                    .shouldSimulateRoute(simulateRoute)
-                    .initialMapCameraPosition(
+        binding.navigationView.apply {
+            onCreate(savedInstanceState, mapStyleUri = "https://api.maptiler.com/maps/streets-v2/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ")
+            initialize(
+                simulateRoute,
+                onMapReadyCallback = {
+                    this@NavigationUIActivity.mapLibreMap = it
+                    val initialMapCameraPosition =
                         CameraPosition.Builder()
-                            .target(LatLng(userLocation.latitude, userLocation.longitude)).build()
-                    )
-                    .lightThemeResId(R.style.TestNavigationViewLight)
-                    .darkThemeResId(R.style.TestNavigationViewDark)
-                    .build()
-                NavigationLauncher.startNavigation(this@NavigationUIActivity, options)
-            }
+                            .target(LatLng(43.230633, 76.933810))
+                            .zoom(16.0)
+                            .build()
+                    it.cameraPosition = initialMapCameraPosition
+                    it.setMaxZoomPreference(18.0)
+                    it.setMinZoomPreference(5.0)
+                    getDrawable(R.drawable.ic_car_top)?.let {
+                        mapLibreMap?.style?.addImage("DRIVER_MARKER_ICON_ID",
+                            it
+                        )
+                    }
+                    val symbolOptions = SymbolOptions()
+                        .withLatLng(LatLng(43.230361,76.930137))
+                        .withIconImage("DRIVER_MARKER_ICON_ID")
+                        .withIconAnchor(ICON_ANCHOR_CENTER)
+
+                    binding.navigationView.addSymbol(symbolOptions)
+                }
+            )
+
         }
 
-        binding.simulateRouteSwitch.setOnCheckedChangeListener { _, checked ->
-            simulateRoute = checked
+        binding.locate.setOnClickListener {
+//            val initialMapCameraPosition =
+//                CameraPosition.Builder()
+//                    .target(LatLng(43.230633, 76.933810))
+//                    .zoom(16.0)
+//                    .build()
+//            mapLibreMap?.animateCamera(CameraUpdateFactory.newCameraPosition(initialMapCameraPosition))
+            mapLibreMap?.locationComponent?.setCameraMode(
+                CameraMode.TRACKING_GPS,
+                750,
+                16.0,
+                null,
+                null,
+                null
+            )
+
+            mapLibreMap?.locationComponent?.renderMode = RenderMode.GPS
         }
 
+//        binding.mapView.apply {
+//            onCreate(savedInstanceState)
+//            getMapAsync(this@NavigationUIActivity)
+//        }
 
-        binding.clearPoints.setOnClickListener {
-            if (::mapLibreMap.isInitialized) {
-                mapLibreMap.markers.forEach {
-                    mapLibreMap.removeMarker(it)
-                }
-            }
-            destination = null
-            waypoint = null
-            it.visibility = View.GONE
-            binding.startRouteLayout.visibility = View.GONE
+        val points = mutableListOf<Point>()
+//        points.add(Pair(76.928316, 43.236109))
+        points.add(Point.fromLngLat(76.933810, 43.230633))
+        points.add(Point.fromLngLat(76.920187, 43.236783))
+//        points.add(Pair(76.930137, 43.230361))
+        binding.simulateRouteSwitch.setOnCheckedChangeListener { _, isChecked ->
+//            mapLibreMap?.locationComponent?.cameraMode = CameraMode.TRACKING
+            simulateRoute = isChecked
+            if (simulateRoute) {
+
+            } else {
 
-            navigationMapRoute?.removeRoute()
+            }
+            mapLibreMap?.locationComponent?.setCameraMode(CameraMode.TRACKING_GPS, 100, 16.0, null, null, null)
         }
-    }
+        binding.navigationView.showInstructionView()
+        binding.startRouteButton.setOnClickListener {
+            if (isStarted) {
+                binding.navigationView.stopNavigation()
+                binding.navigationView.retrieveNavigationMapLibreMap()?.removeRoute()
+                isStarted = false
+            } else {
+                isStarted = true
+                binding.navigationView.calculateRouteAndStartNavigation(
+                    NavigationRequest(
+                        origin = Point.fromLngLat(76.93312659859657, 43.2283288597314),
+                        stops = points,
+                        destination = Point.fromLngLat(76.92803341895342,43.23938818876529,),
+                        routingService = RoutingService.Mapbox(getString(R.string.base_url), getString(R.string.mapbox_access_token)),
+                        language = Locale.getDefault()
+                    )
+                )
+                binding.navigationView.enableNavigatorSound(false)
 
-    override fun onMapReady(mapLibreMap: MapLibreMap) {
-        this.mapLibreMap = mapLibreMap
-        mapLibreMap.setStyle(
-            Style.Builder().fromUri(getString(R.string.map_style_light))
-        ) { style ->
-            enableLocationComponent(style)
-            navigationMapRoute = NavigationMapRoute(binding.mapView, mapLibreMap)
-
-            mapLibreMap.addOnMapClickListener(this)
-
-            Snackbar.make(
-                findViewById(R.id.container),
-                "Tap map to place waypoint",
-                Snackbar.LENGTH_LONG,
-            ).show()
+            }
         }
+
+//        binding.clearPoints.setOnClickListener {
+//            if (::mapboxMap.isInitialized) {
+//                mapboxMap.markers.forEach {
+//                    mapboxMap.removeMarker(it)
+//                }
+//            }
+//            destination = null
+//            waypoint = null
+//            it.visibility = View.GONE
+//            binding.startRouteLayout.visibility = View.GONE
+//
+//            navigationMapRoute?.removeRoute()
+//        }
     }
 
     @SuppressWarnings("MissingPermission")
     private fun enableLocationComponent(style: Style) {
         // Get an instance of the component
-        locationComponent = mapLibreMap.locationComponent
+//        locationComponent = mapLibreMap.locationComponent
 
         locationComponent?.let {
             // Activate with a built LocationComponentActivationOptions object
@@ -144,46 +190,46 @@ class NavigationUIActivity :
     }
 
     override fun onMapClick(point: LatLng): Boolean {
-        var addMarker = true
-        when {
-            destination == null -> destination = Point.fromLngLat(point.longitude, point.latitude)
-            waypoint == null -> waypoint = Point.fromLngLat(point.longitude, point.latitude)
-            else -> {
-                Toast.makeText(this, "Only 2 waypoints supported", Toast.LENGTH_LONG).show()
-                addMarker = false
-            }
-        }
-
-        if (addMarker) {
-            mapLibreMap.addMarker(MarkerOptions().position(point))
-            binding.clearPoints.visibility = View.VISIBLE
-        }
-        calculateRoute()
+//        var addMarker = true
+//        when {
+//            destination == null -> destination = Point.fromLngLat(point.longitude, point.latitude)
+//            waypoint == null -> waypoint = Point.fromLngLat(point.longitude, point.latitude)
+//            else -> {
+//                Toast.makeText(this, "Only 2 waypoints supported", Toast.LENGTH_LONG).show()
+//                addMarker = false
+//            }
+//        }
+//
+//        if (addMarker) {
+//            mapboxMap.addMarker(MarkerOptions().position(point))
+//            binding.clearPoints.visibility = View.VISIBLE
+//        }
+//        calculateRoute()
         return true
     }
 
     private fun calculateRoute() {
-        binding.startRouteLayout.visibility = View.GONE
-        val userLocation = mapLibreMap.locationComponent.lastKnownLocation
+//        binding.startRouteLayout.visibility = View.GONE
+//        val userLocation = mapLibreMap.locationComponent.lastKnownLocation
         val destination = destination
-        if (userLocation == null) {
-            Timber.d("calculateRoute: User location is null, therefore, origin can't be set.")
-            return
-        }
+//        if (userLocation == null) {
+//            Timber.d("calculateRoute: User location is null, therefore, origin can't be set.")
+//            return
+//        }
 
         if (destination == null) {
             return
         }
 
-        val origin = Point.fromLngLat(userLocation.longitude, userLocation.latitude)
-        if (TurfMeasurement.distance(origin, destination, TurfConstants.UNIT_METERS) < 50) {
-            binding.startRouteLayout.visibility = View.GONE
-            return
-        }
+//        val origin = Point.fromLngLat(userLocation.longitude, userLocation.latitude)
+//        if (TurfMeasurement.distance(origin, destination, TurfConstants.UNIT_METERS) < 50) {
+//            binding.startRouteLayout.visibility = View.GONE
+//            return
+//        }
 
         val navigationRouteBuilder = NavigationRoute.builder(this).apply {
             this.accessToken(getString(R.string.mapbox_access_token))
-            this.origin(origin)
+//            this.origin(origin)
             this.destination(destination)
             this.voiceUnits(UnitType.METRIC)
             this.alternatives(true)
@@ -193,6 +239,20 @@ class NavigationUIActivity :
             this.baseUrl(getString(R.string.base_url))
         }
 
+
+        navigationRouteBuilder.addWaypoint(
+            Point.fromLngLat(76.930137, 43.230361)
+        )
+
+        navigationRouteBuilder.addWaypoint(
+            Point.fromLngLat(76.928316, 43.236109)
+        )
+
+        navigationRouteBuilder.addWaypoint(
+            Point.fromLngLat(76.920187, 43.236783)
+        )
+
+
         navigationRouteBuilder.build().getRoute(object : Callback<DirectionsResponse> {
             override fun onResponse(
                 call: Call<DirectionsResponse>,
@@ -201,10 +261,13 @@ class NavigationUIActivity :
                 Timber.d("Url: %s", (call.request() as Request).url.toString())
                 response.body()?.let { response ->
                     if (response.routes.isNotEmpty()) {
-                        val maplibreResponse = DirectionsResponse.fromJson(response.toJson());
+                        val maplibreResponse =
+                            DirectionsResponse.fromJson(
+                                response.toJson()
+                            );
                         this@NavigationUIActivity.route = maplibreResponse.routes.first()
                         navigationMapRoute?.addRoutes(maplibreResponse.routes)
-                        binding.startRouteLayout.visibility = View.VISIBLE
+//                        binding.startRouteLayout.visibility = View.VISIBLE
                     }
                 }
 
@@ -218,39 +281,81 @@ class NavigationUIActivity :
 
     override fun onResume() {
         super.onResume()
-        binding.mapView.onResume()
+        binding.navigationView.onResume()
     }
 
     override fun onPause() {
         super.onPause()
-        binding.mapView.onPause()
+        binding.navigationView.onPause()
     }
 
     override fun onStart() {
         super.onStart()
-        binding.mapView.onStart()
+        binding.navigationView.onStart()
     }
 
     override fun onStop() {
         super.onStop()
-        binding.mapView.onStop()
+        binding.navigationView.onStop()
     }
 
     override fun onLowMemory() {
         super.onLowMemory()
-        binding.mapView.onLowMemory()
+        binding.navigationView.onLowMemory()
     }
 
     override fun onDestroy() {
         super.onDestroy()
-        if (::mapLibreMap.isInitialized) {
-            mapLibreMap.removeOnMapClickListener(this)
-        }
-        binding.mapView.onDestroy()
+//        if (::mapboxMap.isInitialized) {
+//            mapboxMap.removeOnMapClickListener(this)
+//        }
+        binding.navigationView.onDestroy()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        binding.mapView.onSaveInstanceState(outState)
+        binding.navigationView.onSaveInstanceState(outState)
+    }
+
+    override fun onNavigationReady(isRunning: Boolean) {
+//        val options = NavigationViewOptions.builder()
+//        options.navigationListener(this)
+//        extractRoute(options)
+//        extractConfiguration(options)
+//        options.navigationOptions(MapLibreNavigationOptions.Builder().build())
+//        binding.navigationView.startNavigation(options.build())
+    }
+
+    override fun onCancelNavigation() {
+        finishNavigation()
+    }
+
+    override fun onNavigationFinished() {
+        finishNavigation()
+    }
+
+    override fun onNavigationRunning() {
+        // Intentionally empty
+    }
+
+    private fun extractRoute(options: NavigationViewOptions.Builder) {
+        val route = NavigationLauncher.extractRoute(this)
+        options.directionsRoute(route)
+    }
+
+    private fun extractConfiguration(options: NavigationViewOptions.Builder) {
+        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
+        options.shouldSimulateRoute(
+            preferences.getBoolean(
+                NavigationConstants.NAVIGATION_VIEW_SIMULATE_ROUTE,
+                false
+            )
+        )
+    }
+
+    private fun finishNavigation() {
+        NavigationLauncher.cleanUpPreferences(this)
+//        binding.navigationView.stopNavigation()
+        finish()
     }
 }
diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithCustomForegroundNotificationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithCustomForegroundNotificationActivity.kt
index 03146e514..c24c374da 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithCustomForegroundNotificationActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithCustomForegroundNotificationActivity.kt
@@ -145,6 +145,9 @@ class NavigationWithCustomForegroundNotificationActivity : AppCompatActivity(),
             this.destination(Point.fromLngLat(9.756259, 52.342620))
             this.voiceUnits(UnitType.METRIC)
             this.alternatives(true)
+            // If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.
+            this.user("gh")
+            this.profile("car")
             this.baseUrl(getString(R.string.base_url))
         }
 
diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithForegroundNotificationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithForegroundNotificationActivity.kt
index 4c7538922..f16b79b58 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithForegroundNotificationActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationWithForegroundNotificationActivity.kt
@@ -140,11 +140,14 @@ class NavigationWithForegroundNotificationActivity : AppCompatActivity(), OnMapR
     private fun calculateRouteAndStartNavigation() {
         val navigationRouteBuilder = NavigationRoute.builder(this).apply {
             this.accessToken(getString(R.string.mapbox_access_token))
-            this.origin(Point.fromLngLat(9.7536318, 52.3717979))
-            this.addWaypoint(Point.fromLngLat(9.741052, 52.360496))
-            this.destination(Point.fromLngLat(9.756259, 52.342620))
+            this.origin(Point.fromLngLat( 10.246249, 50.055795))
+            this.destination(Point.fromLngLat( 10.245291,50.056129))
+            this.addWaypoint(Point.fromLngLat(10.243814,50.055662))
             this.voiceUnits(UnitType.METRIC)
             this.alternatives(true)
+            // If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.
+            this.user("gh")
+            this.profile("car")
             this.baseUrl(getString(R.string.base_url))
         }
 
diff --git a/app/src/main/java/org/maplibre/navigation/android/example/ValhallaNavigationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/ValhallaNavigationActivity.kt
index addde514c..41289e2f8 100644
--- a/app/src/main/java/org/maplibre/navigation/android/example/ValhallaNavigationActivity.kt
+++ b/app/src/main/java/org/maplibre/navigation/android/example/ValhallaNavigationActivity.kt
@@ -56,50 +56,47 @@ class ValhallaNavigationActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        if (BuildConfig.DEBUG) {
-            Timber.plant(Timber.DebugTree())
-        }
-
-        binding = ActivityNavigationUiBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        binding.mapView.apply {
-            onCreate(savedInstanceState)
-            getMapAsync(this@ValhallaNavigationActivity)
-        }
-
-        binding.startRouteButton.setOnClickListener {
-            route?.let { route ->
-                val userLocation = mapLibreMap.locationComponent.lastKnownLocation ?: return@let
-                val options = NavigationLauncherOptions.builder()
-                    .directionsRoute(route)
-                    .shouldSimulateRoute(simulateRoute)
-                    .initialMapCameraPosition(
-                        CameraPosition.Builder()
-                            .target(LatLng(userLocation.latitude, userLocation.longitude)).build()
-                    )
-                    .lightThemeResId(R.style.TestNavigationViewLight)
-                    .darkThemeResId(R.style.TestNavigationViewDark)
-                    .build()
-                NavigationLauncher.startNavigation(this@ValhallaNavigationActivity, options)
-            }
-        }
-
-        binding.simulateRouteSwitch.setOnCheckedChangeListener { _, checked ->
-            simulateRoute = checked
-        }
-
-        binding.clearPoints.setOnClickListener {
-            if (::mapLibreMap.isInitialized) {
-                mapLibreMap.markers.forEach {
-                    mapLibreMap.removeMarker(it)
-                }
-            }
-            destination = null
-            it.visibility = View.GONE
-            binding.startRouteLayout.visibility = View.GONE
-
-            navigationMapRoute?.removeRoute()
-        }
+//        if (BuildConfig.DEBUG) {
+//            Timber.plant(Timber.DebugTree())
+//        }
+//
+//        binding = ActivityNavigationUiBinding.inflate(layoutInflater)
+//        setContentView(binding.root)
+//        binding.mapView.apply {
+//            onCreate(savedInstanceState)
+//            getMapAsync(this@ValhallaNavigationActivity)
+//        }
+//
+//        binding.startRouteButton.setOnClickListener {
+//            route?.let { route ->
+//                val userLocation = mapboxMap.locationComponent.lastKnownLocation ?: return@let
+//                val options = NavigationLauncherOptions.builder()
+//                    .directionsRoute(route)
+//                    .shouldSimulateRoute(simulateRoute)
+//                    .initialMapCameraPosition(CameraPosition.Builder().target(LatLng(userLocation.latitude, userLocation.longitude)).build())
+//                    .lightThemeResId(R.style.TestNavigationViewLight)
+//                    .darkThemeResId(R.style.TestNavigationViewDark)
+//                    .build()
+//                NavigationLauncher.startNavigation(this@ValhallaNavigationActivity, options)
+//            }
+//        }
+//
+//        binding.simulateRouteSwitch.setOnCheckedChangeListener { _, checked ->
+//            simulateRoute = checked
+//        }
+//
+//        binding.clearPoints.setOnClickListener {
+//            if (::mapboxMap.isInitialized) {
+//                mapboxMap.markers.forEach {
+//                    mapboxMap.removeMarker(it)
+//                }
+//            }
+//            destination = null
+//            it.visibility = View.GONE
+//            binding.startRouteLayout.visibility = View.GONE
+//
+//            navigationMapRoute?.removeRoute()
+//        }
     }
 
     override fun onMapReady(mapLibreMap: MapLibreMap) {
@@ -108,15 +105,19 @@ class ValhallaNavigationActivity :
             Style.Builder().fromUri(getString(R.string.map_style_light))
         ) { style ->
             enableLocationComponent(style)
-            navigationMapRoute = NavigationMapRoute(binding.mapView, mapLibreMap)
-            mapLibreMap.addOnMapClickListener(this)
-
-            Snackbar.make(
-                findViewById(R.id.container),
-                "Tap map to place destination",
-                Snackbar.LENGTH_LONG,
-            ).show()
         }
+//
+//        navigationMapRoute = NavigationMapRoute(
+//            binding.mapView,
+//            mapboxMap
+//        )
+
+        mapLibreMap.addOnMapClickListener(this)
+        Snackbar.make(
+            findViewById(R.id.container),
+            "Tap map to place destination",
+            Snackbar.LENGTH_LONG,
+        ).show()
     }
 
     @SuppressWarnings("MissingPermission")
@@ -145,7 +146,7 @@ class ValhallaNavigationActivity :
         destination = Point.fromLngLat(point.longitude, point.latitude)
 
         mapLibreMap.addMarker(MarkerOptions().position(point))
-        binding.clearPoints.visibility = View.VISIBLE
+//        binding.clearPoints.visibility = View.VISIBLE
         calculateRoute()
         return true
     }
@@ -278,27 +279,27 @@ class ValhallaNavigationActivity :
 
     override fun onResume() {
         super.onResume()
-        binding.mapView.onResume()
+//        binding.mapView.onResume()
     }
 
     override fun onPause() {
         super.onPause()
-        binding.mapView.onPause()
+//        binding.mapView.onPause()
     }
 
     override fun onStart() {
         super.onStart()
-        binding.mapView.onStart()
+//        binding.mapView.onStart()
     }
 
     override fun onStop() {
         super.onStop()
-        binding.mapView.onStop()
+//        binding.mapView.onStop()
     }
 
     override fun onLowMemory() {
         super.onLowMemory()
-        binding.mapView.onLowMemory()
+//        binding.mapView.onLowMemory()
     }
 
     override fun onDestroy() {
@@ -306,11 +307,11 @@ class ValhallaNavigationActivity :
         if (::mapLibreMap.isInitialized) {
             mapLibreMap.removeOnMapClickListener(this)
         }
-        binding.mapView.onDestroy()
+//        binding.mapView.onDestroy()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        binding.mapView.onSaveInstanceState(outState)
+//        binding.mapView.onSaveInstanceState(outState)
     }
 }
diff --git a/app/src/main/res/layout/activity_navigation_ui.xml b/app/src/main/res/layout/activity_navigation_ui.xml
index 220bc6706..3b6643380 100644
--- a/app/src/main/res/layout/activity_navigation_ui.xml
+++ b/app/src/main/res/layout/activity_navigation_ui.xml
@@ -6,32 +6,28 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.maplibre.android.maps.MapView
-        android:id="@+id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    <org.maplibre.navigation.android.navigation.ui.v5.NavigationRouteView
+        android:id="@+id/navigationView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:navigationLightTheme="@style/NavigationViewLight"
+        app:navigationDarkTheme="@style/NavigationViewDark"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0"
-        app:maplibre_cameraTargetLat="52.039176"
-        app:maplibre_cameraTargetLng="5.550339"
-        app:maplibre_cameraZoom="12"
-        app:maplibre_enableTilePrefetch="true"
-        app:maplibre_enableZMediaOverlay="true"
-        app:maplibre_renderTextureMode="true"
-        app:maplibre_renderTextureTranslucentSurface="true"
-        app:maplibre_uiAttribution="false"
-        app:maplibre_uiCompass="false"
-        app:maplibre_uiDoubleTapGestures="true"
-        app:maplibre_uiLogo="false"
-        app:maplibre_uiRotateGestures="true"
-        app:maplibre_uiScrollGestures="true"
-        app:maplibre_uiTiltGestures="true"
-        app:maplibre_uiZoomGestures="true" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
+    <ImageButton
+        android:id="@+id/locate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:contentDescription="locateme"
+        android:src="@drawable/ic_new_location"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/startRouteLayout"
@@ -39,12 +35,12 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="32dp"
         android:background="@drawable/rounded_corners"
-        android:backgroundTint="@color/colorPrimaryDark"
+        android:backgroundTint="@color/maplibre_navigation_route_shield_layer_color"
         android:orientation="horizontal"
         android:padding="8dp"
-        android:visibility="invisible"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:visibility="visible">
@@ -53,8 +49,8 @@
             android:id="@+id/simulateRouteSwitch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/simulate_route"
-            android:textColor="@color/white"
+            android:text="simulate_route"
+            android:textColor="@color/maplibre_navigation_route_upcoming_maneuver_arrow_color"
             app:switchPadding="4dp" />
 
         <Button
@@ -69,21 +65,4 @@
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/clearPoints"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="16dp"
-        android:src="@drawable/ic_delete_black_24dp"
-        android:tint="@android:color/white"
-        android:visibility="gone"
-        app:backgroundTint="@color/red"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index eb6ca2afc..afdfb400b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,11 +6,11 @@ kotlinx-coroutines = "1.10.2"
 kotlin-dokka = "2.0.0"
 nexus = "2.0.0"
 kermit = "2.0.8"
-maplibre = "11.13.5"
+maplibre = "12.0.0"
 maplibre-annotation = "3.0.2"
 maplibre-geojson = "7.0.0-pre0"
 play-services-location = "21.3.0"
-mockk = "1.14.5"
+mockk = "1.14.6"
 robolectric = "4.16"
 material = "1.13.0"
 androidx-recyclerview = "1.4.0"
diff --git a/gradle/publish-android.gradle b/gradle/publish-android.gradle
index 9e724520f..6cf6cd087 100644
--- a/gradle/publish-android.gradle
+++ b/gradle/publish-android.gradle
@@ -35,13 +35,18 @@ afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
-                from components.release
-
                 groupId project.ext.navigationArtifactGroupId
                 version project.ext.versionName
 
                 artifactId "${artifactId.replace("libandroid-", "")}-android"
 
+                artifact(bundleReleaseAar) {
+                    builtBy bundleReleaseAar
+                }
+
+                artifact tasks.androidJavadocsJar
+                artifact tasks.androidSourcesJar
+
                 pom {
                     name = project.ext.navigationArtifactTitle
                     description = project.ext.navigationArtifactTitle
diff --git a/libandroid-navigation-ui/build.gradle.kts b/libandroid-navigation-ui/build.gradle.kts
index 8484795c1..94218f207 100644
--- a/libandroid-navigation-ui/build.gradle.kts
+++ b/libandroid-navigation-ui/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
 
 apply {
     from(file("${rootDir}/gradle/artifact-settings.gradle"))
+    from(file("javadoc.gradle"))
+    from(file("${rootDir}/gradle/publish-android.gradle"))
 }
 
 java {
@@ -22,7 +24,7 @@ android {
 
     defaultConfig {
         compileSdk = 35
-        minSdk = 21
+        minSdk = 23
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -117,8 +119,3 @@ configurations {
         exclude(group = "org.maplibre.gl", module = "android-sdk-turf")
     }
 }
-
-apply {
-    from(file("javadoc.gradle"))
-    from(file("${rootDir}/gradle/publish-android.gradle"))
-}
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationContract.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationContract.java
index c8c99c104..769e15fc3 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationContract.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationContract.java
@@ -4,18 +4,11 @@
 
 import org.maplibre.navigation.core.location.Location;
 import org.maplibre.navigation.core.models.DirectionsRoute;
-import org.maplibre.geojson.Point;
 
 public interface NavigationContract {
 
   interface View {
 
-    void setSummaryBehaviorState(int state);
-
-    void setSummaryBehaviorHideable(boolean isHideable);
-
-    boolean isSummaryBottomSheetHidden();
-
     void updateWayNameVisibility(boolean isVisible);
 
     void updateWayNameView(@NonNull String wayName);
@@ -28,8 +21,6 @@ interface View {
 
     void drawRoute(DirectionsRoute directionsRoute);
 
-    void addMarker(Point point);
-
     void startCamera(DirectionsRoute directionsRoute);
 
     void resumeCamera(Location location);
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncher.java
index b0839b30f..a30d81ec4 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncher.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncher.java
@@ -43,10 +43,6 @@ public static void startNavigation(Context context, NavigationLauncherOptions op
     storeThemePreferences(options, editor);
 
     editor.apply();
-
-    Intent navigationActivity = new Intent(context, MapLibreNavigationActivity.class);
-    storeInitialMapPosition(options, navigationActivity);
-    context.startActivity(navigationActivity);
   }
 
   /**
@@ -58,13 +54,13 @@ public static void startNavigation(Context context, NavigationLauncherOptions op
    * @param context to retrieve {@link SharedPreferences}
    * @return {@link DirectionsRoute} stored when launching
    */
-  static DirectionsRoute extractRoute(Context context) {
+  public static DirectionsRoute extractRoute(Context context) {
     SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
     String directionsRouteJson = preferences.getString(NavigationConstants.NAVIGATION_VIEW_ROUTE_KEY, "");
     return DirectionsRoute.fromJson(directionsRouteJson);
   }
 
-  static void cleanUpPreferences(Context context) {
+  public static void cleanUpPreferences(Context context) {
     SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
     SharedPreferences.Editor editor = preferences.edit();
     editor
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java
index 7466f3abf..16946b3eb 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java
@@ -12,19 +12,14 @@
 class NavigationOnCameraTrackingChangedListener implements OnCameraTrackingChangedListener {
 
   private final NavigationPresenter navigationPresenter;
-  private final BottomSheetBehavior summaryBehavior;
 
-  NavigationOnCameraTrackingChangedListener(NavigationPresenter navigationPresenter,
-                                            BottomSheetBehavior summaryBehavior) {
+  NavigationOnCameraTrackingChangedListener(NavigationPresenter navigationPresenter) {
     this.navigationPresenter = navigationPresenter;
-    this.summaryBehavior = summaryBehavior;
   }
 
   @Override
   public void onCameraTrackingDismissed() {
-    if (summaryBehavior.getState() != BottomSheetBehavior.STATE_HIDDEN) {
       navigationPresenter.onCameraTrackingDismissed();
-    }
   }
 
   @Override
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java
index 578e1907b..1315de6c4 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java
@@ -1,86 +1,78 @@
 package org.maplibre.navigation.android.navigation.ui.v5;
 
-import org.maplibre.navigation.core.location.Location;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
 
-import org.maplibre.navigation.core.models.DirectionsRoute;
 import org.maplibre.geojson.Point;
+import org.maplibre.navigation.core.location.Location;
+import org.maplibre.navigation.core.models.DirectionsRoute;
 
 class NavigationPresenter {
 
-  private NavigationContract.View view;
-  private boolean resumeState;
-
-  NavigationPresenter(NavigationContract.View view) {
-    this.view = view;
-  }
-
-  void updateResumeState(boolean resumeState) {
-    this.resumeState = resumeState;
-  }
-
-  void onRecenterClick() {
-    view.setSummaryBehaviorHideable(false);
-    view.setSummaryBehaviorState(BottomSheetBehavior.STATE_EXPANDED);
-    view.updateWayNameVisibility(true);
-    view.resetCameraPosition();
-    view.hideRecenterBtn();
-  }
-
-  void onCameraTrackingDismissed() {
-    if (!view.isSummaryBottomSheetHidden()) {
-      view.setSummaryBehaviorHideable(true);
-      view.setSummaryBehaviorState(BottomSheetBehavior.STATE_HIDDEN);
-      view.updateWayNameVisibility(false);
+    private NavigationContract.View view;
+    private boolean resumeState;
+    private boolean isTrackingCamera = false;
+
+    NavigationPresenter(NavigationContract.View view) {
+        this.view = view;
+    }
+
+    void updateResumeState(boolean resumeState) {
+        this.resumeState = resumeState;
+    }
+
+    void onRecenterClick() {
+        view.updateWayNameVisibility(true);
+        view.resetCameraPosition();
+        view.hideRecenterBtn();
+        isTrackingCamera = true;
+    }
+
+    void onCameraTrackingDismissed() {
+        view.updateWayNameVisibility(false);
+        isTrackingCamera = false;
+    }
+
+
+    void onRouteUpdate(DirectionsRoute directionsRoute) {
+        view.drawRoute(directionsRoute);
+        if (resumeState && isTrackingCamera) {
+            view.updateCameraRouteOverview();
+        } else {
+            view.startCamera(directionsRoute);
+        }
     }
-  }
 
-  void onSummaryBottomSheetHidden() {
-    if (view.isSummaryBottomSheetHidden()) {
-      view.showRecenterBtn();
+    void onDestinationUpdate(Point point) {
+        // Disabled adding destination marker
+//        view.addMarker(point);
     }
-  }
-
-  void onRouteUpdate(DirectionsRoute directionsRoute) {
-    view.drawRoute(directionsRoute);
-    if (resumeState && view.isRecenterButtonVisible()) {
-      view.updateCameraRouteOverview();
-    } else {
-      view.startCamera(directionsRoute);
+
+    void onNavigationLocationUpdate(Location location) {
+        if (resumeState && !isTrackingCamera) {
+            view.resumeCamera(location);
+            resumeState = false;
+        }
+        view.updateNavigationMap(location);
     }
-  }
 
-  void onDestinationUpdate(Point point) {
-    view.addMarker(point);
-  }
+    void onWayNameChanged(@NonNull String wayName) {
+        if (TextUtils.isEmpty(wayName)) {
+            view.updateWayNameVisibility(false);
+            return;
+        }
+        view.updateWayNameView(wayName);
+        view.updateWayNameVisibility(true);
+    }
 
-  void onNavigationLocationUpdate(Location location) {
-    if (resumeState && !view.isRecenterButtonVisible()) {
-      view.resumeCamera(location);
-      resumeState = false;
+    void onNavigationStopped() {
+        view.updateWayNameVisibility(false);
     }
-    view.updateNavigationMap(location);
-  }
 
-  void onWayNameChanged(@NonNull String wayName) {
-    if (TextUtils.isEmpty(wayName) || view.isSummaryBottomSheetHidden()) {
-      view.updateWayNameVisibility(false);
-      return;
+    void onRouteOverviewClick() {
+        view.updateWayNameVisibility(false);
+        view.updateCameraRouteOverview();
+        view.showRecenterBtn();
     }
-    view.updateWayNameView(wayName);
-    view.updateWayNameVisibility(true);
-  }
-
-  void onNavigationStopped() {
-    view.updateWayNameVisibility(false);
-  }
-
-  void onRouteOverviewClick() {
-    view.updateWayNameVisibility(false);
-    view.updateCameraRouteOverview();
-    view.showRecenterBtn();
-  }
 }
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRequest.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRequest.kt
new file mode 100644
index 000000000..9ca0c2f11
--- /dev/null
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRequest.kt
@@ -0,0 +1,14 @@
+package org.maplibre.navigation.android.navigation.ui.v5
+
+import org.maplibre.geojson.Point
+import org.maplibre.navigation.core.navigation.MapLibreNavigationOptions
+import java.util.Locale
+
+data class NavigationRequest(
+    val origin: Point,
+    val stops: List<Point>? = null,
+    val destination: Point,
+    val routingService: RoutingService,
+    val language: Locale,
+    val navigationOptions: MapLibreNavigationOptions = MapLibreNavigationOptions()
+)
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
new file mode 100644
index 000000000..28fe35ee7
--- /dev/null
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationRouteView.kt
@@ -0,0 +1,717 @@
+package org.maplibre.navigation.android.navigation.ui.v5
+
+import android.app.Activity
+import android.content.Context
+import android.os.Bundle
+import android.util.AttributeSet
+import android.view.View
+import androidx.annotation.UiThread
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.ViewCompat
+import androidx.core.view.isVisible
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import okhttp3.Request
+import org.maplibre.android.location.modes.RenderMode
+import org.maplibre.android.maps.MapLibreMap
+import org.maplibre.android.maps.MapView
+import org.maplibre.android.maps.OnMapReadyCallback
+import org.maplibre.android.maps.Style
+import org.maplibre.android.maps.Style.OnStyleLoaded
+import org.maplibre.android.plugins.annotation.OnSymbolClickListener
+import org.maplibre.android.plugins.annotation.Symbol
+import org.maplibre.android.plugins.annotation.SymbolManager
+import org.maplibre.android.plugins.annotation.SymbolOptions
+import org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_VIEWPORT
+import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera
+import org.maplibre.navigation.android.navigation.ui.v5.instruction.ImageCreator
+import org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionView
+import org.maplibre.navigation.android.navigation.ui.v5.instruction.NavigationAlertView
+import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMap
+import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMapInstanceState
+import org.maplibre.navigation.android.navigation.ui.v5.map.WayNameView
+import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute
+import org.maplibre.navigation.android.navigation.ui.v5.utils.DistanceFormatter
+import org.maplibre.navigation.android.navigation.ui.v5.utils.LocaleUtils
+import org.maplibre.navigation.core.location.Location
+import org.maplibre.navigation.core.models.DirectionsResponse
+import org.maplibre.navigation.core.models.DirectionsRoute
+import org.maplibre.navigation.core.models.UnitType
+import org.maplibre.navigation.core.navigation.MapLibreNavigation
+import org.maplibre.navigation.core.navigation.MapLibreNavigationOptions
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import timber.log.Timber
+
+
+class NavigationRouteView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = -1
+) : CoordinatorLayout(context, attrs, defStyleAttr), LifecycleOwner, OnMapReadyCallback,
+    NavigationContract.View {
+    private lateinit var mapView: MapView
+    private lateinit var instructionView: InstructionView
+    private lateinit var recenterBtn: RecenterButton
+    private lateinit var wayNameView: WayNameView
+
+    private lateinit var navigationPresenter: NavigationPresenter
+    private var navigationViewEventDispatcher: NavigationViewEventDispatcher? = null
+    private lateinit var navigationViewModel: NavigationViewModel
+    private var navigationMap: NavigationMapLibreMap? = null
+    private var preNavigationLocationEngine: PreNavigationLocationEngine? = null
+    private var navigationRoute: NavigationRoute? = null
+    private var onTrackingChangedListener: NavigationOnCameraTrackingChangedListener? = null
+    private var mapInstanceState: NavigationMapLibreMapInstanceState? = null
+    private var isMapInitialized = false
+    private var isSubscribed = false
+    private lateinit var lifecycleRegistry: LifecycleRegistry
+    private var onMapReadyCallback: OnMapReadyCallback? = null
+    private var symbolManager: SymbolManager? = null
+
+    private var mapStyleUri: String? = null
+
+    init {
+        ThemeSwitcher.setTheme(context, attrs)
+        initializeView()
+    }
+
+    /**
+     * Uses savedInstanceState as a cue to restore state (if not null).
+     *
+     * @param savedInstanceState to restore state if not null
+     */
+    fun onCreate(
+        savedInstanceState: Bundle?,
+        mapStyleUri: String
+    ) {
+        mapView.onCreate(savedInstanceState)
+        updatePresenterState(savedInstanceState)
+        lifecycleRegistry = LifecycleRegistry(this)
+        lifecycleRegistry.currentState = Lifecycle.State.CREATED
+
+        if (mapStyleUri != null) {
+            this.mapStyleUri = mapStyleUri
+        }
+    }
+
+    /**
+     * Low memory must be reported so the [MapView]
+     * can react appropriately.
+     */
+    fun onLowMemory() {
+        mapView.onLowMemory()
+    }
+
+    /**
+     * If the instruction list is showing and onBackPressed is called,
+     * hide the instruction list and do not hide the activity or fragment.
+     *
+     * @return true if back press handled, false if not
+     */
+    fun onBackPressed(): Boolean {
+        return instructionView.handleBackPressed()
+    }
+
+    /**
+     * Used to store the bottomsheet state and re-center
+     * button visibility.  As well as anything the [MapView]
+     * needs to store in the bundle.
+     *
+     * @param outState to store state variables
+     */
+    fun onSaveInstanceState(outState: Bundle) {
+        val isWayNameVisible = wayNameView.isVisible
+        val navigationViewInstanceState = NavigationViewInstanceState(
+            recenterBtn.visibility,
+            instructionView.isShowingInstructionList,
+            isWayNameVisible,
+            wayNameView.retrieveWayNameText(),
+            navigationViewModel.isMuted
+        )
+        val instanceKey = context.getString(R.string.navigation_view_instance_state)
+        outState.putParcelable(instanceKey, navigationViewInstanceState)
+        outState.putBoolean(
+            context.getString(R.string.navigation_running),
+            navigationViewModel.isRunning
+        )
+        mapView.onSaveInstanceState(outState)
+        saveNavigationMapInstanceState(outState)
+    }
+
+    /**
+     * Used to re-center
+     * button visibility.  As well as the [MapView]
+     * position prior to rotation.
+     *
+     * @param savedInstanceState to extract state variables
+     */
+    fun onRestoreInstanceState(savedInstanceState: Bundle) {
+        val instanceKey = context.getString(R.string.navigation_view_instance_state)
+        val navigationViewInstanceState =
+            savedInstanceState.getParcelable<NavigationViewInstanceState>(instanceKey)
+        recenterBtn.visibility = navigationViewInstanceState?.recenterButtonVisibility ?: View.GONE
+        wayNameView.visibility =
+            if (navigationViewInstanceState?.isWayNameVisible == true) VISIBLE else INVISIBLE
+        wayNameView.updateWayNameText(navigationViewInstanceState?.wayNameText)
+        updateInstructionListState(navigationViewInstanceState?.isInstructionViewVisible ?: false)
+        updateInstructionMutedState(navigationViewInstanceState?.isMuted ?: true)
+        mapInstanceState = savedInstanceState.getParcelable(MAP_INSTANCE_STATE_KEY)
+    }
+
+    /**
+     * Called to ensure the [MapView] is destroyed
+     * properly.
+     *
+     *
+     * In an [Activity] this should be in [Activity.onDestroy].
+     *
+     *
+     * In a [Fragment], this should
+     * be in [Fragment.onDestroyView].
+     */
+    @UiThread
+    fun onDestroy() {
+        shutdown()
+        stopNavigation()
+        lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
+    }
+
+    fun onStart() {
+        mapView.onStart()
+        navigationMap?.onStart()
+        lifecycleRegistry.currentState = Lifecycle.State.STARTED
+    }
+
+    fun onResume() {
+        mapView.onResume()
+        lifecycleRegistry.currentState = Lifecycle.State.RESUMED
+    }
+
+    fun onPause() {
+        mapView.onPause()
+    }
+
+    fun onStop() {
+        mapView.onStop()
+        navigationMap?.onStop()
+    }
+
+    /**
+     * Fired after the map is ready, this is our cue to finish
+     * setting up the rest of the plugins / location engine.
+     *
+     *
+     * Also, we check for launch data (coordinates or route).
+     *
+     * @param mapLibreMap used for route, camera, and location UI
+     * @since 0.6.0
+     */
+    override fun onMapReady(mapLibreMap: MapLibreMap) {
+        val onStyleLoaded = OnStyleLoaded { style ->
+            initializeSymbolManager(mapView, mapLibreMap, style)
+            initializeNavigationMap(mapView, mapLibreMap)
+            initializeWayNameListener()
+            initializePreNavigationLocationEngine(mapLibreMap)
+            onMapReadyCallback?.onMapReady(mapLibreMap)
+            isMapInitialized = true
+        }
+
+        mapStyleUri?.let { mapLibreMap.setStyle(Style.Builder().fromUri(it), onStyleLoaded) }
+            ?: mapLibreMap.setStyle(ThemeSwitcher.retrieveMapStyle(context), onStyleLoaded)
+    }
+
+    fun calculateRouteAndStartNavigation(request: NavigationRequest) {
+        val navigationSource = request.routingService
+        val navigationRouteBuilder = NavigationRoute.builder(context).apply {
+            this.origin(request.origin)
+            this.destination(request.destination)
+            request.stops?.forEach { this.addWaypoint(it) }
+            this.voiceUnits(UnitType.METRIC)
+            this.language(request.language)
+            this.alternatives(true)
+            // If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.
+            if (navigationSource is RoutingService.GraphHopper) {
+                this.user("gh")
+                this.profile("car")
+            }
+            this.accessToken(navigationSource.accessToken)
+            this.baseUrl(navigationSource.baseUrl)
+        }
+        navigationRoute = navigationRouteBuilder.build()
+        navigationRoute?.getRoute(object : Callback<DirectionsResponse> {
+            override fun onResponse(
+                call: Call<DirectionsResponse>,
+                response: Response<DirectionsResponse>,
+            ) {
+                Timber.d("Response: $response")
+                response.body()?.let { responseBody ->
+                    if (responseBody.routes.isNotEmpty()) {
+                        val maplibreResponse = DirectionsResponse.fromJson(responseBody.toJson())
+                        startNavigation(maplibreResponse.routes, request.navigationOptions)
+                    }
+                }
+            }
+
+            override fun onFailure(call: Call<DirectionsResponse>, throwable: Throwable) {
+                Timber.e(throwable, "onFailure: navigation.getRoute()")
+            }
+        })
+    }
+
+    private fun startNavigation(
+        routes: List<DirectionsRoute>,
+        navigationOptions: MapLibreNavigationOptions
+    ) {
+        preNavigationLocationEngine?.stop()
+        val route = routes.first()
+        navigationMap?.drawRoutes(routes)
+        val options = NavigationViewOptions.builder()
+        options.directionsRoute(route)
+        options.navigationOptions(navigationOptions)
+        initializeNavigation(options.build())
+    }
+
+    override fun resetCameraPosition() {
+        navigationMap?.resetPadding()
+        navigationMap?.resetCameraPositionWith(NavigationCamera.NAVIGATION_TRACKING_MODE_GPS)
+    }
+
+    override fun showRecenterBtn() {
+        recenterBtn.show()
+    }
+
+    override fun hideRecenterBtn() {
+        recenterBtn.hide()
+    }
+
+    override fun isRecenterButtonVisible(): Boolean {
+        return recenterBtn.isVisible
+    }
+
+    override fun drawRoute(directionsRoute: DirectionsRoute) {
+        navigationMap?.drawRoute(directionsRoute)
+    }
+
+    fun addSymbol(symbolOptions: SymbolOptions): Symbol {
+        return symbolManager?.create(symbolOptions)
+            ?: throw RuntimeException("Map is not initialized")
+    }
+
+    fun removeSymbol(symbol: Symbol) {
+        symbolManager?.delete(symbol)
+    }
+
+    fun addOnSymbolClickListener(listener: OnSymbolClickListener) {
+        symbolManager?.addClickListener(listener)
+    }
+
+    fun updateSymbol(symbol: Symbol) {
+        symbolManager?.update(symbol)
+    }
+
+    val isWayNameVisible: Boolean
+        /**
+         * Provides the current visibility of the way name view.
+         *
+         * @return true if visible, false if not visible
+         */
+        get() = wayNameView.isVisible
+
+    /**
+     * Updates the text of the way name view below the
+     * navigation icon.
+     *
+     *
+     * If you'd like to use this method without being overridden by the default way names
+     * values we provide, please disabled auto-query with
+     * [NavigationMapLibreMap.updateWaynameQueryMap].
+     *
+     * @param wayName to update the view
+     */
+    override fun updateWayNameView(wayName: String) {
+        wayNameView.updateWayNameText(wayName)
+    }
+
+    /**
+     * Updates the visibility of the way name view that is show below
+     * the navigation icon.
+     *
+     *
+     * If you'd like to use this method without being overridden by the default visibility values
+     * values we provide, please disabled auto-query with
+     * [NavigationMapLibreMap.updateWaynameQueryMap].
+     *
+     * @param isVisible true to show, false to hide
+     */
+    override fun updateWayNameVisibility(isVisible: Boolean) {
+        var visible = isVisible
+        if (wayNameView.retrieveWayNameText().isEmpty()) {
+            visible = false
+        }
+        wayNameView.updateVisibility(visible)
+        navigationMap?.updateWaynameQueryMap(visible)
+    }
+
+    /**
+     * Used when starting this [android.app.Activity]
+     * for the first time.
+     *
+     *
+     * Zooms to the beginning of the [DirectionsRoute].
+     *
+     * @param directionsRoute where camera should move to
+     */
+    override fun startCamera(directionsRoute: DirectionsRoute) {
+        navigationMap?.startCamera(directionsRoute)
+    }
+
+    /**
+     * Used after configuration changes to resume the camera
+     * to the last location update from the Navigation SDK.
+     *
+     * @param location where the camera should move to
+     */
+    override fun resumeCamera(location: Location) {
+        navigationMap?.resumeCamera(location)
+    }
+
+    override fun updateNavigationMap(location: Location) {
+        navigationMap?.updateLocation(location)
+    }
+
+    override fun updateCameraRouteOverview() {
+        val padding = buildRouteOverviewPadding(context)
+        navigationMap?.showRouteOverview(padding)
+    }
+
+    /**
+     * Call this when the navigation session needs to end navigation without finishing the whole view
+     *
+     * @since 0.16.0
+     */
+    @UiThread
+    fun stopNavigation() {
+        preNavigationLocationEngine?.start()
+        navigationRoute?.cancelCall()
+        navigationPresenter.onNavigationStopped()
+        navigationViewModel.stopNavigation()
+    }
+
+
+    /**
+     * Should be called after [NavigationView.onCreate].
+     */
+    fun initialize(
+        shouldSimulateRoute: Boolean,
+        onMapReadyCallback: OnMapReadyCallback,
+    ) {
+        this.onMapReadyCallback = onMapReadyCallback
+        if (!isMapInitialized) {
+            mapView.getMapAsync(this)
+            navigationViewModel.initializeNavigation(shouldSimulateRoute)
+        }
+    }
+
+
+    fun enableNavigatorSound(enabled: Boolean) {
+        navigationViewModel.isMuted = !enabled
+    }
+
+    /**
+     * Gives the ability to manipulate the map directly for anything that might not currently be
+     * supported. This returns null until the view is initialized.
+     *
+     *
+     * The [NavigationMapLibreMap] gives direct access to the map UI (location marker, route, etc.).
+     *
+     * @return navigation mapbox map object, or null if view has not been initialized
+     */
+    fun retrieveNavigationMapLibreMap(): NavigationMapLibreMap? {
+        return navigationMap
+    }
+
+    /**
+     * Returns the instance of [MapLibreNavigation] powering the [NavigationView]
+     * once navigation has started.  Will return null if navigation has not been started with
+     * [NavigationView.startNavigation].
+     *
+     * @return mapbox navigation, or null if navigation has not started
+     */
+    fun retrieveMapLibreNavigation(): MapLibreNavigation? {
+        return navigationViewModel.retrieveNavigation()
+    }
+
+    /**
+     * Returns the sound button used for muting instructions
+     *
+     * @return sound button
+     */
+    fun retrieveSoundButton(): NavigationButton {
+        return instructionView.retrieveSoundButton()
+    }
+
+
+    /**
+     * Returns the re-center button for recentering on current location
+     *
+     * @return recenter button
+     */
+    fun retrieveRecenterButton(): NavigationButton {
+        return recenterBtn
+    }
+
+    /**
+     * Returns the [NavigationAlertView] that is shown during off-route events with
+     * "Report a Problem" text.
+     *
+     * @return alert view that is used in the instruction view
+     */
+    fun retrieveAlertView(): NavigationAlertView {
+        return instructionView.retrieveAlertView()
+    }
+
+    fun showInstructionView() {
+        instructionView.isVisible = true
+    }
+
+    fun hideInstructionView() {
+        instructionView.isVisible = false
+    }
+
+    private fun initializeView() {
+        inflate(context, R.layout.navigation_view_layout, this)
+        bind()
+        initializeNavigationViewModel(context)
+        initializeNavigationEventDispatcher()
+        initializeNavigationPresenter()
+        initializeInstructionListListener()
+        initializeClickListeners()
+    }
+
+    private fun bind() {
+        mapView = findViewById(R.id.navigationMapView)
+        instructionView = findViewById(R.id.instructionView)
+        instructionView.let {
+            ViewCompat.setElevation(it, 10f)
+        }
+        recenterBtn = findViewById(R.id.recenterBtn)
+        wayNameView = findViewById(R.id.wayNameView)
+    }
+
+    private fun initializeNavigationViewModel(context: Context) {
+        try {
+            navigationViewModel = NavigationViewModel(context)
+        } catch (exception: ClassCastException) {
+            throw ClassCastException("Please ensure that the provided Context is a valid FragmentActivity")
+        }
+    }
+
+    private fun initializeNavigationEventDispatcher() {
+        navigationViewEventDispatcher = NavigationViewEventDispatcher()
+        navigationViewModel.initializeEventDispatcher(navigationViewEventDispatcher)
+    }
+
+    private fun initializeInstructionListListener() {
+        instructionView.setInstructionListListener(
+            NavigationInstructionListListener(
+                navigationPresenter,
+                navigationViewEventDispatcher
+            )
+        )
+    }
+
+    private fun initializeNavigationMap(mapView: MapView, map: MapLibreMap) {
+        navigationMap = NavigationMapLibreMap(mapView, map)
+        navigationMap?.updateLocationLayerRenderMode(RenderMode.GPS)
+        if (mapInstanceState != null) {
+            navigationMap?.restoreFrom(mapInstanceState)
+            return
+        }
+    }
+
+    private fun initializeSymbolManager(mapView: MapView, mapLibreMap: MapLibreMap, style: Style) {
+        symbolManager = SymbolManager(mapView, mapLibreMap, style).apply {
+            iconAllowOverlap = true
+            iconRotationAlignment = ICON_ROTATION_ALIGNMENT_VIEWPORT
+        }
+    }
+
+    private fun initializeWayNameListener() {
+        val wayNameListener = NavigationViewWayNameListener(navigationPresenter)
+        navigationMap?.addOnWayNameChangedListener(wayNameListener)
+    }
+
+    private fun initializePreNavigationLocationEngine(map: MapLibreMap) {
+        val locationEngine = navigationViewModel.retrieveNavigation()?.locationEngine ?: return
+        preNavigationLocationEngine = PreNavigationLocationEngine(
+            locationEngine = locationEngine,
+            locationComponent = map.locationComponent
+        )
+        preNavigationLocationEngine?.start()
+    }
+
+
+    private fun saveNavigationMapInstanceState(outState: Bundle) {
+        navigationMap?.saveStateWith(MAP_INSTANCE_STATE_KEY, outState)
+    }
+
+    private fun updateInstructionListState(visible: Boolean) {
+        if (visible) {
+            instructionView.showInstructionList()
+        } else {
+            instructionView.hideInstructionList()
+        }
+    }
+
+    private fun updateInstructionMutedState(isMuted: Boolean) {
+        if (isMuted) {
+            (instructionView.retrieveSoundButton() as SoundButton).soundFabOff()
+        }
+    }
+
+    private fun buildRouteOverviewPadding(context: Context): IntArray {
+        val resources = context.resources
+        val leftRightPadding =
+            resources.getDimension(R.dimen.route_overview_left_right_padding).toInt()
+        val paddingBuffer = resources.getDimension(R.dimen.route_overview_buffer_padding).toInt()
+        val instructionHeight =
+            (resources.getDimension(R.dimen.instruction_layout_height) + paddingBuffer).toInt()
+        val summaryHeight = resources.getDimension(R.dimen.summary_bottomsheet_height).toInt()
+        return intArrayOf(leftRightPadding, instructionHeight, leftRightPadding, summaryHeight)
+    }
+
+    private val isChangingConfigurations: Boolean
+        get() {
+            return try {
+                (context as Activity).isChangingConfigurations
+            } catch (exception: ClassCastException) {
+                false
+            }
+        }
+
+    private fun initializeNavigationPresenter() {
+        navigationPresenter = NavigationPresenter(this)
+    }
+
+    private fun updatePresenterState(savedInstanceState: Bundle?) {
+        if (savedInstanceState != null) {
+            val navigationRunningKey = context.getString(R.string.navigation_running)
+            val resumeState = savedInstanceState.getBoolean(navigationRunningKey)
+            navigationPresenter.updateResumeState(resumeState)
+        }
+    }
+
+    private fun initializeNavigation(options: NavigationViewOptions) {
+        establish(options)
+        navigationViewModel.initialize(options)
+        initializeNavigationListeners(options, navigationViewModel)
+        setupNavigationMapLibreMap(options)
+
+        if (!isSubscribed) {
+            initializeClickListeners()
+            initializeOnCameraTrackingChangedListener()
+            subscribeViewModels()
+        }
+    }
+
+    private fun initializeClickListeners() {
+        recenterBtn.addOnClickListener(RecenterBtnClickListener(navigationPresenter))
+    }
+
+    private fun initializeOnCameraTrackingChangedListener() {
+        onTrackingChangedListener =
+            NavigationOnCameraTrackingChangedListener(navigationPresenter)
+        navigationMap?.addOnCameraTrackingChangedListener(onTrackingChangedListener)
+    }
+
+    private fun establish(options: NavigationViewOptions) {
+        val localeUtils = LocaleUtils()
+        establishDistanceFormatter(localeUtils, options)
+    }
+
+    private fun establishDistanceFormatter(
+        localeUtils: LocaleUtils,
+        options: NavigationViewOptions
+    ) {
+        val unitType = establishUnitType(localeUtils, options)
+        val language = establishLanguage(localeUtils, options)
+        val roundingIncrement = establishRoundingIncrement(options)
+        val distanceFormatter = DistanceFormatter(context, language, unitType, roundingIncrement)
+
+        instructionView.setDistanceFormatter(distanceFormatter)
+    }
+
+    private fun establishRoundingIncrement(navigationViewOptions: NavigationViewOptions): MapLibreNavigationOptions.RoundingIncrement {
+        val mapboxNavigationOptions = navigationViewOptions.navigationOptions()
+        return mapboxNavigationOptions.roundingIncrement
+    }
+
+    private fun establishLanguage(
+        localeUtils: LocaleUtils,
+        options: NavigationViewOptions
+    ): String {
+        return localeUtils.getNonEmptyLanguage(context, options.directionsRoute().voiceLanguage)
+    }
+
+    private fun establishUnitType(
+        localeUtils: LocaleUtils,
+        options: NavigationViewOptions
+    ): UnitType {
+        val routeOptions = options.directionsRoute().routeOptions
+        val voiceUnits = routeOptions?.voiceUnits
+        return localeUtils.retrieveNonNullUnitType(context, voiceUnits)
+    }
+
+    private fun initializeNavigationListeners(
+        options: NavigationViewOptions,
+        navigationViewModel: NavigationViewModel?
+    ) {
+        navigationMap?.addProgressChangeListener(navigationViewModel?.retrieveNavigation()!!)
+        navigationViewEventDispatcher?.initializeListeners(options, navigationViewModel)
+    }
+
+    private fun setupNavigationMapLibreMap(options: NavigationViewOptions) {
+        navigationMap?.updateWaynameQueryMap(options.waynameChipEnabled())
+    }
+
+    /**
+     * Subscribes the [InstructionView] to the [NavigationViewModel].
+     *
+     *
+     * Then, creates an instance of [NavigationViewSubscriber], which takes a presenter.
+     *
+     *
+     * The subscriber then subscribes to the view models, setting up the appropriate presenter / listener
+     * method calls based on the [androidx.lifecycle.LiveData] updates.
+     */
+    private fun subscribeViewModels() {
+        instructionView.subscribe(this, navigationViewModel)
+
+        NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).subscribe()
+        isSubscribed = true
+    }
+
+    private fun shutdown() {
+        navigationMap?.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
+        navigationMap?.onDestroy()
+        preNavigationLocationEngine?.stop()
+
+        navigationViewEventDispatcher?.onDestroy(navigationViewModel.retrieveNavigation())
+        mapView.onDestroy()
+        navigationViewModel.onDestroy(isChangingConfigurations)
+        ImageCreator.getInstance().shutdown()
+        navigationMap = null
+    }
+
+    companion object {
+        private const val MAP_INSTANCE_STATE_KEY = "navigation_maplibre_map_instance_state"
+        private const val INVALID_STATE = 0
+    }
+
+    override val lifecycle: Lifecycle
+        get() = lifecycleRegistry
+
+}
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
index 7c96b9b63..a12dbef4f 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java
@@ -19,34 +19,31 @@
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LifecycleRegistry;
-import androidx.lifecycle.ViewModelProvider;
-
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
 
+import org.maplibre.android.camera.CameraPosition;
+import org.maplibre.android.location.modes.RenderMode;
+import org.maplibre.android.maps.MapLibreMap;
+import org.maplibre.android.maps.MapView;
+import org.maplibre.android.maps.OnMapReadyCallback;
+import org.maplibre.android.maps.Style;
+import org.maplibre.geojson.Point;
 import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera;
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.ImageCreator;
+import org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionView;
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.NavigationAlertView;
 import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMap;
 import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMapInstanceState;
 import org.maplibre.navigation.android.navigation.ui.v5.map.WayNameView;
 import org.maplibre.navigation.android.navigation.ui.v5.summary.SummaryBottomSheet;
+import org.maplibre.navigation.android.navigation.ui.v5.utils.DistanceFormatter;
+import org.maplibre.navigation.android.navigation.ui.v5.utils.LocaleUtils;
 import org.maplibre.navigation.core.location.Location;
+import org.maplibre.navigation.core.location.replay.ReplayRouteLocationEngine;
 import org.maplibre.navigation.core.models.DirectionsRoute;
 import org.maplibre.navigation.core.models.RouteOptions;
-import org.maplibre.geojson.Point;
-import org.maplibre.android.camera.CameraPosition;
-import org.maplibre.android.location.modes.RenderMode;
-import org.maplibre.android.maps.MapView;
-import org.maplibre.android.maps.MapLibreMap;
-import org.maplibre.android.maps.OnMapReadyCallback;
-import org.maplibre.android.maps.Style;
-import org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionView;
-import org.maplibre.navigation.core.location.replay.ReplayRouteLocationEngine;
 import org.maplibre.navigation.core.models.UnitType;
 import org.maplibre.navigation.core.navigation.MapLibreNavigation;
 import org.maplibre.navigation.core.navigation.MapLibreNavigationOptions;
-import org.maplibre.navigation.android.navigation.ui.v5.utils.DistanceFormatter;
-import org.maplibre.navigation.android.navigation.ui.v5.utils.LocaleUtils;
 
 /**
  * View that creates the drop-in UI.
@@ -71,648 +68,604 @@
  * @since 0.7.0
  */
 public class NavigationView extends CoordinatorLayout implements LifecycleOwner, OnMapReadyCallback,
-  NavigationContract.View {
-
-  private static final String MAP_INSTANCE_STATE_KEY = "navgation_mapbox_map_instance_state";
-  private static final int INVALID_STATE = 0;
-  private MapView mapView;
-  private InstructionView instructionView;
-  private SummaryBottomSheet summaryBottomSheet;
-  private BottomSheetBehavior summaryBehavior;
-  private ImageButton cancelBtn;
-  private RecenterButton recenterBtn;
-  private WayNameView wayNameView;
-  private ImageButton routeOverviewBtn;
-
-  private NavigationPresenter navigationPresenter;
-  private NavigationViewEventDispatcher navigationViewEventDispatcher;
-  private NavigationViewModel navigationViewModel;
-  private NavigationMapLibreMap navigationMap;
-  private OnNavigationReadyCallback onNavigationReadyCallback;
-  private NavigationOnCameraTrackingChangedListener onTrackingChangedListener;
-  private NavigationMapLibreMapInstanceState mapInstanceState;
-  private CameraPosition initialMapCameraPosition;
-  private boolean isMapInitialized;
-  private boolean isSubscribed;
-  private LifecycleRegistry lifecycleRegistry;
-
-  public NavigationView(Context context) {
-    this(context, null);
-  }
-
-  public NavigationView(Context context, @Nullable AttributeSet attrs) {
-    this(context, attrs, -1);
-  }
-
-  public NavigationView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-    ThemeSwitcher.setTheme(context, attrs);
-    initializeView();
-  }
-
-  /**
-   * Uses savedInstanceState as a cue to restore state (if not null).
-   *
-   * @param savedInstanceState to restore state if not null
-   */
-  public void onCreate(@Nullable Bundle savedInstanceState) {
-    mapView.onCreate(savedInstanceState);
-    updatePresenterState(savedInstanceState);
-    lifecycleRegistry = new LifecycleRegistry(this);
-    lifecycleRegistry.markState(Lifecycle.State.CREATED);
-  }
-
-  /**
-   * Low memory must be reported so the {@link MapView}
-   * can react appropriately.
-   */
-  public void onLowMemory() {
-    mapView.onLowMemory();
-  }
-
-  /**
-   * If the instruction list is showing and onBackPressed is called,
-   * hide the instruction list and do not hide the activity or fragment.
-   *
-   * @return true if back press handled, false if not
-   */
-  public boolean onBackPressed() {
-    return instructionView.handleBackPressed();
-  }
-
-  /**
-   * Used to store the bottomsheet state and re-center
-   * button visibility.  As well as anything the {@link MapView}
-   * needs to store in the bundle.
-   *
-   * @param outState to store state variables
-   */
-  public void onSaveInstanceState(Bundle outState) {
-    int bottomSheetBehaviorState = summaryBehavior == null ? INVALID_STATE : summaryBehavior.getState();
-    boolean isWayNameVisible = wayNameView.getVisibility() == VISIBLE;
-    NavigationViewInstanceState navigationViewInstanceState = new NavigationViewInstanceState(
-      bottomSheetBehaviorState, recenterBtn.getVisibility(), instructionView.isShowingInstructionList(),
-      isWayNameVisible, wayNameView.retrieveWayNameText(), navigationViewModel.isMuted());
-    String instanceKey = getContext().getString(R.string.navigation_view_instance_state);
-    outState.putParcelable(instanceKey, navigationViewInstanceState);
-    outState.putBoolean(getContext().getString(R.string.navigation_running), navigationViewModel.isRunning());
-    mapView.onSaveInstanceState(outState);
-    saveNavigationMapInstanceState(outState);
-  }
-
-  /**
-   * Used to restore the bottomsheet state and re-center
-   * button visibility.  As well as the {@link MapView}
-   * position prior to rotation.
-   *
-   * @param savedInstanceState to extract state variables
-   */
-  public void onRestoreInstanceState(Bundle savedInstanceState) {
-    String instanceKey = getContext().getString(R.string.navigation_view_instance_state);
-    NavigationViewInstanceState navigationViewInstanceState = savedInstanceState.getParcelable(instanceKey);
-    recenterBtn.setVisibility(navigationViewInstanceState.getRecenterButtonVisibility());
-    wayNameView.setVisibility(navigationViewInstanceState.isWayNameVisible() ? VISIBLE : INVISIBLE);
-    wayNameView.updateWayNameText(navigationViewInstanceState.getWayNameText());
-    resetBottomSheetState(navigationViewInstanceState.getBottomSheetBehaviorState());
-    updateInstructionListState(navigationViewInstanceState.isInstructionViewVisible());
-    updateInstructionMutedState(navigationViewInstanceState.isMuted());
-    mapInstanceState = savedInstanceState.getParcelable(MAP_INSTANCE_STATE_KEY);
-  }
-
-  /**
-   * Called to ensure the {@link MapView} is destroyed
-   * properly.
-   * <p>
-   * In an {@link Activity} this should be in {@link Activity#onDestroy()}.
-   * <p>
-   * In a {@link Fragment}, this should
-   * be in {@link Fragment#onDestroyView()}.
-   */
-  @UiThread
-  public void onDestroy() {
-    shutdown();
-    lifecycleRegistry.markState(Lifecycle.State.DESTROYED);
-  }
-
-  public void onStart() {
-    mapView.onStart();
-    if (navigationMap != null) {
-      navigationMap.onStart();
-    }
-    lifecycleRegistry.markState(Lifecycle.State.STARTED);
-  }
-
-  public void onResume() {
-    mapView.onResume();
-    lifecycleRegistry.markState(Lifecycle.State.RESUMED);
-  }
-
-  public void onPause() {
-    mapView.onPause();
-  }
-
-  public void onStop() {
-    mapView.onStop();
-    if (navigationMap != null) {
-      navigationMap.onStop();
-    }
-  }
-
-  @NonNull
-  @Override
-  public Lifecycle getLifecycle() {
-    return lifecycleRegistry;
-  }
-
-  /**
-   * Fired after the map is ready, this is our cue to finish
-   * setting up the rest of the plugins / location engine.
-   * <p>
-   * Also, we check for launch data (coordinates or route).
-   *
-   * @param mapLibreMap used for route, camera, and location UI
-   * @since 0.6.0
-   */
-  @Override
-  public void onMapReady(final MapLibreMap mapLibreMap) {
-    mapLibreMap.setStyle(ThemeSwitcher.retrieveMapStyle(getContext()), new Style.OnStyleLoaded() {
-      @Override
-      public void onStyleLoaded(@NonNull Style style) {
-        initializeNavigationMap(mapView, mapLibreMap);
-        initializeWayNameListener();
-        onNavigationReadyCallback.onNavigationReady(navigationViewModel.isRunning());
-        isMapInitialized = true;
-      }
-    });
-  }
-
-  @Override
-  public void setSummaryBehaviorState(int state) {
-    summaryBehavior.setState(state);
-  }
-
-  @Override
-  public void setSummaryBehaviorHideable(boolean isHideable) {
-    summaryBehavior.setHideable(isHideable);
-  }
-
-  @Override
-  public boolean isSummaryBottomSheetHidden() {
-    return summaryBehavior.getState() == BottomSheetBehavior.STATE_HIDDEN;
-  }
-
-  @Override
-  public void resetCameraPosition() {
-    if (navigationMap != null) {
-      navigationMap.resetPadding();
-      navigationMap.resetCameraPositionWith(NavigationCamera.NAVIGATION_TRACKING_MODE_GPS);
-    }
-  }
-
-  @Override
-  public void showRecenterBtn() {
-    recenterBtn.show();
-  }
-
-  @Override
-  public void hideRecenterBtn() {
-    recenterBtn.hide();
-  }
-
-  @Override
-  public boolean isRecenterButtonVisible() {
-    return recenterBtn.getVisibility() == View.VISIBLE;
-  }
-
-  @Override
-  public void drawRoute(DirectionsRoute directionsRoute) {
-    if (navigationMap != null) {
-      navigationMap.drawRoute(directionsRoute);
-    }
-  }
-
-  @Override
-  public void addMarker(Point position) {
-    if (navigationMap != null) {
-      navigationMap.addDestinationMarker(position);
-    }
-  }
-
-  /**
-   * Provides the current visibility of the way name view.
-   *
-   * @return true if visible, false if not visible
-   */
-  public boolean isWayNameVisible() {
-    return wayNameView.getVisibility() == VISIBLE;
-  }
-
-  /**
-   * Updates the text of the way name view below the
-   * navigation icon.
-   * <p>
-   * If you'd like to use this method without being overridden by the default way names
-   * values we provide, please disabled auto-query with
-   * {@link NavigationMapLibreMap#updateWaynameQueryMap(boolean)}.
-   *
-   * @param wayName to update the view
-   */
-  @Override
-  public void updateWayNameView(@NonNull String wayName) {
-    wayNameView.updateWayNameText(wayName);
-  }
-
-  /**
-   * Updates the visibility of the way name view that is show below
-   * the navigation icon.
-   * <p>
-   * If you'd like to use this method without being overridden by the default visibility values
-   * values we provide, please disabled auto-query with
-   * {@link NavigationMapLibreMap#updateWaynameQueryMap(boolean)}.
-   *
-   * @param isVisible true to show, false to hide
-   */
-  @Override
-  public void updateWayNameVisibility(boolean isVisible) {
-    if (TextUtils.isEmpty(wayNameView.retrieveWayNameText())) {
-      isVisible = false;
-    }
-    wayNameView.updateVisibility(isVisible);
-    if (navigationMap != null) {
-      navigationMap.updateWaynameQueryMap(isVisible);
-    }
-  }
-
-  /**
-   * Used when starting this {@link android.app.Activity}
-   * for the first time.
-   * <p>
-   * Zooms to the beginning of the {@link DirectionsRoute}.
-   *
-   * @param directionsRoute where camera should move to
-   */
-  @Override
-  public void startCamera(DirectionsRoute directionsRoute) {
-    if (navigationMap != null) {
-      navigationMap.startCamera(directionsRoute);
-    }
-  }
-
-  /**
-   * Used after configuration changes to resume the camera
-   * to the last location update from the Navigation SDK.
-   *
-   * @param location where the camera should move to
-   */
-  @Override
-  public void resumeCamera(Location location) {
-    if (navigationMap != null) {
-      navigationMap.resumeCamera(location);
-    }
-  }
-
-  @Override
-  public void updateNavigationMap(Location location) {
-    if (navigationMap != null) {
-      navigationMap.updateLocation(location);
-    }
-  }
-
-  @Override
-  public void updateCameraRouteOverview() {
-    if (navigationMap != null) {
-      int[] padding = buildRouteOverviewPadding(getContext());
-      navigationMap.showRouteOverview(padding);
-    }
-  }
-
-  /**
-   * Should be called when this view is completely initialized.
-   *
-   * @param options with containing route / coordinate data
-   */
-  public void startNavigation(NavigationViewOptions options) {
-    initializeNavigation(options);
-  }
-
-  /**
-   * Call this when the navigation session needs to end navigation without finishing the whole view
-   *
-   * @since 0.16.0
-   */
-  public void stopNavigation() {
-    navigationPresenter.onNavigationStopped();
-    navigationViewModel.stopNavigation();
-  }
-
-  /**
-   * Should be called after {@link NavigationView#onCreate(Bundle)}.
-   * <p>
-   * This method adds the {@link OnNavigationReadyCallback},
-   * which will fire the ready events for this view.
-   *
-   * @param onNavigationReadyCallback to be set to this view
-   */
-  public void initialize(OnNavigationReadyCallback onNavigationReadyCallback) {
-    this.onNavigationReadyCallback = onNavigationReadyCallback;
-    if (!isMapInitialized) {
-      mapView.getMapAsync(this);
-    } else {
-      onNavigationReadyCallback.onNavigationReady(navigationViewModel.isRunning());
-    }
-  }
-
-  /**
-   * Should be called after {@link NavigationView#onCreate(Bundle)}.
-   * <p>
-   * This method adds the {@link OnNavigationReadyCallback},
-   * which will fire the ready events for this view.
-   * <p>
-   * This method also accepts a {@link CameraPosition} that will be set as soon as the map is
-   * ready.  Note, this position is ignored during rotation in favor of the last known map position.
-   *
-   * @param onNavigationReadyCallback to be set to this view
-   * @param initialMapCameraPosition  to be shown once the map is ready
-   */
-  public void initialize(OnNavigationReadyCallback onNavigationReadyCallback,
-                         @NonNull CameraPosition initialMapCameraPosition) {
-    this.onNavigationReadyCallback = onNavigationReadyCallback;
-    this.initialMapCameraPosition = initialMapCameraPosition;
-    if (!isMapInitialized) {
-      mapView.getMapAsync(this);
-    } else {
-      onNavigationReadyCallback.onNavigationReady(navigationViewModel.isRunning());
-    }
-  }
-
-  /**
-   * Gives the ability to manipulate the map directly for anything that might not currently be
-   * supported. This returns null until the view is initialized.
-   * <p>
-   * The {@link NavigationMapLibreMap} gives direct access to the map UI (location marker, route, etc.).
-   *
-   * @return navigation MapLibre map object, or null if view has not been initialized
-   */
-  @Nullable
-  public NavigationMapLibreMap retrieveNavigationmapLibreMap() {
-    return navigationMap;
-  }
-
-  /**
-   * Returns the instance of {@link MapLibreNavigation} powering the {@link NavigationView}
-   * once navigation has started.  Will return null if navigation has not been started with
-   * {@link NavigationView#startNavigation(NavigationViewOptions)}.
-   *
-   * @return MapLibre navigation, or null if navigation has not started
-   */
-  @Nullable
-  public MapLibreNavigation retrieveMapLibreNavigation() {
-    return navigationViewModel.retrieveNavigation();
-  }
-
-  /**
-   * Returns the sound button used for muting instructions
-   *
-   * @return sound button
-   */
-  public NavigationButton retrieveSoundButton() {
-    return instructionView.retrieveSoundButton();
-  }
-
-
-  /**
-   * Returns the re-center button for recentering on current location
-   *
-   * @return recenter button
-   */
-  public NavigationButton retrieveRecenterButton() {
-    return recenterBtn;
-  }
-
-  /**
-   * Returns the {@link NavigationAlertView} that is shown during off-route events with
-   * "Report a Problem" text.
-   *
-   * @return alert view that is used in the instruction view
-   */
-  public NavigationAlertView retrieveAlertView() {
-    return instructionView.retrieveAlertView();
-  }
-
-  private void initializeView() {
-    inflate(getContext(), R.layout.navigation_view_layout, this);
-    bind();
-    initializeNavigationViewModel();
-    initializeNavigationEventDispatcher();
-    initializeNavigationPresenter();
-    initializeInstructionListListener();
-    initializeSummaryBottomSheet();
-  }
-
-  private void bind() {
-    mapView = findViewById(R.id.navigationMapView);
-    instructionView = findViewById(R.id.instructionView);
-    ViewCompat.setElevation(instructionView, 10);
-    summaryBottomSheet = findViewById(R.id.summaryBottomSheet);
-    cancelBtn = findViewById(R.id.cancelBtn);
-    recenterBtn = findViewById(R.id.recenterBtn);
-    wayNameView = findViewById(R.id.wayNameView);
-    routeOverviewBtn = findViewById(R.id.routeOverviewBtn);
-  }
-
-  private void initializeNavigationViewModel() {
-    try {
-      navigationViewModel = new ViewModelProvider((FragmentActivity) getContext()).get(NavigationViewModel.class);
-    } catch (ClassCastException exception) {
-      throw new ClassCastException("Please ensure that the provided Context is a valid FragmentActivity");
-    }
-  }
-
-  private void initializeSummaryBottomSheet() {
-    summaryBehavior = BottomSheetBehavior.from(summaryBottomSheet);
-    summaryBehavior.setHideable(false);
-    summaryBehavior.setBottomSheetCallback(new SummaryBottomSheetCallback(navigationPresenter,
-      navigationViewEventDispatcher));
-  }
-
-  private void initializeNavigationEventDispatcher() {
-    navigationViewEventDispatcher = new NavigationViewEventDispatcher();
-    navigationViewModel.initializeEventDispatcher(navigationViewEventDispatcher);
-  }
-
-  private void initializeInstructionListListener() {
-    instructionView.setInstructionListListener(new NavigationInstructionListListener(navigationPresenter,
-      navigationViewEventDispatcher));
-  }
-
-  private void initializeNavigationMap(MapView mapView, MapLibreMap map) {
-    if (initialMapCameraPosition != null) {
-      map.setCameraPosition(initialMapCameraPosition);
-    }
-    navigationMap = new NavigationMapLibreMap(mapView, map);
-    navigationMap.updateLocationLayerRenderMode(RenderMode.GPS);
-    if (mapInstanceState != null) {
-      navigationMap.restoreFrom(mapInstanceState);
-      return;
-    }
-  }
-
-  private void initializeWayNameListener() {
-    NavigationViewWayNameListener wayNameListener = new NavigationViewWayNameListener(navigationPresenter);
-    navigationMap.addOnWayNameChangedListener(wayNameListener);
-  }
-
-  private void saveNavigationMapInstanceState(Bundle outState) {
-    if (navigationMap != null) {
-      navigationMap.saveStateWith(MAP_INSTANCE_STATE_KEY, outState);
-    }
-  }
-
-  private void resetBottomSheetState(int bottomSheetState) {
-    if (bottomSheetState > INVALID_STATE) {
-      boolean isShowing = bottomSheetState == BottomSheetBehavior.STATE_EXPANDED;
-      summaryBehavior.setHideable(!isShowing);
-      summaryBehavior.setState(bottomSheetState);
-    }
-  }
-
-  private void updateInstructionListState(boolean visible) {
-    if (visible) {
-      instructionView.showInstructionList();
-    } else {
-      instructionView.hideInstructionList();
-    }
-  }
-
-  private void updateInstructionMutedState(boolean isMuted) {
-    if (isMuted) {
-      ((SoundButton) instructionView.retrieveSoundButton()).soundFabOff();
-    }
-  }
-
-  private int[] buildRouteOverviewPadding(Context context) {
-    Resources resources = context.getResources();
-    int leftRightPadding = (int) resources.getDimension(R.dimen.route_overview_left_right_padding);
-    int paddingBuffer = (int) resources.getDimension(R.dimen.route_overview_buffer_padding);
-    int instructionHeight = (int) (resources.getDimension(R.dimen.instruction_layout_height) + paddingBuffer);
-    int summaryHeight = (int) resources.getDimension(R.dimen.summary_bottomsheet_height);
-    return new int[] {leftRightPadding, instructionHeight, leftRightPadding, summaryHeight};
-  }
-
-  private boolean isChangingConfigurations() {
-    try {
-      return ((FragmentActivity) getContext()).isChangingConfigurations();
-    } catch (ClassCastException exception) {
-      throw new ClassCastException("Please ensure that the provided Context is a valid FragmentActivity");
-    }
-  }
-
-  private void initializeNavigationPresenter() {
-    navigationPresenter = new NavigationPresenter(this);
-  }
-
-  private void updatePresenterState(@Nullable Bundle savedInstanceState) {
-    if (savedInstanceState != null) {
-      String navigationRunningKey = getContext().getString(R.string.navigation_running);
-      boolean resumeState = savedInstanceState.getBoolean(navigationRunningKey);
-      navigationPresenter.updateResumeState(resumeState);
-    }
-  }
-
-  private void initializeNavigation(NavigationViewOptions options) {
-    establish(options);
-    navigationViewModel.initialize(options);
-    initializeNavigationListeners(options, navigationViewModel);
-    setupNavigationmapLibreMap(options);
-
-    if (!isSubscribed) {
-      initializeClickListeners();
-      initializeOnCameraTrackingChangedListener();
-      subscribeViewModels();
-    }
-  }
-
-  private void initializeClickListeners() {
-    cancelBtn.setOnClickListener(new CancelBtnClickListener(navigationViewEventDispatcher));
-    recenterBtn.addOnClickListener(new RecenterBtnClickListener(navigationPresenter));
-    routeOverviewBtn.setOnClickListener(new RouteOverviewBtnClickListener(navigationPresenter));
-  }
-
-  private void initializeOnCameraTrackingChangedListener() {
-    onTrackingChangedListener = new NavigationOnCameraTrackingChangedListener(navigationPresenter, summaryBehavior);
-    navigationMap.addOnCameraTrackingChangedListener(onTrackingChangedListener);
-  }
-
-  private void establish(NavigationViewOptions options) {
-    LocaleUtils localeUtils = new LocaleUtils();
-    establishDistanceFormatter(localeUtils, options);
-    establishTimeFormat(options);
-  }
-
-  private void establishDistanceFormatter(LocaleUtils localeUtils, NavigationViewOptions options) {
-    UnitType unitType = establishUnitType(localeUtils, options);
-    String language = establishLanguage(localeUtils, options);
-    MapLibreNavigationOptions.RoundingIncrement roundingIncrement = establishRoundingIncrement(options);
-    DistanceFormatter distanceFormatter = new DistanceFormatter(getContext(), language, unitType, roundingIncrement);
-
-    instructionView.setDistanceFormatter(distanceFormatter);
-    summaryBottomSheet.setDistanceFormatter(distanceFormatter);
-  }
-
-  private MapLibreNavigationOptions.RoundingIncrement establishRoundingIncrement(NavigationViewOptions navigationViewOptions) {
-    MapLibreNavigationOptions mapLibreNavigationOptions = navigationViewOptions.navigationOptions();
-    return mapLibreNavigationOptions.getRoundingIncrement();
-  }
-
-  private String establishLanguage(LocaleUtils localeUtils, NavigationViewOptions options) {
-    return localeUtils.getNonEmptyLanguage(getContext(), options.directionsRoute().getVoiceLanguage());
-  }
-
-  private UnitType establishUnitType(LocaleUtils localeUtils, NavigationViewOptions options) {
-    RouteOptions routeOptions = options.directionsRoute().getRouteOptions();
-    UnitType voiceUnits = routeOptions == null ? null : routeOptions.getVoiceUnits();
-    return localeUtils.retrieveNonNullUnitType(getContext(), voiceUnits);
-  }
-
-  private void establishTimeFormat(NavigationViewOptions options) {
-    summaryBottomSheet.setTimeFormat(options.navigationOptions().getTimeFormatType());
-  }
-
-  private void initializeNavigationListeners(NavigationViewOptions options, NavigationViewModel navigationViewModel) {
-    navigationMap.addProgressChangeListener(navigationViewModel.retrieveNavigation());
-    navigationViewEventDispatcher.initializeListeners(options, navigationViewModel);
-  }
-
-  private void setupNavigationmapLibreMap(NavigationViewOptions options) {
-    navigationMap.updateWaynameQueryMap(options.waynameChipEnabled());
-  }
-
-  /**
-   * Subscribes the {@link InstructionView} and {@link SummaryBottomSheet} to the {@link NavigationViewModel}.
-   * <p>
-   * Then, creates an instance of {@link NavigationViewSubscriber}, which takes a presenter.
-   * <p>
-   * The subscriber then subscribes to the view models, setting up the appropriate presenter / listener
-   * method calls based on the {@link androidx.lifecycle.LiveData} updates.
-   */
-  private void subscribeViewModels() {
-    instructionView.subscribe(this, navigationViewModel);
-    summaryBottomSheet.subscribe(this, navigationViewModel);
-
-    new NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).subscribe();
-    isSubscribed = true;
-  }
-
-  @UiThread
-  private void shutdown() {
-    if (navigationMap != null) {
-      navigationMap.removeOnCameraTrackingChangedListener(onTrackingChangedListener);
-      navigationMap.onDestroy();
-    }
-    navigationViewEventDispatcher.onDestroy(navigationViewModel.retrieveNavigation());
-    mapView.onDestroy();
-    navigationViewModel.onDestroy(isChangingConfigurations());
-    ImageCreator.getInstance().shutdown();
-    navigationMap = null;
-  }
+        NavigationContract.View {
+
+    private static final String MAP_INSTANCE_STATE_KEY = "navgation_mapbox_map_instance_state";
+    private static final int INVALID_STATE = 0;
+    private MapView mapView;
+    private InstructionView instructionView;
+    private ImageButton cancelBtn;
+    private RecenterButton recenterBtn;
+    private WayNameView wayNameView;
+    private ImageButton routeOverviewBtn;
+
+    private NavigationPresenter navigationPresenter;
+    private NavigationViewEventDispatcher navigationViewEventDispatcher;
+    private NavigationViewModel navigationViewModel;
+    private NavigationMapLibreMap navigationMap;
+    private OnNavigationReadyCallback onNavigationReadyCallback;
+    private NavigationOnCameraTrackingChangedListener onTrackingChangedListener;
+    private NavigationMapLibreMapInstanceState mapInstanceState;
+    private CameraPosition initialMapCameraPosition;
+    private boolean isMapInitialized;
+    private boolean isSubscribed;
+    private LifecycleRegistry lifecycleRegistry;
+
+    public NavigationView(Context context) {
+        this(context, null);
+    }
+
+    public NavigationView(Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, -1);
+    }
+
+    public NavigationView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        ThemeSwitcher.setTheme(context, attrs);
+        initializeView();
+    }
+
+    /**
+     * Uses savedInstanceState as a cue to restore state (if not null).
+     *
+     * @param savedInstanceState to restore state if not null
+     */
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        mapView.onCreate(savedInstanceState);
+        updatePresenterState(savedInstanceState);
+        lifecycleRegistry = new LifecycleRegistry(this);
+        lifecycleRegistry.markState(Lifecycle.State.CREATED);
+    }
+
+    /**
+     * Low memory must be reported so the {@link MapView}
+     * can react appropriately.
+     */
+    public void onLowMemory() {
+        mapView.onLowMemory();
+    }
+
+    /**
+     * If the instruction list is showing and onBackPressed is called,
+     * hide the instruction list and do not hide the activity or fragment.
+     *
+     * @return true if back press handled, false if not
+     */
+    public boolean onBackPressed() {
+        return instructionView.handleBackPressed();
+    }
+
+    /**
+     * Used to store the bottomsheet state and re-center
+     * button visibility.  As well as anything the {@link MapView}
+     * needs to store in the bundle.
+     *
+     * @param outState to store state variables
+     */
+    public void onSaveInstanceState(Bundle outState) {
+        boolean isWayNameVisible = wayNameView.getVisibility() == VISIBLE;
+        NavigationViewInstanceState navigationViewInstanceState = new NavigationViewInstanceState(recenterBtn.getVisibility(), instructionView.isShowingInstructionList(),
+                isWayNameVisible, wayNameView.retrieveWayNameText(), navigationViewModel.isMuted());
+        String instanceKey = getContext().getString(R.string.navigation_view_instance_state);
+        outState.putParcelable(instanceKey, navigationViewInstanceState);
+        outState.putBoolean(getContext().getString(R.string.navigation_running), navigationViewModel.isRunning());
+        mapView.onSaveInstanceState(outState);
+        saveNavigationMapInstanceState(outState);
+    }
+
+    /**
+     * Used to restore the bottomsheet state and re-center
+     * button visibility.  As well as the {@link MapView}
+     * position prior to rotation.
+     *
+     * @param savedInstanceState to extract state variables
+     */
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        String instanceKey = getContext().getString(R.string.navigation_view_instance_state);
+        NavigationViewInstanceState navigationViewInstanceState = savedInstanceState.getParcelable(instanceKey);
+        recenterBtn.setVisibility(navigationViewInstanceState.getRecenterButtonVisibility());
+        wayNameView.setVisibility(navigationViewInstanceState.isWayNameVisible() ? VISIBLE : INVISIBLE);
+        wayNameView.updateWayNameText(navigationViewInstanceState.getWayNameText());
+        updateInstructionListState(navigationViewInstanceState.isInstructionViewVisible());
+        updateInstructionMutedState(navigationViewInstanceState.isMuted());
+        mapInstanceState = savedInstanceState.getParcelable(MAP_INSTANCE_STATE_KEY);
+    }
+
+    /**
+     * Called to ensure the {@link MapView} is destroyed
+     * properly.
+     * <p>
+     * In an {@link Activity} this should be in {@link Activity#onDestroy()}.
+     * <p>
+     * In a {@link Fragment}, this should
+     * be in {@link Fragment#onDestroyView()}.
+     */
+    @UiThread
+    public void onDestroy() {
+        shutdown();
+        lifecycleRegistry.markState(Lifecycle.State.DESTROYED);
+    }
+
+    public void onStart() {
+        mapView.onStart();
+        if (navigationMap != null) {
+            navigationMap.onStart();
+        }
+        lifecycleRegistry.markState(Lifecycle.State.STARTED);
+    }
+
+    public void onResume() {
+        mapView.onResume();
+        lifecycleRegistry.markState(Lifecycle.State.RESUMED);
+    }
+
+    public void onPause() {
+        mapView.onPause();
+    }
+
+    public void onStop() {
+        mapView.onStop();
+        if (navigationMap != null) {
+            navigationMap.onStop();
+        }
+    }
+
+    @NonNull
+    @Override
+    public Lifecycle getLifecycle() {
+        return lifecycleRegistry;
+    }
+
+    /**
+     * Fired after the map is ready, this is our cue to finish
+     * setting up the rest of the plugins / location engine.
+     * <p>
+     * Also, we check for launch data (coordinates or route).
+     *
+     * @param mapLibreMap used for route, camera, and location UI
+     * @since 0.6.0
+     */
+    @Override
+    public void onMapReady(final MapLibreMap mapLibreMap) {
+        Style.Builder builder = new Style.Builder().fromUri(getContext().getString(R.string.map_style_light));
+
+        mapLibreMap.setStyle((builder), new Style.OnStyleLoaded() {
+            @Override
+            public void onStyleLoaded(@NonNull Style style) {
+                initializeNavigationMap(mapView, mapLibreMap);
+                initializeWayNameListener();
+                onNavigationReadyCallback.onNavigationReady(navigationViewModel.isRunning());
+                isMapInitialized = true;
+            }
+        });
+    }
+
+    @Override
+    public void resetCameraPosition() {
+        if (navigationMap != null) {
+            navigationMap.resetPadding();
+            navigationMap.resetCameraPositionWith(NavigationCamera.NAVIGATION_TRACKING_MODE_GPS);
+        }
+    }
+
+    @Override
+    public void showRecenterBtn() {
+        recenterBtn.show();
+    }
+
+    @Override
+    public void hideRecenterBtn() {
+        recenterBtn.hide();
+    }
+
+    @Override
+    public boolean isRecenterButtonVisible() {
+        return recenterBtn.getVisibility() == View.VISIBLE;
+    }
+
+    @Override
+    public void drawRoute(DirectionsRoute directionsRoute) {
+        if (navigationMap != null) {
+            navigationMap.drawRoute(directionsRoute);
+        }
+    }
+
+    /**
+     * Provides the current visibility of the way name view.
+     *
+     * @return true if visible, false if not visible
+     */
+    public boolean isWayNameVisible() {
+        return wayNameView.getVisibility() == VISIBLE;
+    }
+
+    /**
+     * Updates the text of the way name view below the
+     * navigation icon.
+     * <p>
+     * If you'd like to use this method without being overridden by the default way names
+     * values we provide, please disabled auto-query with
+     * {@link NavigationMapLibreMap#updateWaynameQueryMap(boolean)}.
+     *
+     * @param wayName to update the view
+     */
+    @Override
+    public void updateWayNameView(@NonNull String wayName) {
+        wayNameView.updateWayNameText(wayName);
+    }
+
+    /**
+     * Updates the visibility of the way name view that is show below
+     * the navigation icon.
+     * <p>
+     * If you'd like to use this method without being overridden by the default visibility values
+     * values we provide, please disabled auto-query with
+     * {@link NavigationMapLibreMap#updateWaynameQueryMap(boolean)}.
+     *
+     * @param isVisible true to show, false to hide
+     */
+    @Override
+    public void updateWayNameVisibility(boolean isVisible) {
+        if (TextUtils.isEmpty(wayNameView.retrieveWayNameText())) {
+            isVisible = false;
+        }
+        wayNameView.updateVisibility(isVisible);
+        if (navigationMap != null) {
+            navigationMap.updateWaynameQueryMap(isVisible);
+        }
+    }
+
+    /**
+     * Used when starting this {@link android.app.Activity}
+     * for the first time.
+     * <p>
+     * Zooms to the beginning of the {@link DirectionsRoute}.
+     *
+     * @param directionsRoute where camera should move to
+     */
+    @Override
+    public void startCamera(DirectionsRoute directionsRoute) {
+        if (navigationMap != null) {
+            navigationMap.startCamera(directionsRoute);
+        }
+    }
+
+    /**
+     * Used after configuration changes to resume the camera
+     * to the last location update from the Navigation SDK.
+     *
+     * @param location where the camera should move to
+     */
+    @Override
+    public void resumeCamera(Location location) {
+        if (navigationMap != null) {
+            navigationMap.resumeCamera(location);
+        }
+    }
+
+    @Override
+    public void updateNavigationMap(Location location) {
+        if (navigationMap != null) {
+            navigationMap.updateLocation(location);
+        }
+    }
+
+    @Override
+    public void updateCameraRouteOverview() {
+        if (navigationMap != null) {
+            int[] padding = buildRouteOverviewPadding(getContext());
+            navigationMap.showRouteOverview(padding);
+        }
+    }
+
+    /**
+     * Should be called when this view is completely initialized.
+     *
+     * @param options with containing route / coordinate data
+     */
+    public void startNavigation(NavigationViewOptions options) {
+        initializeNavigation(options);
+    }
+
+    /**
+     * Call this when the navigation session needs to end navigation without finishing the whole view
+     *
+     * @since 0.16.0
+     */
+    public void stopNavigation() {
+        navigationPresenter.onNavigationStopped();
+        navigationViewModel.stopNavigation();
+    }
+
+    /**
+     * Should be called after {@link NavigationView#onCreate(Bundle)}.
+     * <p>
+     * This method adds the {@link OnNavigationReadyCallback},
+     * which will fire the ready events for this view.
+     *
+     * @param onNavigationReadyCallback to be set to this view
+     */
+    public void initialize(OnNavigationReadyCallback onNavigationReadyCallback) {
+        this.onNavigationReadyCallback = onNavigationReadyCallback;
+        if (!isMapInitialized) {
+            mapView.getMapAsync(this);
+        } else {
+            onNavigationReadyCallback.onNavigationReady(navigationViewModel.isRunning());
+        }
+    }
+
+    /**
+     * Should be called after {@link NavigationView#onCreate(Bundle)}.
+     * <p>
+     * This method adds the {@link OnNavigationReadyCallback},
+     * which will fire the ready events for this view.
+     * <p>
+     * This method also accepts a {@link CameraPosition} that will be set as soon as the map is
+     * ready.  Note, this position is ignored during rotation in favor of the last known map position.
+     *
+     * @param onNavigationReadyCallback to be set to this view
+     * @param initialMapCameraPosition  to be shown once the map is ready
+     */
+    public void initialize(OnNavigationReadyCallback onNavigationReadyCallback,
+                           @NonNull CameraPosition initialMapCameraPosition) {
+        this.onNavigationReadyCallback = onNavigationReadyCallback;
+        this.initialMapCameraPosition = initialMapCameraPosition;
+        if (!isMapInitialized) {
+            mapView.getMapAsync(this);
+        } else {
+            onNavigationReadyCallback.onNavigationReady(navigationViewModel.isRunning());
+        }
+    }
+
+    /**
+     * Gives the ability to manipulate the map directly for anything that might not currently be
+     * supported. This returns null until the view is initialized.
+     * <p>
+     * The {@link NavigationMapLibreMap} gives direct access to the map UI (location marker, route, etc.).
+     *
+     * @return navigation MapLibre map object, or null if view has not been initialized
+     */
+    @Nullable
+    public NavigationMapLibreMap retrieveNavigationmapLibreMap() {
+        return navigationMap;
+    }
+
+    /**
+     * Returns the instance of {@link MapLibreNavigation} powering the {@link NavigationView}
+     * once navigation has started.  Will return null if navigation has not been started with
+     * {@link NavigationView#startNavigation(NavigationViewOptions)}.
+     *
+     * @return MapLibre navigation, or null if navigation has not started
+     */
+    @Nullable
+    public MapLibreNavigation retrieveMapLibreNavigation() {
+        return navigationViewModel.retrieveNavigation();
+    }
+
+    /**
+     * Returns the sound button used for muting instructions
+     *
+     * @return sound button
+     */
+    public NavigationButton retrieveSoundButton() {
+        return instructionView.retrieveSoundButton();
+    }
+
+
+    /**
+     * Returns the re-center button for recentering on current location
+     *
+     * @return recenter button
+     */
+    public NavigationButton retrieveRecenterButton() {
+        return recenterBtn;
+    }
+
+    /**
+     * Returns the {@link NavigationAlertView} that is shown during off-route events with
+     * "Report a Problem" text.
+     *
+     * @return alert view that is used in the instruction view
+     */
+    public NavigationAlertView retrieveAlertView() {
+        return instructionView.retrieveAlertView();
+    }
+
+    private void initializeView() {
+        inflate(getContext(), R.layout.navigation_view_layout, this);
+        bind();
+        initializeNavigationViewModel();
+        initializeNavigationEventDispatcher();
+        initializeNavigationPresenter();
+        initializeInstructionListListener();
+    }
+
+    private void bind() {
+        mapView = findViewById(R.id.navigationMapView);
+        instructionView = findViewById(R.id.instructionView);
+        ViewCompat.setElevation(instructionView, 10);
+        cancelBtn = findViewById(R.id.cancelBtn);
+        recenterBtn = findViewById(R.id.recenterBtn);
+        wayNameView = findViewById(R.id.wayNameView);
+        routeOverviewBtn = findViewById(R.id.routeOverviewBtn);
+    }
+
+    private void initializeNavigationViewModel() {
+        try {
+            navigationViewModel = new NavigationViewModel(getContext());
+        } catch (ClassCastException exception) {
+            throw new ClassCastException("Please ensure that the provided Context is a valid FragmentActivity");
+        }
+    }
+
+    private void initializeNavigationEventDispatcher() {
+        navigationViewEventDispatcher = new NavigationViewEventDispatcher();
+        navigationViewModel.initializeEventDispatcher(navigationViewEventDispatcher);
+    }
+
+    private void initializeInstructionListListener() {
+        instructionView.setInstructionListListener(new NavigationInstructionListListener(navigationPresenter,
+                navigationViewEventDispatcher));
+    }
+
+    private void initializeNavigationMap(MapView mapView, MapLibreMap map) {
+        if (initialMapCameraPosition != null) {
+            map.setCameraPosition(initialMapCameraPosition);
+        }
+        navigationMap = new NavigationMapLibreMap(mapView, map);
+        navigationMap.updateLocationLayerRenderMode(RenderMode.GPS);
+        if (mapInstanceState != null) {
+            navigationMap.restoreFrom(mapInstanceState);
+            return;
+        }
+    }
+
+    private void initializeWayNameListener() {
+        NavigationViewWayNameListener wayNameListener = new NavigationViewWayNameListener(navigationPresenter);
+        navigationMap.addOnWayNameChangedListener(wayNameListener);
+    }
+
+    private void saveNavigationMapInstanceState(Bundle outState) {
+        if (navigationMap != null) {
+            navigationMap.saveStateWith(MAP_INSTANCE_STATE_KEY, outState);
+        }
+    }
+
+    private void updateInstructionListState(boolean visible) {
+        if (visible) {
+            instructionView.showInstructionList();
+        } else {
+            instructionView.hideInstructionList();
+        }
+    }
+
+    private void updateInstructionMutedState(boolean isMuted) {
+        if (isMuted) {
+            ((SoundButton) instructionView.retrieveSoundButton()).soundFabOff();
+        }
+    }
+
+    private int[] buildRouteOverviewPadding(Context context) {
+        Resources resources = context.getResources();
+        int leftRightPadding = (int) resources.getDimension(R.dimen.route_overview_left_right_padding);
+        int paddingBuffer = (int) resources.getDimension(R.dimen.route_overview_buffer_padding);
+        int instructionHeight = (int) (resources.getDimension(R.dimen.instruction_layout_height) + paddingBuffer);
+        int summaryHeight = (int) resources.getDimension(R.dimen.summary_bottomsheet_height);
+        return new int[]{leftRightPadding, instructionHeight, leftRightPadding, summaryHeight};
+    }
+
+    private boolean isChangingConfigurations() {
+        try {
+            return ((FragmentActivity) getContext()).isChangingConfigurations();
+        } catch (ClassCastException exception) {
+            throw new ClassCastException("Please ensure that the provided Context is a valid FragmentActivity");
+        }
+    }
+
+    private void initializeNavigationPresenter() {
+        navigationPresenter = new NavigationPresenter(this);
+    }
+
+    private void updatePresenterState(@Nullable Bundle savedInstanceState) {
+        if (savedInstanceState != null) {
+            String navigationRunningKey = getContext().getString(R.string.navigation_running);
+            boolean resumeState = savedInstanceState.getBoolean(navigationRunningKey);
+            navigationPresenter.updateResumeState(resumeState);
+        }
+    }
+
+    private void initializeNavigation(NavigationViewOptions options) {
+        establish(options);
+        navigationViewModel.initialize(options);
+        initializeNavigationListeners(options, navigationViewModel);
+        setupNavigationmapLibreMap(options);
+
+        if (!isSubscribed) {
+            initializeClickListeners();
+            initializeOnCameraTrackingChangedListener();
+            subscribeViewModels();
+        }
+    }
+
+    private void initializeClickListeners() {
+        cancelBtn.setOnClickListener(new CancelBtnClickListener(navigationViewEventDispatcher));
+        recenterBtn.addOnClickListener(new RecenterBtnClickListener(navigationPresenter));
+        routeOverviewBtn.setOnClickListener(new RouteOverviewBtnClickListener(navigationPresenter));
+    }
+
+    private void initializeOnCameraTrackingChangedListener() {
+        onTrackingChangedListener = new NavigationOnCameraTrackingChangedListener(navigationPresenter);
+        navigationMap.addOnCameraTrackingChangedListener(onTrackingChangedListener);
+    }
+
+    private void establish(NavigationViewOptions options) {
+        LocaleUtils localeUtils = new LocaleUtils();
+        establishDistanceFormatter(localeUtils, options);
+        establishTimeFormat(options);
+    }
+
+    private void establishDistanceFormatter(LocaleUtils localeUtils, NavigationViewOptions options) {
+        UnitType unitType = establishUnitType(localeUtils, options);
+        String language = establishLanguage(localeUtils, options);
+        MapLibreNavigationOptions.RoundingIncrement roundingIncrement = establishRoundingIncrement(options);
+        DistanceFormatter distanceFormatter = new DistanceFormatter(getContext(), language, unitType, roundingIncrement);
+
+        instructionView.setDistanceFormatter(distanceFormatter);
+    }
+
+    private MapLibreNavigationOptions.RoundingIncrement establishRoundingIncrement(NavigationViewOptions navigationViewOptions) {
+        MapLibreNavigationOptions mapLibreNavigationOptions = navigationViewOptions.navigationOptions();
+        return mapLibreNavigationOptions.getRoundingIncrement();
+    }
+
+    private String establishLanguage(LocaleUtils localeUtils, NavigationViewOptions options) {
+        return localeUtils.getNonEmptyLanguage(getContext(), options.directionsRoute().getVoiceLanguage());
+    }
+
+    private UnitType establishUnitType(LocaleUtils localeUtils, NavigationViewOptions options) {
+        RouteOptions routeOptions = options.directionsRoute().getRouteOptions();
+        UnitType voiceUnits = routeOptions == null ? null : routeOptions.getVoiceUnits();
+        return localeUtils.retrieveNonNullUnitType(getContext(), voiceUnits);
+    }
+
+    private void establishTimeFormat(NavigationViewOptions options) {
+        int timeFormatType = options.navigationOptions().getTimeFormatType().getId();
+    }
+
+    private void initializeNavigationListeners(NavigationViewOptions options, NavigationViewModel navigationViewModel) {
+        navigationMap.addProgressChangeListener(navigationViewModel.retrieveNavigation());
+        navigationViewEventDispatcher.initializeListeners(options, navigationViewModel);
+    }
+
+    private void setupNavigationmapLibreMap(NavigationViewOptions options) {
+        navigationMap.updateWaynameQueryMap(options.waynameChipEnabled());
+    }
+
+    /**
+     * Subscribes the {@link InstructionView} and {@link SummaryBottomSheet} to the {@link NavigationViewModel}.
+     * <p>
+     * Then, creates an instance of {@link NavigationViewSubscriber}, which takes a presenter.
+     * <p>
+     * The subscriber then subscribes to the view models, setting up the appropriate presenter / listener
+     * method calls based on the {@link androidx.lifecycle.LiveData} updates.
+     */
+    private void subscribeViewModels() {
+        instructionView.subscribe(this, navigationViewModel);
+
+        new NavigationViewSubscriber(this, navigationViewModel, navigationPresenter).subscribe();
+        isSubscribed = true;
+    }
+
+    @UiThread
+    private void shutdown() {
+        if (navigationMap != null) {
+            navigationMap.removeOnCameraTrackingChangedListener(onTrackingChangedListener);
+            navigationMap.onDestroy();
+        }
+        navigationViewEventDispatcher.onDestroy(navigationViewModel.retrieveNavigation());
+        mapView.onDestroy();
+        navigationViewModel.onDestroy(isChangingConfigurations());
+        ImageCreator.getInstance().shutdown();
+        navigationMap = null;
+    }
 }
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcher.java
index dfb325012..bef13d469 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcher.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcher.java
@@ -184,6 +184,7 @@ private void removeMilestoneEventListener(MapLibreNavigation navigation) {
   private void removeProgressChangeListener(MapLibreNavigation navigation) {
     if (progressChangeListener != null) {
       navigation.removeProgressChangeListener(progressChangeListener);
+      progressChangeListener = null;
     }
   }
 }
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewInstanceState.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewInstanceState.java
index 42ff7733c..e8a24c0ab 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewInstanceState.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewInstanceState.java
@@ -5,17 +5,15 @@
 
 class NavigationViewInstanceState implements Parcelable {
 
-  private int bottomSheetBehaviorState;
   private int recenterButtonVisibility;
   private boolean instructionViewVisible;
   private boolean isWayNameVisible;
   private boolean isMuted;
   private String wayNameText;
 
-  NavigationViewInstanceState(int bottomSheetBehaviorState, int recenterButtonVisibility,
+  NavigationViewInstanceState(int recenterButtonVisibility,
                               boolean instructionViewVisible, boolean isWayNameVisible, String wayNameText,
                               boolean isMuted) {
-    this.bottomSheetBehaviorState = bottomSheetBehaviorState;
     this.recenterButtonVisibility = recenterButtonVisibility;
     this.instructionViewVisible = instructionViewVisible;
     this.isWayNameVisible = isWayNameVisible;
@@ -23,10 +21,6 @@ class NavigationViewInstanceState implements Parcelable {
     this.isMuted = isMuted;
   }
 
-  int getBottomSheetBehaviorState() {
-    return bottomSheetBehaviorState;
-  }
-
   int getRecenterButtonVisibility() {
     return recenterButtonVisibility;
   }
@@ -48,7 +42,6 @@ boolean isMuted() {
   }
 
   private NavigationViewInstanceState(Parcel in) {
-    bottomSheetBehaviorState = in.readInt();
     recenterButtonVisibility = in.readInt();
     instructionViewVisible = in.readByte() != 0;
     isWayNameVisible = in.readByte() != 0;
@@ -58,7 +51,6 @@ private NavigationViewInstanceState(Parcel in) {
 
   @Override
   public void writeToParcel(Parcel dest, int flags) {
-    dest.writeInt(bottomSheetBehaviorState);
     dest.writeInt(recenterButtonVisibility);
     dest.writeByte((byte) (instructionViewVisible ? 1 : 0));
     dest.writeByte((byte) (isWayNameVisible ? 1 : 0));
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
index 4d8e0b071..f09f41de9 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java
@@ -6,7 +6,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.MutableLiveData;
 
 import org.maplibre.geojson.Point;
@@ -43,7 +42,7 @@
 
 import java.util.List;
 
-public class NavigationViewModel extends AndroidViewModel {
+public class NavigationViewModel {
 
     private static final String EMPTY_STRING = "";
     private static final String OKHTTP_INSTRUCTION_CACHE = "okhttp-instruction-cache";
@@ -63,6 +62,7 @@ public class NavigationViewModel extends AndroidViewModel {
     private LocationEngineConductor locationEngineConductor;
     private NavigationViewEventDispatcher navigationViewEventDispatcher;
     private SpeechPlayer speechPlayer;
+    private boolean isMuted = false;
     private int voiceInstructionsToAnnounce = 0;
     private RouteProgress routeProgress;
 
@@ -75,8 +75,10 @@ public class NavigationViewModel extends AndroidViewModel {
     private boolean isChangingConfigurations;
     private RouteUtils routeUtils = new RouteUtils();
 
-    public NavigationViewModel(Application application) {
-        super(application);
+    private Context context;
+
+    public NavigationViewModel(Context context) {
+        this.context = context;
         initializeLocationEngine();
         initializeRouter();
         this.localeUtils = new LocaleUtils();
@@ -86,7 +88,6 @@ public NavigationViewModel(Application application) {
         // Package private (no modifier) for testing purposes
     NavigationViewModel(Application application, MapLibreNavigation navigation,
                         NavigationViewRouter router) {
-        super(application);
         this.navigation = navigation;
         this.router = router;
     }
@@ -95,32 +96,29 @@ public NavigationViewModel(Application application) {
         // Package private (no modifier) for testing purposes
     NavigationViewModel(Application application, MapLibreNavigation navigation,
                         LocationEngineConductor conductor, NavigationViewEventDispatcher dispatcher, SpeechPlayer speechPlayer) {
-        super(application);
         this.navigation = navigation;
         this.locationEngineConductor = conductor;
         this.navigationViewEventDispatcher = dispatcher;
         this.speechPlayer = speechPlayer;
     }
 
-    @Override
-    protected void onCleared() {
-        super.onCleared();
-        destroyRouter();
-    }
-
     public void onDestroy(boolean isChangingConfigurations) {
         this.isChangingConfigurations = isChangingConfigurations;
         if (!isChangingConfigurations) {
             endNavigation();
             deactivateInstructionPlayer();
             isRunning = false;
+            this.route.setValue(null);
         }
         clearDynamicCameraMap();
         navigationViewEventDispatcher = null;
     }
 
     public void setMuted(boolean isMuted) {
-        speechPlayer.setMuted(isMuted);
+        this.isMuted = isMuted;
+        if (speechPlayer != null) {
+            speechPlayer.setMuted(isMuted);
+        }
     }
 
 
@@ -138,6 +136,14 @@ void initializeEventDispatcher(NavigationViewEventDispatcher navigationViewEvent
         this.navigationViewEventDispatcher = navigationViewEventDispatcher;
     }
 
+    /**
+     * This method used to initialize {@link MapLibreNavigation}.
+     */
+    void initializeNavigation(boolean shouldSimulateRoute) {
+        LocationEngine locationEngine = initializeLocationEngineFrom(shouldSimulateRoute);
+        initializeNavigation(locationEngine);
+    }
+
     /**
      * This method will pass {@link MapLibreNavigationOptions} from the {@link NavigationViewOptions}
      * to this view model to be used to initialize {@link MapLibreNavigation}.
@@ -149,9 +155,9 @@ void initialize(NavigationViewOptions options) {
         initializeLanguage(options);
         initializeTimeFormat(navigationOptions);
         initializeDistanceFormatter(options);
+        navigation.setOptions(navigationOptions);
         if (!isRunning()) {
-            LocationEngine locationEngine = initializeLocationEngineFrom(options);
-            initializeNavigation(getApplication(), navigationOptions, locationEngine);
+            addNavigationListeners();
             addMilestones(options);
             initializeNavigationSpeechPlayer(options);
         }
@@ -170,9 +176,8 @@ boolean isMuted() {
     }
 
     void stopNavigation() {
-        navigation.removeProgressChangeListener(null);
-        navigation.removeMilestoneEventListener(null);
-        navigation.stopNavigation();
+        navigation.onDestroy();
+        deactivateInstructionPlayer();
     }
 
     boolean isOffRoute() {
@@ -186,7 +191,7 @@ boolean isOffRoute() {
     void updateRoute(DirectionsRoute route) {
         this.route.setValue(route);
         if (!isChangingConfigurations) {
-            startNavigation(route);
+            startMapLibreNavigation(route);
             updateReplayEngine(route);
             sendEventOnRerouteAlong(route);
             isOffRoute.setValue(false);
@@ -198,7 +203,7 @@ void updateRouteProgress(RouteProgress routeProgress) {
         this.routeProgress = routeProgress;
         sendEventArrival(routeProgress, milestone);
         instructionModel.setValue(new InstructionModel(distanceFormatter, routeProgress));
-        summaryModel.setValue(new SummaryModel(getApplication(), distanceFormatter, routeProgress, timeFormatType));
+        summaryModel.setValue(new SummaryModel(context, distanceFormatter, routeProgress, timeFormatType));
     }
 
     void updateLocation(Location location) {
@@ -229,9 +234,8 @@ MutableLiveData<Boolean> retrieveShouldRecordScreenshot() {
     }
 
     private void initializeRouter() {
-        MapLibreRouteFetcher onlineRouter = new MapLibreRouteFetcher(getApplication());
-        Context applicationContext = getApplication().getApplicationContext();
-        ConnectivityStatusProvider connectivityStatus = new ConnectivityStatusProvider(applicationContext);
+        MapLibreRouteFetcher onlineRouter = new MapLibreRouteFetcher(context);
+        ConnectivityStatusProvider connectivityStatus = new ConnectivityStatusProvider(context);
         router = new NavigationViewRouter(onlineRouter, connectivityStatus, routeEngineListener);
     }
 
@@ -241,15 +245,15 @@ private void initializeLocationEngine() {
 
     private void initializeLanguage(NavigationUiOptions options) {
         RouteOptions routeOptions = options.directionsRoute().getRouteOptions();
-        language = localeUtils.inferDeviceLanguage(getApplication());
+        language = localeUtils.inferDeviceLanguage(context);
         if (routeOptions != null) {
-            language = routeOptions.getLanguage();
+            language = String.valueOf(routeOptions.getLanguage());
         }
     }
 
     private UnitType initializeUnitType(NavigationUiOptions options) {
         RouteOptions routeOptions = options.directionsRoute().getRouteOptions();
-        UnitType unitType = localeUtils.getUnitTypeForDeviceLocale(getApplication());
+        UnitType unitType = localeUtils.getUnitTypeForDeviceLocale(context);
         if (routeOptions != null && routeOptions.getVoiceUnits() != null) {
             unitType = routeOptions.getVoiceUnits();
         }
@@ -268,7 +272,7 @@ private MapLibreNavigationOptions.RoundingIncrement initializeRoundingIncrement(
     private void initializeDistanceFormatter(NavigationViewOptions options) {
         UnitType unitType = initializeUnitType(options);
         MapLibreNavigationOptions.RoundingIncrement roundingIncrement = initializeRoundingIncrement(options);
-        distanceFormatter = new DistanceFormatter(getApplication(), language, unitType, roundingIncrement);
+        distanceFormatter = new DistanceFormatter(context, language, unitType, roundingIncrement);
     }
 
     private void initializeNavigationSpeechPlayer(NavigationViewOptions options) {
@@ -284,19 +288,16 @@ private void initializeNavigationSpeechPlayer(NavigationViewOptions options) {
 
     @NonNull
     private SpeechPlayerProvider initializeSpeechPlayerProvider(boolean voiceLanguageSupported) {
-        return new SpeechPlayerProvider(getApplication(), language, voiceLanguageSupported);
+        return new SpeechPlayerProvider(context, language, voiceLanguageSupported);
     }
 
-    private LocationEngine initializeLocationEngineFrom(NavigationViewOptions options) {
-        LocationEngine locationEngine = options.locationEngine();
-        boolean shouldReplayRoute = options.shouldSimulateRoute();
-        locationEngineConductor.initializeLocationEngine(getApplication(), locationEngine, shouldReplayRoute);
+    private LocationEngine initializeLocationEngineFrom(boolean shouldSimulateRoute) {
+        locationEngineConductor.initializeLocationEngine(context, null, shouldSimulateRoute);
         return locationEngineConductor.obtainLocationEngine();
     }
 
-    private void initializeNavigation(Context context, MapLibreNavigationOptions options, LocationEngine locationEngine) {
-        navigation = new MapLibreNavigation(options, locationEngine);
-        addNavigationListeners();
+    private void initializeNavigation(LocationEngine locationEngine) {
+        navigation = new MapLibreNavigation(locationEngine);
     }
 
     private void addNavigationListeners() {
@@ -325,7 +326,9 @@ public void userOffRoute(Location location) {
 
     private MilestoneEventListener milestoneEventListener = (routeProgress, instruction, milestone) -> {
         NavigationViewModel.this.milestone = milestone;
-        playVoiceAnnouncement(milestone);
+        if (!isMuted) {
+            playVoiceAnnouncement(milestone);
+        }
         updateBannerInstruction(routeProgress, milestone);
         sendEventArrival(routeProgress, milestone);
     };
@@ -339,7 +342,7 @@ public void userOffRoute(Location location) {
 
     private ViewRouteListener routeEngineListener = new NavigationViewRouteEngineListener(this);
 
-    private void startNavigation(DirectionsRoute route) {
+    private void startMapLibreNavigation(DirectionsRoute route) {
         if (route != null) {
             navigation.startNavigation(route);
             voiceInstructionsToAnnounce = 0;
@@ -353,6 +356,10 @@ private void updateReplayEngine(DirectionsRoute route) {
         }
     }
 
+    void onCleared() {
+        destroyRouter();
+    }
+
     private void destroyRouter() {
         if (router != null) {
             router.onDestroy();
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/PreNavigationLocationEngine.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/PreNavigationLocationEngine.kt
new file mode 100644
index 000000000..b34fa1e92
--- /dev/null
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/PreNavigationLocationEngine.kt
@@ -0,0 +1,54 @@
+package org.maplibre.navigation.android.navigation.ui.v5
+
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import org.maplibre.android.location.LocationComponent
+import org.maplibre.navigation.core.location.Location
+import org.maplibre.navigation.core.location.LocationValidator
+import org.maplibre.navigation.core.location.engine.LocationEngine
+import org.maplibre.navigation.core.location.toAndroidLocation
+import org.maplibre.navigation.core.navigation.MapLibreNavigationOptions.Defaults
+import org.maplibre.navigation.core.navigation.engine.MapLibreNavigationEngine.Companion.LOCATION_ENGINE_INTERVAL
+
+class PreNavigationLocationEngine(
+    private val locationEngine: LocationEngine,
+    private val locationComponent: LocationComponent,
+    private val locationValidator: LocationValidator = LocationValidator(Defaults.LOCATION_ACCEPTABLE_ACCURACY_IN_METERS_THRESHOLD),//todo maybe provide accuracyThreshold through options
+    private val backgroundScope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    private val mainScope: CoroutineScope = CoroutineScope(Dispatchers.Main)
+) {
+
+    private var collectLocationJob: Job? = null
+
+    fun start() {
+        collectLocationJob?.cancel() // Cancel previous started run
+
+        collectLocationJob = backgroundScope.launch {
+            locationEngine.getLastLocation()?.let { processLocationUpdate(it) }
+
+            locationEngine.listenToLocation(
+                LocationEngine.Request(
+                    minIntervalMilliseconds = LOCATION_ENGINE_INTERVAL,
+                    maxIntervalMilliseconds = LOCATION_ENGINE_INTERVAL,
+                )
+            ).collect(::processLocationUpdate)
+        }
+    }
+
+    fun stop() {
+        collectLocationJob?.cancel()
+        collectLocationJob = null
+    }
+
+    private fun processLocationUpdate(rawLocation: Location) {
+        if (!locationValidator.isValidUpdate(rawLocation)) {
+            return
+        }
+        mainScope.launch {
+            locationComponent.forceLocationUpdate(rawLocation.toAndroidLocation())
+        }
+    }
+}
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RoutingService.kt b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RoutingService.kt
new file mode 100644
index 000000000..de68d6a1e
--- /dev/null
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RoutingService.kt
@@ -0,0 +1,7 @@
+package org.maplibre.navigation.android.navigation.ui.v5
+
+sealed class RoutingService(open val baseUrl: String, open val accessToken: String) {
+    class GraphHopper(override val baseUrl: String, override val accessToken: String) : RoutingService(baseUrl, accessToken)
+    class Mapbox(override val baseUrl: String, override val accessToken: String) : RoutingService(baseUrl, accessToken)
+    class Other(override val baseUrl: String, override val accessToken: String) : RoutingService(baseUrl, accessToken)
+}
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SoundButton.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SoundButton.java
index 670545816..a33e80058 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SoundButton.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SoundButton.java
@@ -71,7 +71,7 @@ public void hide() {
    */
   @Override
   public void show() {
-    setVisibility(VISIBLE);
+    setVisibility(GONE);
   }
 
   /**
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SummaryBottomSheetCallback.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SummaryBottomSheetCallback.java
deleted file mode 100644
index 4757a78c8..000000000
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SummaryBottomSheetCallback.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.maplibre.navigation.android.navigation.ui.v5;
-
-import androidx.annotation.NonNull;
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import android.view.View;
-
-class SummaryBottomSheetCallback extends BottomSheetBehavior.BottomSheetCallback {
-
-  private NavigationPresenter presenter;
-  private NavigationViewEventDispatcher dispatcher;
-
-  SummaryBottomSheetCallback(NavigationPresenter presenter, NavigationViewEventDispatcher dispatcher) {
-    this.presenter = presenter;
-    this.dispatcher = dispatcher;
-  }
-
-  @Override
-  public void onStateChanged(@NonNull View bottomSheet, int newState) {
-    dispatcher.onBottomSheetStateChanged(bottomSheet, newState);
-    presenter.onSummaryBottomSheetHidden();
-  }
-
-  @Override
-  public void onSlide(@NonNull View bottomSheet, float slideOffset) {
-    // No-op
-  }
-}
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java
index 3f8884010..b5474c8e5 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java
@@ -8,6 +8,7 @@
 import android.graphics.drawable.Drawable;
 import android.preference.PreferenceManager;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
 import androidx.appcompat.content.res.AppCompatResources;
 import android.util.AttributeSet;
@@ -84,7 +85,7 @@ public static int retrieveNavigationViewStyle(Context context, int styleResId) {
    * @param attrs   holding custom styles if any are set
    */
   static void setTheme(Context context, AttributeSet attrs) {
-    boolean nightModeEnabled = isNightModeEnabled(context);
+    boolean nightModeEnabled = isNightModeEnabled();
 
     if (shouldSetThemeFromPreferences(context)) {
       int prefLightTheme = retrieveThemeResIdFromPreferences(context, NavigationConstants.NAVIGATION_VIEW_LIGHT_THEME);
@@ -105,15 +106,20 @@ static void setTheme(Context context, AttributeSet attrs) {
     context.setTheme(nightModeEnabled ? darkTheme : lightTheme);
   }
 
+
   static String retrieveMapStyle(Context context) {
     TypedValue mapStyleAttr = resolveAttributeFromId(context, R.attr.navigationViewMapStyle);
     return mapStyleAttr.string.toString();
   }
 
+  private static boolean isNightModeEnabled() {
+    return AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES;
+  }
+
   /**
    * Returns true if the current UI_MODE_NIGHT is enabled, false otherwise.
    */
-  private static boolean isNightModeEnabled(Context context) {
+  private static boolean isDevicesNightModeEnabled(Context context) {
     int currentNightMode = retrieveCurrentUiMode(context);
     return currentNightMode == Configuration.UI_MODE_NIGHT_YES;
   }
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java
index 899bc9f3e..950a33e94 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java
@@ -25,8 +25,9 @@ public class DynamicCamera extends SimpleCamera {
 
   private static final double MAX_CAMERA_TILT = 60d;
   private static final double MIN_CAMERA_TILT = 45d;
+  private static final double CAMERA_TILT_ZERO = 0d;
   private static final double MAX_CAMERA_ZOOM = 16d;
-  private static final double MIN_CAMERA_ZOOM = 12d;
+  private static final double MIN_CAMERA_ZOOM = 14.5d;
 
   private MapLibreMap mapLibreMap;
   private LegStep currentStep;
@@ -42,16 +43,19 @@ public DynamicCamera(@NonNull MapLibreMap mapLibreMap) {
 
   @Override
   public double tilt(RouteInformation routeInformation) {
-    if (isShutdown) {
-      return DEFAULT_TILT;
-    }
-
-    RouteProgress progress = routeInformation.getRouteProgress();
-    if (progress != null) {
-      double distanceRemaining = progress.getCurrentLegProgress().getCurrentStepProgress().getDistanceRemaining();
-      return createTilt(distanceRemaining);
-    }
-    return super.tilt(routeInformation);
+    // 0 tilt to optimize map performance
+    return CAMERA_TILT_ZERO;
+
+//    if (isShutdown) {
+//      return DEFAULT_TILT;
+//    }
+//
+//    RouteProgress progress = routeInformation.getRouteProgress();
+//    if (progress != null) {
+//      double distanceRemaining = progress.getCurrentLegProgress().getCurrentStepProgress().getDistanceRemaining();
+//      return createTilt(distanceRemaining);
+//    }
+//    return super.tilt(routeInformation);
   }
 
   @Override
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java
index 2ee45d535..d3063b64b 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java
@@ -310,6 +310,10 @@ public void addProgressChangeListener(MapLibreNavigation navigation) {
     navigation.addProgressChangeListener(progressChangeListener);
   }
 
+  public void removeProgressChangeListener(MapLibreNavigation navigation) {
+    navigation.removeProgressChangeListener(progressChangeListener);
+  }
+
   /**
    * Adds given tracking mode transition listener for receiving notification of camera
    * transition updates.
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerInstructionModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerInstructionModel.java
index ddaa48e28..a17e2a7d0 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerInstructionModel.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerInstructionModel.java
@@ -4,6 +4,7 @@
 
 import org.maplibre.navigation.core.models.BannerInstructions;
 import org.maplibre.navigation.core.models.BannerText;
+import org.maplibre.navigation.core.models.ManeuverModifier;
 import org.maplibre.navigation.core.routeprogress.RouteProgress;
 import org.maplibre.navigation.android.navigation.ui.v5.utils.DistanceFormatter;
 
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
index 33b61a5b4..35efad36b 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java
@@ -33,31 +33,28 @@
 
 import org.maplibre.navigation.android.navigation.ui.v5.NavigationButton;
 import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewModel;
+import org.maplibre.navigation.android.navigation.ui.v5.R;
 import org.maplibre.navigation.android.navigation.ui.v5.SoundButton;
 import org.maplibre.navigation.android.navigation.ui.v5.ThemeSwitcher;
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.maneuver.ManeuverView;
 import org.maplibre.navigation.android.navigation.ui.v5.instruction.turnlane.TurnLaneAdapter;
 import org.maplibre.navigation.android.navigation.ui.v5.listeners.InstructionListListener;
-import org.maplibre.navigation.core.models.BannerComponents;
-import org.maplibre.navigation.core.models.BannerInstructions;
-import org.maplibre.navigation.core.models.BannerText;
-import org.maplibre.navigation.core.models.LegStep;
-
-import org.maplibre.navigation.android.navigation.ui.v5.R;
-
 import org.maplibre.navigation.android.navigation.ui.v5.summary.list.InstructionListAdapter;
+import org.maplibre.navigation.android.navigation.ui.v5.utils.DistanceFormatter;
+import org.maplibre.navigation.android.navigation.ui.v5.utils.LocaleUtils;
 import org.maplibre.navigation.core.milestone.BannerInstructionMilestone;
 import org.maplibre.navigation.core.milestone.Milestone;
 import org.maplibre.navigation.core.milestone.MilestoneEventListener;
+import org.maplibre.navigation.core.models.BannerComponents;
+import org.maplibre.navigation.core.models.BannerInstructions;
+import org.maplibre.navigation.core.models.BannerText;
+import org.maplibre.navigation.core.models.LegStep;
 import org.maplibre.navigation.core.models.UnitType;
 import org.maplibre.navigation.core.navigation.MapLibreNavigation;
 import org.maplibre.navigation.core.navigation.MapLibreNavigationOptions;
-import org.maplibre.navigation.core.navigation.NavigationConstants;
 import org.maplibre.navigation.core.offroute.OffRouteListener;
 import org.maplibre.navigation.core.routeprogress.ProgressChangeListener;
 import org.maplibre.navigation.core.routeprogress.RouteProgress;
-import org.maplibre.navigation.android.navigation.ui.v5.utils.DistanceFormatter;
-import org.maplibre.navigation.android.navigation.ui.v5.utils.LocaleUtils;
 
 import timber.log.Timber;
 
@@ -77,709 +74,710 @@
  */
 public class InstructionView extends RelativeLayout implements LifecycleObserver {
 
-  private static final String COMPONENT_TYPE_LANE = "lane";
-
-  private ManeuverView upcomingManeuverView;
-  private TextView upcomingDistanceText;
-  private TextView upcomingPrimaryText;
-  private TextView upcomingSecondaryText;
-  private ManeuverView subManeuverView;
-  private TextView subStepText;
-  private NavigationAlertView alertView;
-  private View rerouteLayout;
-  private View turnLaneLayout;
-  private View subStepLayout;
-  private RecyclerView rvTurnLanes;
-  private RecyclerView rvInstructions;
-  private TurnLaneAdapter turnLaneAdapter;
-  private ConstraintLayout instructionLayout;
-  private LinearLayout instructionLayoutText;
-  private View instructionListLayout;
-  private InstructionListAdapter instructionListAdapter;
-  private Animation rerouteSlideUpTop;
-  private Animation rerouteSlideDownTop;
-  private LegStep currentStep;
-  private NavigationViewModel navigationViewModel;
-  private InstructionListListener instructionListListener;
-
-  private DistanceFormatter distanceFormatter;
-  private boolean isRerouting;
-  private SoundButton soundButton;
-  private LifecycleOwner lifecycleOwner;
-
-  public InstructionView(Context context) {
-    this(context, null);
-  }
-
-  public InstructionView(Context context, @Nullable AttributeSet attrs) {
-    this(context, attrs, -1);
-  }
-
-  public InstructionView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-    initialize();
-  }
-
-  /**
-   * Adds a listener that is triggered when the instruction list in InstructionView is shown or hidden.
-   *
-   * @param instructionListListener to be set
-   */
-  public void setInstructionListListener(InstructionListListener instructionListListener) {
-    this.instructionListListener = instructionListListener;
-  }
-
-  /**
-   * Once this view has finished inflating, it will bind the views.
-   * <p>
-   * It will also initialize the {@link RecyclerView} used to display the turn lanes
-   * and animations used to show / hide views.
-   */
-  @Override
-  protected void onFinishInflate() {
-    super.onFinishInflate();
-    bind();
-    initializeBackground();
-    initializeTurnLaneRecyclerView();
-    initializeInstructionListRecyclerView();
-    initializeAnimations();
-    initializeStepListClickListener();
-    initializeButtons();
-    ImageCreator.getInstance().initialize(getContext());
-  }
-
-  @Override
-  protected void onDetachedFromWindow() {
-    super.onDetachedFromWindow();
-    cancelDelayedTransition();
-  }
-
-  /**
-   * Subscribes to a {@link NavigationViewModel} for
-   * updates from {@link androidx.lifecycle.LiveData}.
-   * <p>
-   * Updates all views with fresh data / shows &amp; hides re-route state.
-   *
-   * @param navigationViewModel to which this View is subscribing
-   * @since 0.6.2
-   */
-  public void subscribe(LifecycleOwner owner, NavigationViewModel navigationViewModel) {
-    lifecycleOwner = owner;
-    lifecycleOwner.getLifecycle().addObserver(this);
-    this.navigationViewModel = navigationViewModel;
-
-    navigationViewModel.instructionModel.observe(lifecycleOwner, new Observer<InstructionModel>() {
-      @Override
-      public void onChanged(@Nullable InstructionModel model) {
-        if (model != null) {
-          updateDataFromInstruction(model);
+    private static final String COMPONENT_TYPE_LANE = "lane";
+
+    private ManeuverView upcomingManeuverView;
+    private TextView upcomingDistanceText;
+    private TextView upcomingPrimaryText;
+    private TextView upcomingSecondaryText;
+    private ManeuverView subManeuverView;
+    private TextView subStepText;
+    private NavigationAlertView alertView;
+    private View rerouteLayout;
+    private View turnLaneLayout;
+    private View subStepLayout;
+    private RecyclerView rvTurnLanes;
+    private RecyclerView rvInstructions;
+    private TurnLaneAdapter turnLaneAdapter;
+    private ConstraintLayout instructionLayout;
+    private LinearLayout instructionLayoutText;
+    private View instructionListLayout;
+    private InstructionListAdapter instructionListAdapter;
+    private Animation rerouteSlideUpTop;
+    private Animation rerouteSlideDownTop;
+    private LegStep currentStep;
+    private NavigationViewModel navigationViewModel;
+    private InstructionListListener instructionListListener;
+
+    private DistanceFormatter distanceFormatter;
+    private boolean isRerouting;
+    private SoundButton soundButton;
+    private LifecycleOwner lifecycleOwner;
+
+    public InstructionView(Context context) {
+        this(context, null);
+    }
+
+    public InstructionView(Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, -1);
+    }
+
+    public InstructionView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initialize();
+    }
+
+    /**
+     * Adds a listener that is triggered when the instruction list in InstructionView is shown or hidden.
+     *
+     * @param instructionListListener to be set
+     */
+    public void setInstructionListListener(InstructionListListener instructionListListener) {
+        this.instructionListListener = instructionListListener;
+    }
+
+    /**
+     * Once this view has finished inflating, it will bind the views.
+     * <p>
+     * It will also initialize the {@link RecyclerView} used to display the turn lanes
+     * and animations used to show / hide views.
+     */
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        bind();
+        initializeBackground();
+        initializeTurnLaneRecyclerView();
+        initializeInstructionListRecyclerView();
+        initializeAnimations();
+        initializeStepListClickListener();
+        initializeButtons();
+        ImageCreator.getInstance().initialize(getContext());
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        cancelDelayedTransition();
+    }
+
+    /**
+     * Subscribes to a {@link NavigationViewModel} for
+     * updates from {@link androidx.lifecycle.LiveData}.
+     * <p>
+     * Updates all views with fresh data / shows &amp; hides re-route state.
+     *
+     * @param navigationViewModel to which this View is subscribing
+     * @since 0.6.2
+     */
+    public void subscribe(LifecycleOwner owner, NavigationViewModel navigationViewModel) {
+        lifecycleOwner = owner;
+        lifecycleOwner.getLifecycle().addObserver(this);
+        this.navigationViewModel = navigationViewModel;
+
+        navigationViewModel.instructionModel.observe(lifecycleOwner, new Observer<InstructionModel>() {
+            @Override
+            public void onChanged(@Nullable InstructionModel model) {
+                if (model != null) {
+                    updateDataFromInstruction(model);
+                }
+            }
+        });
+        navigationViewModel.bannerInstructionModel.observe(lifecycleOwner, new Observer<BannerInstructionModel>() {
+            @Override
+            public void onChanged(@Nullable BannerInstructionModel model) {
+                if (model != null) {
+                    updateManeuverView(model.retrievePrimaryManeuverType(), model.retrievePrimaryManeuverModifier(),
+                            model.retrievePrimaryRoundaboutAngle(), model.retrieveDrivingSide());
+                    updateDataFromBannerText(model.retrievePrimaryBannerText(), model.retrieveSecondaryBannerText());
+                    updateSubStep(model.retrieveSubBannerText(), model.retrievePrimaryManeuverType());
+                }
+            }
+        });
+        navigationViewModel.isOffRoute.observe(lifecycleOwner, new Observer<Boolean>() {
+            @Override
+            public void onChanged(@Nullable Boolean isOffRoute) {
+                if (isOffRoute != null) {
+                    if (isOffRoute) {
+                        showRerouteState();
+                    } else if (isRerouting) {
+                        hideRerouteState();
+//            alertView.showReportProblem();
+                    }
+                    isRerouting = isOffRoute;
+                }
+            }
+        });
+        subscribeAlertView();
+        initializeButtonListeners();
+        showButtons();
+    }
+
+    /**
+     * Unsubscribes {@link NavigationViewModel} {@link androidx.lifecycle.LiveData} objects
+     * previously added in {@link InstructionView#subscribe(LifecycleOwner, NavigationViewModel)}
+     * by removing the observers of the {@link LifecycleOwner} when parent view is destroyed
+     */
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    public void unsubscribe() {
+        if (navigationViewModel != null) {
+            navigationViewModel.instructionModel.removeObservers(lifecycleOwner);
+            navigationViewModel.bannerInstructionModel.removeObservers(lifecycleOwner);
+            navigationViewModel.isOffRoute.removeObservers(lifecycleOwner);
         }
-      }
-    });
-    navigationViewModel.bannerInstructionModel.observe(lifecycleOwner, new Observer<BannerInstructionModel>() {
-      @Override
-      public void onChanged(@Nullable BannerInstructionModel model) {
-        if (model != null) {
-          updateManeuverView(model.retrievePrimaryManeuverType(), model.retrievePrimaryManeuverModifier(),
-            model.retrievePrimaryRoundaboutAngle(), model.retrieveDrivingSide());
-          updateDataFromBannerText(model.retrievePrimaryBannerText(), model.retrieveSecondaryBannerText());
-          updateSubStep(model.retrieveSubBannerText(), model.retrievePrimaryManeuverType());
+    }
+
+    /**
+     * Use this method inside a {@link ProgressChangeListener} to update this view with all other information
+     * that is not updated by the {@link InstructionView#updateBannerInstructionsWith(Milestone)}.
+     * <p>
+     * This includes the distance remaining, instruction list, turn lanes, and next step information.
+     *
+     * @param routeProgress for route data used to populate the views
+     * @since 0.20.0
+     */
+    public void updateDistanceWith(RouteProgress routeProgress) {
+        if (routeProgress != null && !isRerouting) {
+            InstructionModel model = new InstructionModel(distanceFormatter, routeProgress);
+            updateDataFromInstruction(model);
         }
-      }
-    });
-    navigationViewModel.isOffRoute.observe(lifecycleOwner, new Observer<Boolean>() {
-      @Override
-      public void onChanged(@Nullable Boolean isOffRoute) {
-        if (isOffRoute != null) {
-          if (isOffRoute) {
-            showRerouteState();
-          } else if (isRerouting) {
-            hideRerouteState();
-            alertView.showReportProblem();
-          }
-          isRerouting = isOffRoute;
+    }
+
+    /**
+     * Use this in a {@link MilestoneEventListener} to update
+     * this view with new banner instructions.
+     * <p>
+     * This method will look at the type of milestone to determine when
+     * it should update.
+     *
+     * @param milestone for retrieving the new BannerInstructions
+     * @since 0.20.0
+     */
+    public void updateBannerInstructionsWith(Milestone milestone) {
+        if (milestone instanceof BannerInstructionMilestone) {
+            BannerInstructions instructions = ((BannerInstructionMilestone) milestone).getBannerInstructions();
+            if (instructions == null || instructions.getPrimary() == null) {
+                return;
+            }
+            BannerText primary = instructions.getPrimary();
+            String primaryManeuverModifier = primary.getModifier().getText();
+            String drivingSide = currentStep.getDrivingSide();
+            updateManeuverView(primary.getType().getText(), primaryManeuverModifier, primary.getDegrees(), drivingSide);
+            updateDataFromBannerText(primary, instructions.getSecondary());
+            updateSubStep(instructions.getSub(), primaryManeuverModifier);
+        }
+    }
+
+
+    /**
+     * Will slide the reroute view down from the top of the screen
+     * and make it visible
+     *
+     * @since 0.6.0
+     */
+    public void showRerouteState() {
+        if (rerouteLayout.getVisibility() == INVISIBLE) {
+            rerouteLayout.startAnimation(rerouteSlideDownTop);
+            rerouteLayout.setVisibility(VISIBLE);
         }
-      }
-    });
-    subscribeAlertView();
-    initializeButtonListeners();
-    showButtons();
-  }
-
-  /**
-   * Unsubscribes {@link NavigationViewModel} {@link androidx.lifecycle.LiveData} objects
-   * previously added in {@link InstructionView#subscribe(LifecycleOwner, NavigationViewModel)}
-   * by removing the observers of the {@link LifecycleOwner} when parent view is destroyed
-   */
-  @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-  public void unsubscribe() {
-    if (navigationViewModel != null) {
-      navigationViewModel.instructionModel.removeObservers(lifecycleOwner);
-      navigationViewModel.bannerInstructionModel.removeObservers(lifecycleOwner);
-      navigationViewModel.isOffRoute.removeObservers(lifecycleOwner);
-    }
-  }
-
-  /**
-   * Use this method inside a {@link ProgressChangeListener} to update this view with all other information
-   * that is not updated by the {@link InstructionView#updateBannerInstructionsWith(Milestone)}.
-   * <p>
-   * This includes the distance remaining, instruction list, turn lanes, and next step information.
-   *
-   * @param routeProgress for route data used to populate the views
-   * @since 0.20.0
-   */
-  public void updateDistanceWith(RouteProgress routeProgress) {
-    if (routeProgress != null && !isRerouting) {
-      InstructionModel model = new InstructionModel(distanceFormatter, routeProgress);
-      updateDataFromInstruction(model);
-    }
-  }
-
-  /**
-   * Use this in a {@link MilestoneEventListener} to update
-   * this view with new banner instructions.
-   * <p>
-   * This method will look at the type of milestone to determine when
-   * it should update.
-   *
-   * @param milestone for retrieving the new BannerInstructions
-   * @since 0.20.0
-   */
-  public void updateBannerInstructionsWith(Milestone milestone) {
-    if (milestone instanceof BannerInstructionMilestone) {
-      BannerInstructions instructions = ((BannerInstructionMilestone) milestone).getBannerInstructions();
-      if (instructions == null || instructions.getPrimary() == null) {
-        return;
-      }
-      BannerText primary = instructions.getPrimary();
-      String primaryManeuverModifier = primary.getModifier().getText();
-      String drivingSide = currentStep.getDrivingSide();
-      updateManeuverView(primary.getType().getText(), primaryManeuverModifier, primary.getDegrees(), drivingSide);
-      updateDataFromBannerText(primary, instructions.getSecondary());
-      updateSubStep(instructions.getSub(), primaryManeuverModifier);
-    }
-  }
-
-
-  /**
-   * Will slide the reroute view down from the top of the screen
-   * and make it visible
-   *
-   * @since 0.6.0
-   */
-  public void showRerouteState() {
-    if (rerouteLayout.getVisibility() == INVISIBLE) {
-      rerouteLayout.startAnimation(rerouteSlideDownTop);
-      rerouteLayout.setVisibility(VISIBLE);
-    }
-  }
-
-  /**
-   * Will slide the reroute view up to the top of the screen
-   * and hide it
-   *
-   * @since 0.6.0
-   */
-  public void hideRerouteState() {
-    if (rerouteLayout.getVisibility() == VISIBLE) {
-      rerouteLayout.startAnimation(rerouteSlideUpTop);
-      rerouteLayout.setVisibility(INVISIBLE);
-    }
-  }
-
-  /**
-   * Can be used to determine the visibility of the instruction list.
-   *
-   * @return true if instruction list is visible, false is not
-   */
-  public boolean isShowingInstructionList() {
-    return instructionListLayout.getVisibility() == VISIBLE;
-  }
-
-  /**
-   * Hide the instruction list.
-   * <p>
-   * This is based on orientation so the different layouts (for portrait vs. landscape)
-   * can be animated appropriately.
-   */
-  public void hideInstructionList() {
-    rvInstructions.stopScroll();
-    beginDelayedTransition();
-    if (isLandscape()) {
-      updateLandscapeConstraintsTo(R.layout.instruction_layout);
-    }
-    instructionListLayout.setVisibility(GONE);
-    onInstructionListVisibilityChanged(false);
-  }
-
-  private boolean isLandscape() {
-    return getContext().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
-  }
-
-  /**
-   * Show the instruction list.
-   * <p>
-   * This is based on orientation so the different layouts (for portrait vs. landscape)
-   * can be animated appropriately.
-   */
-  public void showInstructionList() {
-    onInstructionListVisibilityChanged(true);
-    instructionLayout.requestFocus();
-    beginDelayedListTransition();
-    if (isLandscape()) {
-      updateLandscapeConstraintsTo(R.layout.instruction_layout_alt);
-    }
-    instructionListLayout.setVisibility(VISIBLE);
-  }
-
-  public boolean handleBackPressed() {
-    if (isShowingInstructionList()) {
-      hideInstructionList();
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * Sets the distance formatter
-   *
-   * @param distanceFormatter to set
-   */
-  public void setDistanceFormatter(DistanceFormatter distanceFormatter) {
-    if (distanceFormatter != null && !distanceFormatter.equals(this.distanceFormatter)) {
-      this.distanceFormatter = distanceFormatter;
-      instructionListAdapter.updateDistanceFormatter(distanceFormatter);
-    }
-  }
-
-  /**
-   * Gets the sound button which is used for muting/unmuting, for uses such as adding listeners and
-   * hiding the button.
-   *
-   * @return sound button with {@link NavigationButton} API
-   */
-  public NavigationButton retrieveSoundButton() {
-    return soundButton;
-  }
-
-  /**
-   * Returns the {@link NavigationAlertView} that is shown during off-route events with
-   * "Report a Problem" text.
-   *
-   * @return alert view that is used in the instruction view
-   */
-  public NavigationAlertView retrieveAlertView() {
-    return alertView;
-  }
-
-  /**
-   * Inflates this layout needed for this view and initializes the locale as the device locale.
-   */
-  private void initialize() {
-    LocaleUtils localeUtils = new LocaleUtils();
-    String language = localeUtils.inferDeviceLanguage(getContext());
-    UnitType unitType = localeUtils.getUnitTypeForDeviceLocale(getContext());
-    distanceFormatter = new DistanceFormatter(getContext(), language, unitType, MapLibreNavigationOptions.RoundingIncrement.ROUNDING_INCREMENT_FIFTY);
-    inflate(getContext(), R.layout.instruction_view_layout, this);
-  }
-
-  /**
-   * Finds and binds all necessary views
-   */
-  private void bind() {
-    upcomingManeuverView = findViewById(R.id.maneuverView);
-    upcomingDistanceText = findViewById(R.id.stepDistanceText);
-    upcomingPrimaryText = findViewById(R.id.stepPrimaryText);
-    upcomingSecondaryText = findViewById(R.id.stepSecondaryText);
-    subManeuverView = findViewById(R.id.subManeuverView);
-    subStepText = findViewById(R.id.subStepText);
-    alertView = findViewById(R.id.alertView);
-    rerouteLayout = findViewById(R.id.rerouteLayout);
-    turnLaneLayout = findViewById(R.id.turnLaneLayout);
-    subStepLayout = findViewById(R.id.subStepLayout);
-    rvTurnLanes = findViewById(R.id.rvTurnLanes);
-    instructionLayout = findViewById(R.id.instructionLayout);
-    instructionLayoutText = findViewById(R.id.instructionLayoutText);
-    instructionListLayout = findViewById(R.id.instructionListLayout);
-    rvInstructions = findViewById(R.id.rvInstructions);
-    soundButton = findViewById(R.id.soundLayout);
-  }
-
-  /**
-   * For API 21 and lower, manually set the drawable tint based on the colors
-   * set in the given navigation theme (light or dark).
-   */
-  private void initializeBackground() {
-    if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
-      int navigationViewBannerBackgroundColor = ThemeSwitcher.retrieveThemeColor(getContext(),
-        R.attr.navigationViewBannerBackground);
-      int navigationViewListBackgroundColor = ThemeSwitcher.retrieveThemeColor(getContext(),
-        R.attr.navigationViewListBackground);
-      // Instruction Layout landscape - banner background
-      if (isLandscape()) {
-        View instructionLayoutManeuver = findViewById(R.id.instructionManeuverLayout);
-        Drawable maneuverBackground = DrawableCompat.wrap(instructionLayoutManeuver.getBackground()).mutate();
-        DrawableCompat.setTint(maneuverBackground, navigationViewBannerBackgroundColor);
-
-        View subStepLayout = findViewById(R.id.subStepLayout);
-        Drawable subStepBackground = DrawableCompat.wrap(subStepLayout.getBackground()).mutate();
-        DrawableCompat.setTint(subStepBackground, navigationViewListBackgroundColor);
-
-        View turnLaneLayout = findViewById(R.id.turnLaneLayout);
-        Drawable turnLaneBackground = DrawableCompat.wrap(turnLaneLayout.getBackground()).mutate();
-        DrawableCompat.setTint(turnLaneBackground, navigationViewListBackgroundColor);
-      }
-    }
-  }
-
-  /**
-   * Sets up the {@link RecyclerView} that is used to display the turn lanes.
-   */
-  private void initializeTurnLaneRecyclerView() {
-    turnLaneAdapter = new TurnLaneAdapter();
-    rvTurnLanes.setAdapter(turnLaneAdapter);
-    rvTurnLanes.setHasFixedSize(true);
-    rvTurnLanes.setLayoutManager(new LinearLayoutManager(getContext(),
-      LinearLayoutManager.HORIZONTAL, false));
-  }
-
-  /**
-   * Sets up the {@link RecyclerView} that is used to display the list of instructions.
-   */
-  private void initializeInstructionListRecyclerView() {
-    instructionListAdapter = new InstructionListAdapter(distanceFormatter);
-    rvInstructions.setAdapter(instructionListAdapter);
-    rvInstructions.setHasFixedSize(true);
-    rvInstructions.setLayoutManager(new LinearLayoutManager(getContext()));
-  }
-
-  /**
-   * Initializes all animations needed to show / hide views.
-   */
-  private void initializeAnimations() {
-    Context context = getContext();
-    rerouteSlideDownTop = AnimationUtils.loadAnimation(context, R.anim.slide_down_top);
-    rerouteSlideUpTop = AnimationUtils.loadAnimation(context, R.anim.slide_up_top);
-  }
-
-  private void onInstructionListVisibilityChanged(boolean visible) {
-    if (instructionListListener != null) {
-      instructionListListener.onInstructionListVisibilityChanged(visible);
-    }
-  }
-
-  private void subscribeAlertView() {
-    alertView.subscribe(navigationViewModel);
-  }
-
-  private void initializeButtonListeners() {
-    soundButton.addOnClickListener(new OnClickListener() {
-      @Override
-      public void onClick(View view) {
-        navigationViewModel.setMuted(soundButton.toggleMute());
-      }
-    });
-  }
-
-  private void showButtons() {
-    soundButton.show();
-  }
-
-  private void initializeStepListClickListener() {
-    if (isLandscape()) {
-      initializeLandscapeListListener();
-    } else {
-      initializePortraitListListener();
-    }
-  }
-
-  private void initializeButtons() {
-    soundButton.hide();
-  }
-
-  /**
-   * For portrait orientation, attach the listener to the whole layout
-   * and use custom animations to hide and show the instructions /sound layout
-   */
-  private void initializePortraitListListener() {
-    instructionLayout.setOnClickListener(new OnClickListener() {
-      @Override
-      public void onClick(View instructionView) {
-        boolean instructionsVisible = instructionListLayout.getVisibility() == VISIBLE;
-        if (!instructionsVisible) {
-          showInstructionList();
+    }
+
+    /**
+     * Will slide the reroute view up to the top of the screen
+     * and hide it
+     *
+     * @since 0.6.0
+     */
+    public void hideRerouteState() {
+        if (rerouteLayout.getVisibility() == VISIBLE) {
+            rerouteLayout.startAnimation(rerouteSlideUpTop);
+            rerouteLayout.setVisibility(INVISIBLE);
+        }
+    }
+
+    /**
+     * Can be used to determine the visibility of the instruction list.
+     *
+     * @return true if instruction list is visible, false is not
+     */
+    public boolean isShowingInstructionList() {
+        return instructionListLayout.getVisibility() == VISIBLE;
+    }
+
+    /**
+     * Hide the instruction list.
+     * <p>
+     * This is based on orientation so the different layouts (for portrait vs. landscape)
+     * can be animated appropriately.
+     */
+    public void hideInstructionList() {
+        rvInstructions.stopScroll();
+        beginDelayedTransition();
+        if (isLandscape()) {
+            updateLandscapeConstraintsTo(R.layout.instruction_layout);
+        }
+        instructionListLayout.setVisibility(GONE);
+        onInstructionListVisibilityChanged(false);
+    }
+
+    private boolean isLandscape() {
+        return getContext().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
+    }
+
+    /**
+     * Show the instruction list.
+     * <p>
+     * This is based on orientation so the different layouts (for portrait vs. landscape)
+     * can be animated appropriately.
+     */
+    public void showInstructionList() {
+        onInstructionListVisibilityChanged(true);
+        instructionLayout.requestFocus();
+        beginDelayedListTransition();
+        if (isLandscape()) {
+            updateLandscapeConstraintsTo(R.layout.instruction_layout_alt);
+        }
+        instructionListLayout.setVisibility(VISIBLE);
+    }
+
+    public boolean handleBackPressed() {
+        if (isShowingInstructionList()) {
+            hideInstructionList();
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Sets the distance formatter
+     *
+     * @param distanceFormatter to set
+     */
+    public void setDistanceFormatter(DistanceFormatter distanceFormatter) {
+        if (distanceFormatter != null && !distanceFormatter.equals(this.distanceFormatter)) {
+            this.distanceFormatter = distanceFormatter;
+            instructionListAdapter.updateDistanceFormatter(distanceFormatter);
+        }
+    }
+
+    /**
+     * Gets the sound button which is used for muting/unmuting, for uses such as adding listeners and
+     * hiding the button.
+     *
+     * @return sound button with {@link NavigationButton} API
+     */
+    public NavigationButton retrieveSoundButton() {
+        return soundButton;
+    }
+
+    /**
+     * Returns the {@link NavigationAlertView} that is shown during off-route events with
+     * "Report a Problem" text.
+     *
+     * @return alert view that is used in the instruction view
+     */
+    public NavigationAlertView retrieveAlertView() {
+        return alertView;
+    }
+
+    /**
+     * Inflates this layout needed for this view and initializes the locale as the device locale.
+     */
+    private void initialize() {
+        LocaleUtils localeUtils = new LocaleUtils();
+        String language = localeUtils.inferDeviceLanguage(getContext());
+        UnitType unitType = localeUtils.getUnitTypeForDeviceLocale(getContext());
+        distanceFormatter = new DistanceFormatter(getContext(), language, unitType, MapLibreNavigationOptions.RoundingIncrement.ROUNDING_INCREMENT_FIFTY);
+        inflate(getContext(), R.layout.instruction_view_layout, this);
+    }
+
+    /**
+     * Finds and binds all necessary views
+     */
+    private void bind() {
+        upcomingManeuverView = findViewById(R.id.maneuverView);
+        upcomingDistanceText = findViewById(R.id.stepDistanceText);
+        upcomingPrimaryText = findViewById(R.id.stepPrimaryText);
+        upcomingSecondaryText = findViewById(R.id.stepSecondaryText);
+        subManeuverView = findViewById(R.id.subManeuverView);
+        subStepText = findViewById(R.id.subStepText);
+        alertView = findViewById(R.id.alertView);
+        rerouteLayout = findViewById(R.id.rerouteLayout);
+        turnLaneLayout = findViewById(R.id.turnLaneLayout);
+        subStepLayout = findViewById(R.id.subStepLayout);
+        rvTurnLanes = findViewById(R.id.rvTurnLanes);
+        instructionLayout = findViewById(R.id.instructionLayout);
+        instructionLayoutText = findViewById(R.id.instructionLayoutText);
+        instructionListLayout = findViewById(R.id.instructionListLayout);
+        rvInstructions = findViewById(R.id.rvInstructions);
+        soundButton = findViewById(R.id.soundLayout);
+    }
+
+    /**
+     * For API 21 and lower, manually set the drawable tint based on the colors
+     * set in the given navigation theme (light or dark).
+     */
+    private void initializeBackground() {
+        if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
+            int navigationViewBannerBackgroundColor = ThemeSwitcher.retrieveThemeColor(getContext(),
+                    R.attr.navigationViewBannerBackground);
+            int navigationViewListBackgroundColor = ThemeSwitcher.retrieveThemeColor(getContext(),
+                    R.attr.navigationViewListBackground);
+            // Instruction Layout landscape - banner background
+            if (isLandscape()) {
+                View instructionLayoutManeuver = findViewById(R.id.instructionManeuverLayout);
+                Drawable maneuverBackground = DrawableCompat.wrap(instructionLayoutManeuver.getBackground()).mutate();
+                DrawableCompat.setTint(maneuverBackground, navigationViewBannerBackgroundColor);
+
+                View subStepLayout = findViewById(R.id.subStepLayout);
+                Drawable subStepBackground = DrawableCompat.wrap(subStepLayout.getBackground()).mutate();
+                DrawableCompat.setTint(subStepBackground, navigationViewListBackgroundColor);
+
+                View turnLaneLayout = findViewById(R.id.turnLaneLayout);
+                Drawable turnLaneBackground = DrawableCompat.wrap(turnLaneLayout.getBackground()).mutate();
+                DrawableCompat.setTint(turnLaneBackground, navigationViewListBackgroundColor);
+            }
+        }
+    }
+
+    /**
+     * Sets up the {@link RecyclerView} that is used to display the turn lanes.
+     */
+    private void initializeTurnLaneRecyclerView() {
+        turnLaneAdapter = new TurnLaneAdapter();
+        rvTurnLanes.setAdapter(turnLaneAdapter);
+        rvTurnLanes.setHasFixedSize(true);
+        rvTurnLanes.setLayoutManager(new LinearLayoutManager(getContext(),
+                LinearLayoutManager.HORIZONTAL, false));
+    }
+
+    /**
+     * Sets up the {@link RecyclerView} that is used to display the list of instructions.
+     */
+    private void initializeInstructionListRecyclerView() {
+        instructionListAdapter = new InstructionListAdapter(distanceFormatter);
+        rvInstructions.setAdapter(instructionListAdapter);
+        rvInstructions.setHasFixedSize(true);
+        rvInstructions.setLayoutManager(new LinearLayoutManager(getContext()));
+    }
+
+    /**
+     * Initializes all animations needed to show / hide views.
+     */
+    private void initializeAnimations() {
+        Context context = getContext();
+        rerouteSlideDownTop = AnimationUtils.loadAnimation(context, R.anim.slide_down_top);
+        rerouteSlideUpTop = AnimationUtils.loadAnimation(context, R.anim.slide_up_top);
+    }
+
+    private void onInstructionListVisibilityChanged(boolean visible) {
+        if (instructionListListener != null) {
+            instructionListListener.onInstructionListVisibilityChanged(visible);
+        }
+    }
+
+    private void subscribeAlertView() {
+        alertView.subscribe(navigationViewModel);
+    }
+
+    private void initializeButtonListeners() {
+        soundButton.addOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                navigationViewModel.setMuted(soundButton.toggleMute());
+            }
+        });
+    }
+
+    private void showButtons() {
+        soundButton.show();
+    }
+
+    private void initializeStepListClickListener() {
+        if (isLandscape()) {
+            initializeLandscapeListListener();
         } else {
-          hideInstructionList();
+            initializePortraitListListener();
         }
-      }
-    });
-  }
-
-  /**
-   * For landscape orientation, the click listener is attached to
-   * the instruction text layout and the constraints are adjusted before animating
-   */
-  private void initializeLandscapeListListener() {
-    instructionLayoutText.setOnClickListener(new OnClickListener() {
-      @Override
-      public void onClick(View instructionLayoutText) {
-        boolean instructionsVisible = instructionListLayout.getVisibility() == VISIBLE;
-        if (!instructionsVisible) {
-          showInstructionList();
+    }
+
+    private void initializeButtons() {
+        soundButton.hide();
+    }
+
+    /**
+     * For portrait orientation, attach the listener to the whole layout
+     * and use custom animations to hide and show the instructions /sound layout
+     */
+    private void initializePortraitListListener() {
+//    instructionLayout.setOnClickListener(new OnClickListener() {
+//      @Override
+//      public void onClick(View instructionView) {
+//        boolean instructionsVisible = instructionListLayout.getVisibility() == VISIBLE;
+//        if (!instructionsVisible) {
+//          showInstructionList();
+//        } else {
+//          hideInstructionList();
+//        }
+//      }
+//    });
+    }
+
+    /**
+     * For landscape orientation, the click listener is attached to
+     * the instruction text layout and the constraints are adjusted before animating
+     */
+    private void initializeLandscapeListListener() {
+        instructionLayoutText.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View instructionLayoutText) {
+                boolean instructionsVisible = instructionListLayout.getVisibility() == VISIBLE;
+                if (!instructionsVisible) {
+                    showInstructionList();
+                } else {
+                    hideInstructionList();
+                }
+            }
+        });
+    }
+
+    /**
+     * Looks to see if we have a new distance text.
+     *
+     * @param model provides distance text
+     */
+    private boolean newDistanceText(InstructionModel model) {
+        return !upcomingDistanceText.getText().toString().isEmpty()
+                && !TextUtils.isEmpty(model.retrieveStepDistanceRemaining())
+                && !upcomingDistanceText.getText().toString()
+                .contentEquals(model.retrieveStepDistanceRemaining().toString());
+    }
+
+    /**
+     * Sets current distance text.
+     *
+     * @param model provides distance text
+     */
+    private void distanceText(InstructionModel model) {
+        upcomingDistanceText.setText(model.retrieveStepDistanceRemaining());
+    }
+
+    private InstructionLoader createInstructionLoader(TextView textView, BannerText
+            bannerText) {
+        if (hasComponents(bannerText)) {
+            return new InstructionLoader(textView, bannerText);
         } else {
-          hideInstructionList();
+            return null;
+        }
+    }
+
+    private boolean hasComponents(BannerText bannerText) {
+        return bannerText != null && bannerText.getComponents() != null && !bannerText.getComponents().isEmpty();
+    }
+
+    /**
+     * Looks to see if we have a new step.
+     *
+     * @param routeProgress provides updated step information
+     * @return true if new step, false if not
+     */
+    private boolean newStep(RouteProgress routeProgress) {
+        boolean newStep = currentStep == null || !currentStep.equals(routeProgress.getCurrentLegProgress().getCurrentStep());
+        currentStep = routeProgress.getCurrentLegProgress().getCurrentStep();
+        return newStep;
+    }
+
+    private void updateSubStep(BannerText subText, String primaryManeuverModifier) {
+        if (shouldShowSubStep(subText)) {
+            String maneuverType = subText.getType().getText();
+            String maneuverModifier = subText.getModifier() == null ? null : subText.getModifier().getText();
+            subManeuverView.setManeuverTypeAndModifier(maneuverType, maneuverModifier);
+            Double roundaboutAngle = subText.getDegrees();
+            if (roundaboutAngle != null) {
+                subManeuverView.setRoundaboutAngle(roundaboutAngle.floatValue());
+            }
+            String drivingSide = currentStep.getDrivingSide();
+            subManeuverView.setDrivingSide(drivingSide);
+            InstructionLoader instructionLoader = createInstructionLoader(subStepText, subText);
+            if (instructionLoader != null) {
+                instructionLoader.loadInstruction();
+            }
+            showSubLayout();
+            return;
+        } else {
+            hideSubLayout();
+        }
+
+        if (shouldShowTurnLanes(subText, primaryManeuverModifier)) {
+            turnLaneAdapter.addTurnLanes(subText.getComponents(), primaryManeuverModifier);
+            showTurnLanes();
+        } else {
+            hideTurnLanes();
+        }
+    }
+
+    private boolean shouldShowSubStep(@Nullable BannerText subText) {
+        return subText != null
+                && subText.getType() != null
+                && !subText.getType().getText().contains(COMPONENT_TYPE_LANE);
+    }
+
+    private void showSubLayout() {
+        if (!(subStepLayout.getVisibility() == VISIBLE)) {
+            beginDelayedTransition();
+            subStepLayout.setVisibility(VISIBLE);
+        }
+    }
+
+    private void hideSubLayout() {
+        if (subStepLayout.getVisibility() == VISIBLE) {
+            beginDelayedTransition();
+            subStepLayout.setVisibility(GONE);
+        }
+    }
+
+    private boolean shouldShowTurnLanes(BannerText subText, String maneuverModifier) {
+        if (!hasComponents(subText) || TextUtils.isEmpty(maneuverModifier)) {
+            return false;
+        }
+        for (BannerComponents components : subText.getComponents()) {
+            if (components.getType().equals(COMPONENT_TYPE_LANE)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void showTurnLanes() {
+        if (turnLaneLayout.getVisibility() == GONE) {
+            beginDelayedTransition();
+            turnLaneLayout.setVisibility(VISIBLE);
+        }
+    }
+
+    private void hideTurnLanes() {
+        if (turnLaneLayout.getVisibility() == VISIBLE) {
+            beginDelayedTransition();
+            turnLaneLayout.setVisibility(GONE);
+        }
+    }
+
+    @Nullable
+    private FragmentManager obtainSupportFragmentManager() {
+        try {
+            return ((FragmentActivity) getContext()).getSupportFragmentManager();
+        } catch (ClassCastException exception) {
+            Timber.e(exception);
+            return null;
+        }
+    }
+
+    /**
+     * Adjust the banner text layout {@link ConstraintLayout} vertical bias.
+     *
+     * @param percentBias to be set to the text layout
+     */
+    private void adjustBannerTextVerticalBias(float percentBias) {
+        if (!isLandscape()) {
+            ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) instructionLayoutText.getLayoutParams();
+            params.verticalBias = percentBias;
+            instructionLayoutText.setLayoutParams(params);
+        }
+    }
+
+    private void beginDelayedTransition() {
+        TransitionManager.beginDelayedTransition(this);
+    }
+
+    private void beginDelayedListTransition() {
+        AutoTransition transition = new AutoTransition();
+        transition.addListener(new InstructionListTransitionListener(rvInstructions, instructionListAdapter));
+        TransitionManager.beginDelayedTransition(this, transition);
+    }
+
+    private void cancelDelayedTransition() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            clearAnimation();
+        }
+    }
+
+    private void updateDataFromInstruction(InstructionModel model) {
+        updateDistanceText(model);
+        updateInstructionList(model);
+        if (newStep(model.retrieveProgress())) {
+            LegStep upComingStep = model.retrieveProgress().getCurrentLegProgress().getUpComingStep();
+            ImageCreator.getInstance().prefetchImageCache(upComingStep);
+        }
+    }
+
+    /**
+     * Looks to see if we have a new instruction text.
+     * Sets new instruction text if found.
+     */
+    private void updateDataFromBannerText(@NonNull BannerText primaryBannerText, BannerText secondaryBannerText) {
+        if (secondaryBannerText == null) {
+            loadPrimary(primaryBannerText);
+            return;
         }
-      }
-    });
-  }
-
-  /**
-   * Looks to see if we have a new distance text.
-   *
-   * @param model provides distance text
-   */
-  private boolean newDistanceText(InstructionModel model) {
-    return !upcomingDistanceText.getText().toString().isEmpty()
-      && !TextUtils.isEmpty(model.retrieveStepDistanceRemaining())
-      && !upcomingDistanceText.getText().toString()
-      .contentEquals(model.retrieveStepDistanceRemaining().toString());
-  }
-
-  /**
-   * Sets current distance text.
-   *
-   * @param model provides distance text
-   */
-  private void distanceText(InstructionModel model) {
-    upcomingDistanceText.setText(model.retrieveStepDistanceRemaining());
-  }
-
-  private InstructionLoader createInstructionLoader(TextView textView, BannerText
-    bannerText) {
-    if (hasComponents(bannerText)) {
-      return new InstructionLoader(textView, bannerText);
-    } else {
-      return null;
-    }
-  }
-
-  private boolean hasComponents(BannerText bannerText) {
-    return bannerText != null && bannerText.getComponents() != null && !bannerText.getComponents().isEmpty();
-  }
-
-  /**
-   * Looks to see if we have a new step.
-   *
-   * @param routeProgress provides updated step information
-   * @return true if new step, false if not
-   */
-  private boolean newStep(RouteProgress routeProgress) {
-    boolean newStep = currentStep == null || !currentStep.equals(routeProgress.getCurrentLegProgress().getCurrentStep());
-    currentStep = routeProgress.getCurrentLegProgress().getCurrentStep();
-    return newStep;
-  }
-
-  private void updateSubStep(BannerText subText, String primaryManeuverModifier) {
-    if (shouldShowSubStep(subText)) {
-      String maneuverType = subText.getType().getText();
-      String maneuverModifier = subText.getModifier() == null ? null : subText.getModifier().getText();
-      subManeuverView.setManeuverTypeAndModifier(maneuverType, maneuverModifier);
-      Double roundaboutAngle = subText.getDegrees();
-      if (roundaboutAngle != null) {
-        subManeuverView.setRoundaboutAngle(roundaboutAngle.floatValue());
-      }
-      String drivingSide = currentStep.getDrivingSide();
-      subManeuverView.setDrivingSide(drivingSide);
-      InstructionLoader instructionLoader = createInstructionLoader(subStepText, subText);
-      if (instructionLoader != null) {
-        instructionLoader.loadInstruction();
-      }
-      showSubLayout();
-      return;
-    } else {
-      hideSubLayout();
-    }
-
-    if (shouldShowTurnLanes(subText, primaryManeuverModifier)) {
-      turnLaneAdapter.addTurnLanes(subText.getComponents(), primaryManeuverModifier);
-      showTurnLanes();
-    } else {
-      hideTurnLanes();
-    }
-  }
-
-  private boolean shouldShowSubStep(@Nullable BannerText subText) {
-    return subText != null
-      && subText.getType() != null
-      && !subText.getType().getText().contains(COMPONENT_TYPE_LANE);
-  }
-
-  private void showSubLayout() {
-    if (!(subStepLayout.getVisibility() == VISIBLE)) {
-      beginDelayedTransition();
-      subStepLayout.setVisibility(VISIBLE);
-    }
-  }
-
-  private void hideSubLayout() {
-    if (subStepLayout.getVisibility() == VISIBLE) {
-      beginDelayedTransition();
-      subStepLayout.setVisibility(GONE);
-    }
-  }
-
-  private boolean shouldShowTurnLanes(BannerText subText, String maneuverModifier) {
-    if (!hasComponents(subText) || TextUtils.isEmpty(maneuverModifier)) {
-      return false;
-    }
-    for (BannerComponents components : subText.getComponents()) {
-      if (components.getType().equals(COMPONENT_TYPE_LANE)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private void showTurnLanes() {
-    if (turnLaneLayout.getVisibility() == GONE) {
-      beginDelayedTransition();
-      turnLaneLayout.setVisibility(VISIBLE);
-    }
-  }
-
-  private void hideTurnLanes() {
-    if (turnLaneLayout.getVisibility() == VISIBLE) {
-      beginDelayedTransition();
-      turnLaneLayout.setVisibility(GONE);
-    }
-  }
-
-  @Nullable
-  private FragmentManager obtainSupportFragmentManager() {
-    try {
-      return ((FragmentActivity) getContext()).getSupportFragmentManager();
-    } catch (ClassCastException exception) {
-      Timber.e(exception);
-      return null;
-    }
-  }
-
-  /**
-   * Adjust the banner text layout {@link ConstraintLayout} vertical bias.
-   *
-   * @param percentBias to be set to the text layout
-   */
-  private void adjustBannerTextVerticalBias(float percentBias) {
-    if (!isLandscape()) {
-      ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) instructionLayoutText.getLayoutParams();
-      params.verticalBias = percentBias;
-      instructionLayoutText.setLayoutParams(params);
-    }
-  }
-
-  private void beginDelayedTransition() {
-    TransitionManager.beginDelayedTransition(this);
-  }
-
-  private void beginDelayedListTransition() {
-    AutoTransition transition = new AutoTransition();
-    transition.addListener(new InstructionListTransitionListener(rvInstructions, instructionListAdapter));
-    TransitionManager.beginDelayedTransition(this, transition);
-  }
-
-  private void cancelDelayedTransition() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-      clearAnimation();
-    }
-  }
-
-  private void updateDataFromInstruction(InstructionModel model) {
-    updateDistanceText(model);
-    updateInstructionList(model);
-    if (newStep(model.retrieveProgress())) {
-      LegStep upComingStep = model.retrieveProgress().getCurrentLegProgress().getUpComingStep();
-      ImageCreator.getInstance().prefetchImageCache(upComingStep);
-    }
-  }
-
-  /**
-   * Looks to see if we have a new instruction text.
-   * Sets new instruction text if found.
-   */
-  private void updateDataFromBannerText(@NonNull BannerText primaryBannerText, BannerText secondaryBannerText) {
-    if (secondaryBannerText == null) {
-      loadPrimary(primaryBannerText);
-      return;
-    }
-    loadPrimaryAndSecondary(primaryBannerText, secondaryBannerText);
-  }
-
-  private void loadPrimary(BannerText primaryBannerText) {
-    upcomingPrimaryText.setMaxLines(2);
-    upcomingSecondaryText.setVisibility(GONE);
-    adjustBannerTextVerticalBias(0.5f);
-    loadTextWith(primaryBannerText, upcomingPrimaryText);
-  }
-
-  private void loadPrimaryAndSecondary(BannerText primaryBannerText, BannerText secondaryBannerText) {
-    upcomingPrimaryText.setMaxLines(1);
-    upcomingSecondaryText.setVisibility(VISIBLE);
-    adjustBannerTextVerticalBias(0.65f);
-    loadTextWith(primaryBannerText, upcomingPrimaryText);
-
-    loadTextWith(secondaryBannerText, upcomingSecondaryText);
-  }
-
-  private void loadTextWith(BannerText bannerText, TextView textView) {
-    InstructionLoader instructionLoader = createInstructionLoader(textView, bannerText);
-    if (instructionLoader != null) {
-      instructionLoader.loadInstruction();
-    }
-  }
-
-  /**
-   * Looks to see if we have a new maneuver modifier or type.
-   * Updates new maneuver image if one is found.
-   */
-  private void updateManeuverView(String maneuverViewType, String maneuverViewModifier,
-                                  @Nullable Double roundaboutAngle, String drivingSide) {
-    upcomingManeuverView.setManeuverTypeAndModifier(maneuverViewType, maneuverViewModifier);
-    if (roundaboutAngle != null) {
-      upcomingManeuverView.setRoundaboutAngle(roundaboutAngle.floatValue());
-    }
-    upcomingManeuverView.setDrivingSide(drivingSide);
-  }
-
-  /**
-   * Looks to see if we have a new distance text.
-   * Sets new distance text if found.
-   *
-   * @param model provides distance text
-   */
-  private void updateDistanceText(InstructionModel model) {
-    if (newDistanceText(model)) {
-      distanceText(model);
-    } else if (upcomingDistanceText.getText().toString().isEmpty()) {
-      distanceText(model);
-    }
-  }
-
-  private void updateLandscapeConstraintsTo(int layoutRes) {
-    ConstraintSet collapsed = new ConstraintSet();
-    collapsed.clone(getContext(), layoutRes);
-    collapsed.applyTo(instructionLayout);
-  }
-
-  /**
-   * Used to update the instructions list with the current steps.
-   *
-   * @param model to provide the current steps and unit type
-   */
-  private void updateInstructionList(InstructionModel model) {
-    RouteProgress routeProgress = model.retrieveProgress();
-    boolean isListShowing = instructionListLayout.getVisibility() == VISIBLE;
-    rvInstructions.stopScroll();
-    instructionListAdapter.updateBannerListWith(routeProgress, isListShowing);
-  }
+        loadPrimaryAndSecondary(primaryBannerText, secondaryBannerText);
+    }
+
+    private void loadPrimary(BannerText primaryBannerText) {
+        upcomingPrimaryText.setMaxLines(2);
+        upcomingSecondaryText.setVisibility(GONE);
+        adjustBannerTextVerticalBias(0.5f);
+        loadTextWith(primaryBannerText, upcomingPrimaryText);
+    }
+
+    private void loadPrimaryAndSecondary(BannerText primaryBannerText, BannerText secondaryBannerText) {
+        upcomingPrimaryText.setMaxLines(1);
+        upcomingSecondaryText.setVisibility(VISIBLE);
+        adjustBannerTextVerticalBias(0.65f);
+        loadTextWith(primaryBannerText, upcomingPrimaryText);
+
+        loadTextWith(secondaryBannerText, upcomingSecondaryText);
+    }
+
+    private void loadTextWith(BannerText bannerText, TextView textView) {
+        InstructionLoader instructionLoader = createInstructionLoader(textView, bannerText);
+        if (instructionLoader != null) {
+            instructionLoader.loadInstruction();
+        }
+    }
+
+    /**
+     * Looks to see if we have a new maneuver modifier or type.
+     * Updates new maneuver image if one is found.
+     */
+    private void updateManeuverView(String maneuverViewType, String maneuverViewModifier,
+                                    @Nullable Double roundaboutAngle, String drivingSide) {
+        upcomingManeuverView.setManeuverTypeAndModifier(maneuverViewType, maneuverViewModifier);
+        if (roundaboutAngle != null) {
+            upcomingManeuverView.setRoundaboutAngle(roundaboutAngle.floatValue());
+        }
+        upcomingManeuverView.setDrivingSide(drivingSide);
+    }
+
+    /**
+     * Looks to see if we have a new distance text.
+     * Sets new distance text if found.
+     *
+     * @param model provides distance text
+     */
+    private void updateDistanceText(InstructionModel model) {
+        if (newDistanceText(model)) {
+            distanceText(model);
+        } else if (upcomingDistanceText.getText().toString().isEmpty()) {
+            distanceText(model);
+        }
+    }
+
+    private void updateLandscapeConstraintsTo(int layoutRes) {
+        ConstraintSet collapsed = new ConstraintSet();
+        collapsed.clone(getContext(), layoutRes);
+        collapsed.applyTo(instructionLayout);
+    }
+
+    /**
+     * Used to update the instructions list with the current steps.
+     *
+     * @param model to provide the current steps and unit type
+     */
+    private void updateInstructionList(InstructionModel model) {
+        RouteProgress routeProgress = model.retrieveProgress();
+        boolean isListShowing = instructionListLayout.getVisibility() == VISIBLE;
+        rvInstructions.stopScroll();
+        instructionListAdapter.updateBannerListWith(routeProgress, isListShowing);
+    }
+
 }
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java
index 9691cd9b9..8f34e0b05 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java
@@ -235,9 +235,9 @@ protected void onDraw(Canvas canvas) {
     private void initializeColorFrom(AttributeSet attributeSet) {
         TypedArray typedArray = getContext().obtainStyledAttributes(attributeSet, R.styleable.ManeuverView);
         primaryColor = typedArray.getColor(R.styleable.ManeuverView_maneuverViewPrimaryColor,
-            ContextCompat.getColor(getContext(), R.color.maplibre_navigation_view_color_banner_maneuver_primary));
+            ContextCompat.getColor(getContext(), R.color.maplibre_navigation_route_layer_blue));
         secondaryColor = typedArray.getColor(R.styleable.ManeuverView_maneuverViewSecondaryColor,
-            ContextCompat.getColor(getContext(), R.color.maplibre_navigation_view_color_banner_maneuver_secondary));
+            ContextCompat.getColor(getContext(), R.color.maplibre_navigation_route_layer_blue));
         typedArray.recycle();
     }
 
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java
index de797de44..8645418fa 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java
@@ -15,101 +15,101 @@
 
 class MapFpsDelegate implements OnTrackingModeChangedListener, OnTrackingModeTransitionListener {
 
-  static final int DEFAULT_MAX_FPS_THRESHOLD = 20;
-  private static final double VALID_DURATION_IN_SECONDS_UNTIL_NEXT_MANEUVER = 7d;
-  private static final double VALID_DURATION_IN_SECONDS_SINCE_PREVIOUS_MANEUVER = 5d;
-  private static final int DEVICE_MAX_FPS = Integer.MAX_VALUE;
-  private static final int LOW_POWER_MAX_FPS = 30;
-
-  private final MapView mapView;
-  private final MapBatteryMonitor batteryMonitor;
-  private final ProgressChangeListener fpsProgressListener = new FpsDelegateProgressChangeListener(this);
-  private MapLibreNavigation navigation;
-  private int maxFpsThreshold = DEFAULT_MAX_FPS_THRESHOLD;
-  private boolean isTracking = true;
-  private boolean isEnabled = true;
-
-  MapFpsDelegate(MapView mapView, MapBatteryMonitor batteryMonitor) {
-    this.mapView = mapView;
-    this.batteryMonitor = batteryMonitor;
-  }
-
-  @Override
-  public void onTrackingModeChanged(int trackingMode) {
-    int trackingModeNone = NavigationCamera.NAVIGATION_TRACKING_MODE_NONE;
-    if (trackingMode == trackingModeNone) {
-      updateCameraTracking(trackingModeNone);
+    static final int DEFAULT_MAX_FPS_THRESHOLD = 20;
+    private static final double VALID_DURATION_IN_SECONDS_UNTIL_NEXT_MANEUVER = 7d;
+    private static final double VALID_DURATION_IN_SECONDS_SINCE_PREVIOUS_MANEUVER = 5d;
+    private static final int DEVICE_MAX_FPS = Integer.MAX_VALUE;
+    private static final int LOW_POWER_MAX_FPS = 30;
+
+    private final MapView mapView;
+    private final MapBatteryMonitor batteryMonitor;
+    private final ProgressChangeListener fpsProgressListener = new FpsDelegateProgressChangeListener(this);
+    private MapLibreNavigation navigation;
+    private int maxFpsThreshold = DEFAULT_MAX_FPS_THRESHOLD;
+    private boolean isTracking = true;
+    private boolean isEnabled = true;
+
+    MapFpsDelegate(MapView mapView, MapBatteryMonitor batteryMonitor) {
+        this.mapView = mapView;
+        this.batteryMonitor = batteryMonitor;
     }
-  }
 
-  @Override
-  public void onTransitionFinished(int trackingMode) {
-    updateCameraTracking(trackingMode);
-  }
+    @Override
+    public void onTrackingModeChanged(int trackingMode) {
+        int trackingModeNone = NavigationCamera.NAVIGATION_TRACKING_MODE_NONE;
+        if (trackingMode == trackingModeNone) {
+            updateCameraTracking(trackingModeNone);
+        }
+    }
 
-  @Override
-  public void onTransitionCancelled(int trackingMode) {
-    updateCameraTracking(trackingMode);
-  }
+    @Override
+    public void onTransitionFinished(int trackingMode) {
+        updateCameraTracking(trackingMode);
+    }
 
-  void addProgressChangeListener(MapLibreNavigation navigation) {
-    this.navigation = navigation;
-    navigation.addProgressChangeListener(fpsProgressListener);
-  }
+    @Override
+    public void onTransitionCancelled(int trackingMode) {
+        updateCameraTracking(trackingMode);
+    }
 
-  void onStart() {
-    if (navigation != null) {
-      navigation.addProgressChangeListener(fpsProgressListener);
+    void addProgressChangeListener(MapLibreNavigation navigation) {
+        this.navigation = navigation;
+        navigation.addProgressChangeListener(fpsProgressListener);
     }
-  }
 
-  void onStop() {
-    if (navigation != null) {
-      navigation.removeProgressChangeListener(fpsProgressListener);
+    void onStart() {
+        if (navigation != null) {
+            navigation.addProgressChangeListener(fpsProgressListener);
+        }
     }
-  }
 
-  void updateEnabled(boolean isEnabled) {
-    this.isEnabled = isEnabled;
-    resetMaxFps(!isEnabled);
-  }
+    void onStop() {
+        if (navigation != null) {
+            navigation.removeProgressChangeListener(fpsProgressListener);
+        }
+    }
 
-  void updateMaxFpsThreshold(int maxFps) {
-    this.maxFpsThreshold = maxFps;
-  }
+    void updateEnabled(boolean isEnabled) {
+        this.isEnabled = isEnabled;
+        resetMaxFps(!isEnabled);
+    }
 
-  void adjustFpsFor(RouteProgress routeProgress) {
-    if (!isEnabled || !isTracking) {
-      return;
+    void updateMaxFpsThreshold(int maxFps) {
+        this.maxFpsThreshold = maxFps;
     }
 
-    int maxFps = determineMaxFpsFrom(routeProgress, mapView.getContext());
-    mapView.setMaximumFps(maxFps);
-  }
+    void adjustFpsFor(RouteProgress routeProgress) {
+        if (!isEnabled || !isTracking) {
+            return;
+        }
 
-  private void updateCameraTracking(@NavigationCamera.TrackingMode int trackingMode) {
-    isTracking = trackingMode != NavigationCamera.NAVIGATION_TRACKING_MODE_NONE;
-    resetMaxFps(!isTracking);
-  }
+        int maxFps = determineMaxFpsFrom(routeProgress, mapView.getContext());
+        mapView.setMaximumFps(maxFps);
+    }
 
-  private void resetMaxFps(boolean shouldReset) {
-    if (shouldReset) {
-      mapView.setMaximumFps(DEVICE_MAX_FPS);
+    private void updateCameraTracking(@NavigationCamera.TrackingMode int trackingMode) {
+        isTracking = trackingMode != NavigationCamera.NAVIGATION_TRACKING_MODE_NONE;
+        resetMaxFps(!isTracking);
     }
-  }
 
-  private int determineMaxFpsFrom(RouteProgress routeProgress, Context context) {
-    final boolean isPluggedIn = batteryMonitor.isPluggedIn(context);
-    RouteLegProgress routeLegProgress = routeProgress.getCurrentLegProgress();
+    private void resetMaxFps(boolean shouldReset) {
+        if (shouldReset) {
+            mapView.setMaximumFps(DEVICE_MAX_FPS);
+        }
+    }
 
-    if (isPluggedIn) {
-      return LOW_POWER_MAX_FPS;
-    } else if (validLowFpsManeuver(routeLegProgress) || validLowFpsDuration(routeLegProgress)) {
-      return maxFpsThreshold;
-    } else {
-      return LOW_POWER_MAX_FPS;
+    private int determineMaxFpsFrom(RouteProgress routeProgress, Context context) {
+        final boolean isPluggedIn = batteryMonitor.isPluggedIn(context);
+        RouteLegProgress routeLegProgress = routeProgress.getCurrentLegProgress();
+
+        if (isPluggedIn) {
+            return LOW_POWER_MAX_FPS;
+        } else if (validLowFpsManeuver(routeLegProgress) || validLowFpsDuration(routeLegProgress)) {
+            return maxFpsThreshold;
+        } else {
+            return LOW_POWER_MAX_FPS;
+        }
     }
-  }
 
   private boolean validLowFpsManeuver(RouteLegProgress routeLegProgress) {
     ManeuverModifier.Type modifier = routeLegProgress.getCurrentStep().getManeuver().getModifier();
@@ -124,11 +124,11 @@ private boolean validLowFpsManeuver(RouteLegProgress routeLegProgress) {
       || maneuverModifier.equals(NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT));
   }
 
-  private boolean validLowFpsDuration(RouteLegProgress routeLegProgress) {
-    final double expectedStepDuration = routeLegProgress.getCurrentStep().getDuration();
-    final double durationUntilNextManeuver = routeLegProgress.getCurrentStepProgress().getDurationRemaining();
-    final double durationSincePreviousManeuver = expectedStepDuration - durationUntilNextManeuver;
-    return durationUntilNextManeuver > VALID_DURATION_IN_SECONDS_UNTIL_NEXT_MANEUVER
-      && durationSincePreviousManeuver > VALID_DURATION_IN_SECONDS_SINCE_PREVIOUS_MANEUVER;
-  }
+    private boolean validLowFpsDuration(RouteLegProgress routeLegProgress) {
+        final double expectedStepDuration = routeLegProgress.getCurrentStep().getDuration();
+        final double durationUntilNextManeuver = routeLegProgress.getCurrentStepProgress().getDurationRemaining();
+        final double durationSincePreviousManeuver = expectedStepDuration - durationUntilNextManeuver;
+        return durationUntilNextManeuver > VALID_DURATION_IN_SECONDS_UNTIL_NEXT_MANEUVER
+                && durationSincePreviousManeuver > VALID_DURATION_IN_SECONDS_SINCE_PREVIOUS_MANEUVER;
+    }
 }
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractor.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractor.java
index 0cd7c979d..dcac494ed 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractor.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractor.java
@@ -16,6 +16,8 @@
 import static org.maplibre.android.style.layers.PropertyFactory.visibility;
 import static org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMap.STREETS_LAYER_ID;
 
+import timber.log.Timber;
+
 class MapLayerInteractor {
 
   private static final float DEFAULT_WIDTH = 20f;
@@ -46,7 +48,11 @@ void addStreetsLayer(String sourceId, String sourceLayer) {
         lineColor(Color.WHITE)
       )
       .withSourceLayer(sourceLayer);
-    mapLibreMap.getStyle().addLayerAt(streetsLayer, LAST_INDEX);
+    try {
+        mapLibreMap.getStyle().addLayerAt(streetsLayer, LAST_INDEX);
+    } catch (Exception e) {
+      Timber.d("Style already exists");
+    }
   }
 
   private void updateLayerWithVisibility(String layerIdentifier, List<Layer> layers, boolean isVisible) {
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java
index 0c356d3ab..e88efd471 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java
@@ -1,5 +1,7 @@
 package org.maplibre.navigation.android.navigation.ui.v5.map;
 
+import static org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_VIEWPORT;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
 
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLine.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLine.java
index 6ed4fae91..75a026892 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLine.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLine.java
@@ -8,6 +8,7 @@
 import androidx.annotation.ColorInt;
 import androidx.core.content.ContextCompat;
 
+import org.maplibre.navigation.android.navigation.ui.v5.BuildConfig;
 import org.maplibre.navigation.android.navigation.ui.v5.R;
 import org.maplibre.navigation.android.navigation.ui.v5.utils.MapUtils;
 import org.maplibre.navigation.core.models.DirectionsRoute;
@@ -37,10 +38,12 @@
 import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_LAYER_ID;
 import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_SHIELD_LAYER_ID;
 import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_SOURCE_ID;
+import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_CUSTOM_ID;
 import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_DESTINATION_VALUE;
 import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_ORIGIN_VALUE;
 import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_PROPERTY_KEY;
-import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_SOURCE_ID;
+
+import timber.log.Timber;
 
 class MapRouteLine {
 
@@ -160,13 +163,22 @@ class MapRouteLine {
 
     GeoJsonOptions wayPointGeoJsonOptions = new GeoJsonOptions().withMaxZoom(16);
     drawnWaypointsFeatureCollection = waypointsFeatureCollection;
-    wayPointSource = sourceProvider.build(WAYPOINT_SOURCE_ID, drawnWaypointsFeatureCollection, wayPointGeoJsonOptions);
-    style.addSource(wayPointSource);
+    wayPointSource = sourceProvider.build(WAYPOINT_CUSTOM_ID, drawnWaypointsFeatureCollection, wayPointGeoJsonOptions);
+
 
     GeoJsonOptions routeLineGeoJsonOptions = new GeoJsonOptions().withMaxZoom(16);
     drawnRouteFeatureCollection = routesFeatureCollection;
     routeLineSource = sourceProvider.build(ROUTE_SOURCE_ID, drawnRouteFeatureCollection, routeLineGeoJsonOptions);
-    style.addSource(routeLineSource);
+
+
+    try {
+      style.addSource(wayPointSource);
+      style.addSource(routeLineSource);
+    } catch(Exception e) {
+      if (BuildConfig.DEBUG) {
+        Timber.d("Style Already exists");
+      }
+    }
 
     // Waypoint attributes
     int originWaypointIcon = typedArray.getResourceId(
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java
index b57619944..c9e412a06 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java
@@ -158,7 +158,7 @@ public Call<DirectionsResponse> getCall() {
     }
 
     public void cancelCall() {
-        getCall().cancel();
+        mapboxDirections.cancelCall();
     }
 
     /**
diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/RouteConstants.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/RouteConstants.java
index ad20634f7..8c516a915 100644
--- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/RouteConstants.java
+++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/RouteConstants.java
@@ -9,12 +9,18 @@ class RouteConstants {
   static final String ROUTE_LAYER_ID = "mapbox-navigation-route-layer";
   static final String ROUTE_SHIELD_LAYER_ID = "mapbox-navigation-route-shield-layer";
   static final String WAYPOINT_SOURCE_ID = "mapbox-navigation-waypoint-source";
+
+  static final String WAYPOINT_CUSTOM_ID = "mapbox-waypoint-custom-id";
   static final String WAYPOINT_LAYER_ID = "mapbox-navigation-waypoint-layer";
   static final int TWO_POINTS = 2;
   static final int THIRTY = 30;
   static final String ARROW_BEARING = "mapbox-navigation-arrow-bearing";
   static final String ARROW_SHAFT_SOURCE_ID = "mapbox-navigation-arrow-shaft-source";
+
+  static final String ARROW_SHAFT_CUSTOM_ID = "mapbox-arrow-shaft-custom-id";
   static final String ARROW_HEAD_SOURCE_ID = "mapbox-navigation-arrow-head-source";
+
+  static final String ARROW_HEAD_CUSTOM_ID = "mapbox-arrow-head-custom-id";
   static final String ARROW_SHAFT_CASING_LINE_LAYER_ID = "mapbox-navigation-arrow-shaft-casing-layer";
   static final String ARROW_SHAFT_LINE_LAYER_ID = "mapbox-navigation-arrow-shaft-layer";
   static final String ARROW_HEAD_ICON = "mapbox-navigation-arrow-head-icon";
diff --git a/libandroid-navigation-ui/src/main/res/layout-land/instruction_layout_alt.xml b/libandroid-navigation-ui/src/main/res/layout-land/instruction_layout_alt.xml
index ee8f0a132..afd6b0961 100644
--- a/libandroid-navigation-ui/src/main/res/layout-land/instruction_layout_alt.xml
+++ b/libandroid-navigation-ui/src/main/res/layout-land/instruction_layout_alt.xml
@@ -17,7 +17,6 @@
         android:layout_marginBottom="8dp"
         android:background="@drawable/instruction_background"
         android:elevation="4dp"
-        android:foreground="?attr/selectableItemBackground"
         android:gravity="center"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -30,8 +29,7 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_margin="8dp"
-            app:maneuverViewPrimaryColor="?attr/navigationViewBannerManeuverPrimary"
-            app:maneuverViewSecondaryColor="?attr/navigationViewBannerManeuverSecondary"/>
+            />
 
         <TextView
             android:id="@+id/stepDistanceText"
@@ -39,7 +37,6 @@
             android:layout_height="wrap_content"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:textColor="?attr/navigationViewBannerSecondaryText"
             android:textSize="20sp"
             tools:text="3.2 mi"/>
 
@@ -52,7 +49,6 @@
         android:layout_marginBottom="8dp"
         android:background="?attr/navigationViewBannerBackground"
         android:elevation="4dp"
-        android:foreground="?attr/selectableItemBackground"
         android:gravity="center_vertical"
         app:layout_constraintBottom_toBottomOf="@+id/instructionManeuverLayout"
         app:layout_constraintEnd_toEndOf="parent"
@@ -68,7 +64,6 @@
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:maxLines="1"
-            android:textColor="?attr/navigationViewBannerPrimaryText"
             android:textSize="28sp"
             android:textStyle="bold"
             tools:text="Fulton St."/>
@@ -80,7 +75,6 @@
             android:ellipsize="end"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:textColor="?attr/navigationViewBannerSecondaryText"
             android:textSize="22sp"
             android:textStyle="bold"
             tools:text="San Jose / Cupertino / Saratoga Montery / SR-1"/>
@@ -120,7 +114,6 @@
         android:id="@+id/rerouteLayout"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?attr/navigationViewSecondary"
         android:elevation="4dp"
         android:gravity="center"
         android:orientation="vertical"
@@ -137,7 +130,6 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:text="@string/rerouting"
-            android:textColor="?attr/navigationViewBannerPrimaryText"
             android:textSize="20sp"
             android:textStyle="bold"/>
 
diff --git a/libandroid-navigation-ui/src/main/res/layout-land/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout-land/navigation_view_layout.xml
index 9d68037d3..2236ecbcc 100644
--- a/libandroid-navigation-ui/src/main/res/layout-land/navigation_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout-land/navigation_view_layout.xml
@@ -20,20 +20,13 @@
         android:layout_height="match_parent"
         android:visibility="invisible"/>
 
-    <org.maplibre.navigation.android.navigation.ui.v5.summary.SummaryBottomSheet
-        android:id="@+id/summaryBottomSheet"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"/>
-
-    <org.maplibre.navigation.android.navigation.ui.v5.RecenterButton
+    <com.mapbox.services.android.navigation.ui.v5.RecenterButton
         android:id="@+id/recenterBtn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
         android:layout_margin="16dp"
         android:visibility="invisible"
-        app:layout_anchor="@id/summaryBottomSheet"
         app:layout_anchorGravity="top|left"/>
 
     <org.maplibre.navigation.android.navigation.ui.v5.map.WayNameView
@@ -42,7 +35,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center|top"
         android:visibility="invisible"
-        app:layout_anchor="@id/summaryBottomSheet"
         app:layout_anchorGravity="center|top"/>
 
     <org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionView
diff --git a/libandroid-navigation-ui/src/main/res/layout/alert_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/alert_view_layout.xml
index 013dcfaea..98d831d3a 100644
--- a/libandroid-navigation-ui/src/main/res/layout/alert_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/alert_view_layout.xml
@@ -5,8 +5,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="56dp"
-    android:foreground="?attr/selectableItemBackground"
-    app:cardBackgroundColor="?attr/navigationViewBannerBackground"
     app:cardUseCompatPadding="true"
     app:cardCornerRadius="8dp"
     app:cardElevation="2dp">
@@ -16,7 +14,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
-        android:textColor="?attr/navigationViewBannerPrimaryText"
         android:textStyle="bold"
         android:textSize="18sp"
         android:maxLines="1"
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
index 25fc14ddb..6061c11f6 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_content_layout.xml
@@ -3,79 +3,70 @@
     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/instructionBackground"
     android:layout_width="match_parent"
-    android:layout_height="96dp"
-    tools:background="?navigationViewBannerBackground">
+    android:layout_height="match_parent"
+    android:background="?attr/navigationViewBannerBackground">
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/maneuver_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_begin="80dp"/>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/guideline"
         app:layout_constraintStart_toStartOf="parent"
+        android:padding="8dp"
         app:layout_constraintTop_toTopOf="parent">
 
         <org.maplibre.navigation.android.navigation.ui.v5.instruction.maneuver.ManeuverView
             android:id="@+id/maneuverView"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            app:layout_constraintBottom_toTopOf="@+id/stepDistanceText"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.75"
-            app:maneuverViewPrimaryColor="?attr/navigationViewBannerManeuverPrimary"
-            app:maneuverViewSecondaryColor="?attr/navigationViewBannerManeuverSecondary"/>
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:maneuverViewPrimaryColor="@color/maplibre_navigation_route_layer_blue"
+            app:maneuverViewSecondaryColor="@color/maplibre_navigation_route_layer_blue"/>
 
         <TextView
             android:id="@+id/stepDistanceText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="11dp"
-            android:gravity="center"
             android:includeFontPadding="false"
             android:maxLines="1"
             android:textColor="?attr/navigationViewBannerSecondaryText"
-            android:textSize="22sp"
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:layout_marginStart="16dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:text="302 mi"/>
+            app:layout_constraintStart_toEndOf="@id/maneuverView"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="302 mi"
+            tools:ignore="NotSibling" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
         android:id="@+id/instructionLayoutText"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
         android:layout_marginEnd="12dp"
-        android:layout_marginRight="12dp"
+        android:layout_marginBottom="12dp"
         android:orientation="vertical"
+        app:layout_constraintTop_toBottomOf="@id/maneuver_layout"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/guideline"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.65">
+        app:layout_constraintVertical_bias="0.0"
+        >
 
         <TextView
             android:id="@+id/stepPrimaryText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
-            android:gravity="center_vertical"
             android:includeFontPadding="false"
-            android:maxLines="1"
-            android:minHeight="35dp"
+            android:layout_marginHorizontal="16dp"
             android:textColor="?attr/navigationViewBannerPrimaryText"
-            android:textSize="30sp"
-            android:textStyle="bold"
+            android:textSize="16sp"
             tools:text="I-580 South"/>
 
         <TextView
@@ -83,13 +74,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
-            android:gravity="center_vertical"
             android:includeFontPadding="false"
             android:lineSpacingMultiplier="0.8"
-            android:maxLines="1"
-            android:minHeight="31dp"
+            android:textSize="14sp"
+            android:visibility="gone"
             android:textColor="?attr/navigationViewBannerSecondaryText"
-            android:textSize="26sp"
             android:textStyle="bold"
             tools:text="San Jose / Cupertino"/>
 
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
index fe822a7f9..56d1453f2 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_layout.xml
@@ -3,19 +3,17 @@
     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="0dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?attr/navigationViewBannerBackground"
+    android:paddingHorizontal="16dp"
     android:elevation="6dp"
-    android:foreground="?attr/selectableItemBackground"
     tools:showIn="@layout/instruction_view_layout">
 
     <include
         layout="@layout/instruction_content_layout"
         android:layout_width="0dp"
-        android:layout_height="@dimen/instruction_layout_height"
+        android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
@@ -40,7 +38,6 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:text="@string/rerouting"
-            android:textColor="?attr/navigationViewBannerPrimaryText"
             android:textSize="20sp"
             android:textStyle="bold"/>
 
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_list_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_list_layout.xml
index dfc847a31..109e61e28 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_list_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_list_layout.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
-    android:background="?attr/navigationViewListBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:elevation="4dp">
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml
index 48697988a..22ba66a04 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_view_layout.xml
@@ -25,6 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/instructionLayout"
+        android:visibility="gone"
         android:orientation="vertical">
 
         <include
@@ -65,6 +66,7 @@
         android:layout_marginBottom="8dp"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
+        android:visibility="gone"
         android:layout_below="@id/extraInstructionContentLayout"/>
 
 </RelativeLayout>
diff --git a/libandroid-navigation-ui/src/main/res/layout/instruction_viewholder_layout.xml b/libandroid-navigation-ui/src/main/res/layout/instruction_viewholder_layout.xml
index c36dd173f..8e07a8e40 100644
--- a/libandroid-navigation-ui/src/main/res/layout/instruction_viewholder_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/instruction_viewholder_layout.xml
@@ -4,7 +4,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="96dp"
-    android:background="?attr/navigationViewListBackground"
     android:orientation="vertical">
 
     <include
diff --git a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
index 9d68037d3..6789ba5ac 100644
--- a/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/navigation_view_layout.xml
@@ -1,53 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/navigationLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <org.maplibre.android.maps.MapView
-        android:id="@+id/navigationMapView"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:maplibre_uiAttribution="false"
-        app:maplibre_uiCompass="false"/>
+        android:orientation="vertical">
 
-    <ImageView
-        android:id="@+id/screenshotView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="invisible"/>
+        <org.maplibre.android.maps.MapView
+            android:id="@+id/navigationMapView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:maplibre_cameraTargetLat="52.039176"
+            app:maplibre_cameraTargetLng="5.550339"
+            app:maplibre_cameraZoom="12"
+            app:maplibre_enableTilePrefetch="true"
+            app:maplibre_enableZMediaOverlay="true"
+            app:maplibre_renderTextureMode="true"
+            app:maplibre_renderTextureTranslucentSurface="true"
+            app:maplibre_uiAttribution="false"
+            app:maplibre_uiCompass="false"
+            app:maplibre_uiDoubleTapGestures="true"
+            app:maplibre_uiLogo="false"
+            app:maplibre_uiRotateGestures="true"
+            app:maplibre_uiScrollGestures="true"
+            app:maplibre_uiTiltGestures="true"
+            app:maplibre_uiZoomGestures="true" />
 
-    <org.maplibre.navigation.android.navigation.ui.v5.summary.SummaryBottomSheet
-        android:id="@+id/summaryBottomSheet"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"/>
+        <org.maplibre.navigation.android.navigation.ui.v5.RecenterButton
+            android:id="@+id/recenterBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            android:layout_margin="16dp"
+            android:visibility="gone"
+            app:layout_anchorGravity="top|left" />
 
-    <org.maplibre.navigation.android.navigation.ui.v5.RecenterButton
-        android:id="@+id/recenterBtn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:layout_margin="16dp"
-        android:visibility="invisible"
-        app:layout_anchor="@id/summaryBottomSheet"
-        app:layout_anchorGravity="top|left"/>
+        <org.maplibre.navigation.android.navigation.ui.v5.map.WayNameView
+            android:id="@+id/wayNameView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center|top"
+            android:visibility="gone"
+            app:layout_anchorGravity="center|top" />
 
-    <org.maplibre.navigation.android.navigation.ui.v5.map.WayNameView
-        android:id="@+id/wayNameView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center|top"
-        android:visibility="invisible"
-        app:layout_anchor="@id/summaryBottomSheet"
-        app:layout_anchorGravity="center|top"/>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionView
         android:id="@+id/instructionView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintVertical_bias="0.2"
+        />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/res/layout/recenter_btn_layout.xml b/libandroid-navigation-ui/src/main/res/layout/recenter_btn_layout.xml
index 414d35df3..26a17bb68 100644
--- a/libandroid-navigation-ui/src/main/res/layout/recenter_btn_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/recenter_btn_layout.xml
@@ -4,7 +4,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    app:cardBackgroundColor="?attr/navigationViewPrimary"
     app:cardElevation="2dp">
 
     <LinearLayout
@@ -16,13 +15,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/ic_navigation"
-            android:tint="?attr/navigationViewAccent"/>
+            />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:textColor="?attr/navigationViewAccent"
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:text="@string/re_center"/>
diff --git a/libandroid-navigation-ui/src/main/res/layout/sound_layout.xml b/libandroid-navigation-ui/src/main/res/layout/sound_layout.xml
index f7c48cb37..879b4564a 100644
--- a/libandroid-navigation-ui/src/main/res/layout/sound_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/sound_layout.xml
@@ -16,7 +16,6 @@
         android:paddingStart="12dp"
         android:paddingTop="8dp"
         android:text="@string/muted"
-        android:textColor="?attr/navigationViewSecondary"
         android:textSize="14sp"
         android:textStyle="bold"
         android:visibility="invisible"
@@ -34,8 +33,6 @@
         android:layout_marginRight="16dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
-        android:tint="?attr/navigationViewSecondary"
-        app:backgroundTint="?attr/navigationViewPrimary"
         app:borderWidth="0dp"
         app:fabSize="mini"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/libandroid-navigation-ui/src/main/res/layout/sub_instruction_layout.xml b/libandroid-navigation-ui/src/main/res/layout/sub_instruction_layout.xml
index e3ce03d97..5594d174f 100644
--- a/libandroid-navigation-ui/src/main/res/layout/sub_instruction_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/sub_instruction_layout.xml
@@ -5,7 +5,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/navigationViewListBackground"
     android:elevation="2dp">
 
     <org.maplibre.navigation.android.navigation.ui.v5.instruction.maneuver.ManeuverView
@@ -16,9 +15,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/guideline"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:maneuverViewPrimaryColor="?attr/navigationViewBannerManeuverPrimary"
-        app:maneuverViewSecondaryColor="?attr/navigationViewBannerManeuverSecondary"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/subStepText"
@@ -29,7 +26,6 @@
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"
-        android:textColor="?attr/navigationViewBannerSecondaryText"
         android:textSize="18sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/libandroid-navigation-ui/src/main/res/layout/summary_peek_content_layout.xml b/libandroid-navigation-ui/src/main/res/layout/summary_peek_content_layout.xml
index 4031c0202..42998931b 100644
--- a/libandroid-navigation-ui/src/main/res/layout/summary_peek_content_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/summary_peek_content_layout.xml
@@ -16,7 +16,6 @@
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"
-        android:textColor="?attr/navigationViewPrimaryText"
         android:textSize="26sp"
         app:autoSizeMaxTextSize="26sp"
         app:autoSizeMinTextSize="20sp"
@@ -36,7 +35,6 @@
             android:ellipsize="end"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:textColor="?attr/navigationViewSecondaryText"
             android:textSize="18sp"
             tools:text="17 miles"/>
 
@@ -49,7 +47,6 @@
             android:ellipsize="end"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:textColor="?attr/navigationViewSecondaryText"
             android:textSize="18sp"
             tools:text="10:38am"/>
 
diff --git a/libandroid-navigation-ui/src/main/res/layout/summary_peek_layout.xml b/libandroid-navigation-ui/src/main/res/layout/summary_peek_layout.xml
index 1c775fc76..7591f35e0 100644
--- a/libandroid-navigation-ui/src/main/res/layout/summary_peek_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/summary_peek_layout.xml
@@ -5,7 +5,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="72dp"
-    android:background="?attr/navigationViewPrimary"
     tools:showIn="@layout/summary_content_layout">
 
     <ProgressBar
@@ -15,7 +14,6 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:indeterminate="true"
-        android:indeterminateTint="?attr/navigationViewAccent"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -29,12 +27,11 @@
         android:background="@android:color/transparent"
         android:clickable="true"
         android:focusable="true"
-        android:foreground="?attr/selectableItemBackground"
         android:padding="16dp"
-        android:tint="?attr/navigationViewSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/divider"
         app:layout_constraintTop_toTopOf="parent"
+
         tools:src="@drawable/ic_route_preview"/>
 
     <View
@@ -43,7 +40,6 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="16dp"
         android:layout_marginTop="16dp"
-        android:background="?attr/navigationViewDivider"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/cancelBtn"
         app:layout_constraintTop_toTopOf="parent"/>
@@ -55,9 +51,7 @@
         android:background="@android:color/transparent"
         android:clickable="true"
         android:focusable="true"
-        android:foreground="?attr/selectableItemBackground"
         android:padding="16dp"
-        android:tint="?attr/navigationViewSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/libandroid-navigation-ui/src/main/res/layout/turn_lane_layout.xml b/libandroid-navigation-ui/src/main/res/layout/turn_lane_layout.xml
index ede6e28fb..6d9de5ccf 100644
--- a/libandroid-navigation-ui/src/main/res/layout/turn_lane_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/turn_lane_layout.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/navigationViewListBackground"
     android:orientation="vertical"
     android:elevation="2dp">
 
diff --git a/libandroid-navigation-ui/src/main/res/layout/wayname_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout/wayname_view_layout.xml
index 9fe7f1d05..f90ccce0b 100644
--- a/libandroid-navigation-ui/src/main/res/layout/wayname_view_layout.xml
+++ b/libandroid-navigation-ui/src/main/res/layout/wayname_view_layout.xml
@@ -17,7 +17,6 @@
         android:paddingLeft="@dimen/wayname_padding"
         android:paddingRight="@dimen/wayname_padding"
         android:paddingBottom="@dimen/wayname_padding_bottom"
-        android:textColor="?attr/navigationViewAccent"
         android:textStyle="bold"
         tools:text="Wayname Text"/>
 
diff --git a/libandroid-navigation-ui/src/main/res/values/colors.xml b/libandroid-navigation-ui/src/main/res/values/colors.xml
index 5028bd0bd..8e11c9980 100644
--- a/libandroid-navigation-ui/src/main/res/values/colors.xml
+++ b/libandroid-navigation-ui/src/main/res/values/colors.xml
@@ -61,5 +61,6 @@
   <color name="md_grey_700">#616161</color>
   <color name="md_grey_800">#424242</color>
   <color name="md_grey_900">#212121</color>
+  <color name="transparent">#00FFFFFF</color>
 </resources>
 
diff --git a/libandroid-navigation-ui/src/main/res/values/developer-config.xml b/libandroid-navigation-ui/src/main/res/values/developer-config.xml
new file mode 100644
index 000000000..3556fcfc8
--- /dev/null
+++ b/libandroid-navigation-ui/src/main/res/values/developer-config.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<!--    <string name="base_url" translatable="false">https://graphhopper.com/api/1/navigate/</string>    &lt;!&ndash; Your GraphHopper API key &ndash;&gt;-->
+    <string name="base_url" translatable="false">https://api.mapbox.com/</string>    <!-- Your GraphHopper API key -->
+<!--    <string name="mapbox_access_token" translatable="false">pk.cb243ba3-cb94-41c4-a91f-5f3074824d3a</string>-->
+    <string name="mapbox_access_token" translatable="false">pk.cb243ba3-cb94-41c4-a91f-5f3074824d3a</string>
+    <!-- The "day" style used for navigation, here mapilion is used but you can use maptiler too -->
+    <string name="map_style_light" translatable="false">https://api.maptiler.com/maps/streets-v2/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ</string>
+    <!-- The "night" style used for navigation -->
+    <string name="map_style_dark" translatable="false">https://api.maptiler.com/maps/streets-v2-dark/style.json?key=ZkZSWT2Q0ta4f3S1VyrZ</string>
+</resources>
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/main/res/values/styles.xml b/libandroid-navigation-ui/src/main/res/values/styles.xml
index 211a1f8bf..5d20f062f 100644
--- a/libandroid-navigation-ui/src/main/res/values/styles.xml
+++ b/libandroid-navigation-ui/src/main/res/values/styles.xml
@@ -92,7 +92,7 @@
         <item name="roundedLineCap">true</item>
     </style>
 
-    <style name="NavigationLocationLayerStyle" parent="@style/maplibre_LocationComponent">
+    <style name="NavigationLocationLayerStyle" parent="maplibre_LocationLayer">
         <item name="maplibre_trackingAnimationDurationMultiplier">2.0</item>
         <item name="maplibre_trackingGesturesManagement">true</item>
     </style>
@@ -157,4 +157,12 @@
         <item name="navigationViewMapStyle">@string/navigation_guidance_night</item>
     </style>
 
+    <style name="TestNavigationViewLight" parent="NavigationViewLight">
+        <item name="navigationViewMapStyle">@string/map_style_light</item>
+    </style>
+
+    <style name="TestNavigationViewDark" parent="NavigationViewDark">
+        <item name="navigationViewMapStyle">@string/map_style_dark</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java
index 17fda9dab..0c52422ef 100644
--- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java
+++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java
@@ -19,7 +19,7 @@ public void onCameraTrackingDismissed_presenterNotifiedWithVisibleBottomsheet()
     BottomSheetBehavior behavior = mock(BottomSheetBehavior.class);
     when(behavior.getState()).thenReturn(BottomSheetBehavior.STATE_EXPANDED);
     NavigationOnCameraTrackingChangedListener listener = new NavigationOnCameraTrackingChangedListener(
-      presenter, behavior
+      presenter
     );
 
     listener.onCameraTrackingDismissed();
@@ -33,7 +33,7 @@ public void onCameraTrackingDismissed_ignoredWithHiddenBottomsheet() {
     BottomSheetBehavior behavior = mock(BottomSheetBehavior.class);
     when(behavior.getState()).thenReturn(BottomSheetBehavior.STATE_HIDDEN);
     NavigationOnCameraTrackingChangedListener listener = new NavigationOnCameraTrackingChangedListener(
-      presenter, behavior
+      presenter
     );
 
     listener.onCameraTrackingDismissed();
diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenterTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenterTest.java
index 4678449c5..428aabfe0 100644
--- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenterTest.java
+++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenterTest.java
@@ -115,7 +115,7 @@ public void onWayNameChanged_mapWayNameIsHidden() {
   @Test
   public void onWayNameChanged_mapWayNameIsHiddenWithCollapsedBottomsheet() {
     NavigationContract.View view = mock(NavigationContract.View.class);
-    when(view.isSummaryBottomSheetHidden()).thenReturn(true);
+//    when(view.isSummaryBottomSheetHidden()).thenReturn(true);
     NavigationPresenter presenter = new NavigationPresenter(view);
 
     presenter.onWayNameChanged("some valid way name");
diff --git a/maplibre-navigation-core/build.gradle.kts b/maplibre-navigation-core/build.gradle.kts
index 17bf66911..28914e483 100644
--- a/maplibre-navigation-core/build.gradle.kts
+++ b/maplibre-navigation-core/build.gradle.kts
@@ -86,7 +86,7 @@ android {
 
     defaultConfig {
         compileSdk = 35
-        minSdk = 21
+        minSdk = 23
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/maplibre-navigation-core/proguard-consumer.pro b/maplibre-navigation-core/proguard-consumer.pro
index 88e133da6..cf741ebf2 100644
--- a/maplibre-navigation-core/proguard-consumer.pro
+++ b/maplibre-navigation-core/proguard-consumer.pro
@@ -16,3 +16,4 @@
 # AutoValue annotations are retained but dependency is compileOnly.
 -dontwarn com.google.auto.value.**
 -dontwarn com.ryanharter.auto.value.**
+-dontwarn com.ryanharter.auto.value.**
diff --git a/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/navigation/MapLibreNavigation.kt b/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/navigation/MapLibreNavigation.kt
index eea61dd94..6bc190504 100644
--- a/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/navigation/MapLibreNavigation.kt
+++ b/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/navigation/MapLibreNavigation.kt
@@ -58,7 +58,7 @@ import kotlin.jvm.JvmOverloads
  * @see MapLibreNavigationOptions
  */
 open class MapLibreNavigation @JvmOverloads constructor(
-    val options: MapLibreNavigationOptions = MapLibreNavigationOptions(),
+    var options: MapLibreNavigationOptions = MapLibreNavigationOptions(),
     /**
      * Navigation needs an instance of location engine in order to acquire user location information
      * and handle events based off of the current information. By default, a LOST location engine is
diff --git a/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/offroute/OffRouteDetector.kt b/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/offroute/OffRouteDetector.kt
index 02ad0e363..6fa996f28 100644
--- a/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/offroute/OffRouteDetector.kt
+++ b/maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/offroute/OffRouteDetector.kt
@@ -69,9 +69,9 @@ open class OffRouteDetector(
         routeProgress: RouteProgress,
         options: MapLibreNavigationOptions
     ): Boolean {
-        if (checkDistanceRemaining(routeProgress)) {
-            return true
-        }
+//        if (checkDistanceRemaining(routeProgress)) {
+//            return true
+//        }
 
         if (!validOffRoute(location, options)) {
             return false