diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt
index 7be1237..bf18704 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt
@@ -1,400 +1,407 @@
 package it.reyboz.bustorino.fragments
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.location.Location
 import android.os.Bundle
 import android.util.Log
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageButton
-import android.widget.LinearLayout
+import android.widget.RelativeLayout
 import android.widget.TextView
-import android.widget.Toast
-import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.viewModels
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.gson.Gson
 import com.google.gson.JsonObject
 import it.reyboz.bustorino.R
 import it.reyboz.bustorino.backend.Stop
 import it.reyboz.bustorino.map.Styles
-import it.reyboz.bustorino.util.ViewUtils
 import it.reyboz.bustorino.viewmodels.StopsMapViewModel
 import org.maplibre.android.MapLibre
 import org.maplibre.android.camera.CameraPosition
 import org.maplibre.android.camera.CameraUpdateFactory
 import org.maplibre.android.maps.MapView
 import org.maplibre.android.geometry.LatLng
 import org.maplibre.android.geometry.LatLngBounds
 import org.maplibre.android.location.LocationComponent
 import org.maplibre.android.location.LocationComponentActivationOptions
 import org.maplibre.android.location.LocationComponentOptions
 import org.maplibre.android.location.engine.LocationEngineRequest
 import org.maplibre.android.location.modes.CameraMode
 import org.maplibre.android.maps.MapLibreMap
 import org.maplibre.android.maps.OnMapReadyCallback
 import org.maplibre.android.maps.Style
 import org.maplibre.android.style.layers.PropertyFactory
 import org.maplibre.android.style.layers.SymbolLayer
 import org.maplibre.android.style.sources.GeoJsonSource
 import org.maplibre.geojson.Feature
 import org.maplibre.geojson.FeatureCollection
 import org.maplibre.geojson.Point
 
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
 private const val ARG_PARAM1 = "param1"
 private const val ARG_PARAM2 = "param2"
 
 /**
  * A simple [Fragment] subclass.
  * Use the [MapLibreFragment.newInstance] factory method to
  * create an instance of this fragment.
  */
 class MapLibreFragment : Fragment(), OnMapReadyCallback {
 
     //private var param1: String? = null
     //private var param2: String? = null
     // Declare a variable for MapView
     private lateinit var mapView: MapView
     private lateinit var locationComponent: LocationComponent
     private var lastLocation: Location? = null
     private val stopsViewModel: StopsMapViewModel by viewModels()
     private val gson = Gson()
     private var stopsShowing = ArrayList<Stop>(0)
+    private var isBottomSheetShowing = false
 
 
     protected var map: MapLibreMap? = null
     // Sources for stops and buses
     private lateinit var stopsSource: GeoJsonSource
     private lateinit var busesSource: GeoJsonSource
     private var isStopsLayerStarted = false
     private var lastStopsSizeShown = 0
     private var lastBBox = LatLngBounds.from(2.0, 2.0, 1.0,1.0)
     private lateinit var mapStyle: Style
 
     //bottom Sheet behavior
-    private lateinit var bottomSheetBehavior: BottomSheetBehavior<LinearLayout>
-    private var bottomLayout: LinearLayout? = null
+    private lateinit var bottomSheetBehavior: BottomSheetBehavior<RelativeLayout>
+    private var bottomLayout: RelativeLayout? = null
+    private lateinit var stopTitleTextView: TextView
+    private lateinit var stopNumberTextView: TextView
+    private lateinit var linesPassingTextView: TextView
 
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         /*arguments?.let {
             param1 = it.getString(ARG_PARAM1)
             param2 = it.getString(ARG_PARAM2)
         }
 
          */
         MapLibre.getInstance(requireContext())
     }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         // Inflate the layout for this fragment
         val rootView =  inflater.inflate(R.layout.fragment_map_libre,
             container, false)
 
 
 
         // Init layout view
 
         // Init the MapView
         mapView = rootView.findViewById(R.id.libreMapView)
         mapView.getMapAsync(this) //{ //map ->
             //map.setStyle("https://demotiles.maplibre.org/style.json") }
 
         //init bottom sheet
-        val bottomSheet = rootView.findViewById<LinearLayout>(R.id.bottom_sheet)
+        val bottomSheet = rootView.findViewById<RelativeLayout>(R.id.bottom_sheet)
         bottomLayout = bottomSheet
+        stopTitleTextView = bottomSheet.findViewById(R.id.stopTitleTextView)
+        stopNumberTextView = bottomSheet.findViewById(R.id.stopNumberTextView)
+        linesPassingTextView = bottomSheet.findViewById(R.id.linesPassingTextView)
         bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet)
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
 
         // Setup close button
         rootView.findViewById<View>(R.id.btnClose).setOnClickListener {
             bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
+            isBottomSheetShowing = false
         }
         return rootView
     }
 
     override fun onMapReady(mapReady: MapLibreMap) {
         this.map = mapReady
         mapReady.cameraPosition = CameraPosition.Builder().target(LatLng(DEFAULT_CENTER_LAT, DEFAULT_CENTER_LON)).zoom(
             15.0).build()
         val mjson = Styles.getJsonStyleFromAsset(requireContext(), "map_style_good_noshops.json")//ViewUtils.loadJsonFromAsset(requireContext(),"map_style_good.json")
         activity?.run {
 
             mapReady.setStyle(Style.Builder().fromJson(mjson!!)) { style ->
                 mapStyle = style
                 setupLayers(style)
 
                 // Start observing data
                 observeViewModels()
                 initLocation(style, mapReady, requireContext())
             }
 
             mapReady.addOnCameraIdleListener {
                 map?.let {
                     val newBbox = it.projection.visibleRegion.latLngBounds
                     if ((newBbox.center==lastBBox.center) && (newBbox.latitudeSpan==lastBBox.latitudeSpan) && (newBbox.longitudeSpan==lastBBox.latitudeSpan)){
                         //do nothing
                     } else {
                         stopsViewModel.loadStopsInLatLngBounds(newBbox)
                         lastBBox = newBbox
                     }
                 }
 
             }
 
             mapReady.addOnMapClickListener { point ->
                 val screenPoint = mapReady.projection.toScreenLocation(point)
                 val features = mapReady.queryRenderedFeatures(screenPoint, STOPS_LAYER_ID)
                 if (features.isNotEmpty()) {
                     val feature = features[0]
                     val id = feature.getStringProperty("id")
                     val name = feature.getStringProperty("name")
                     //Toast.makeText(requireContext(), "Clicked on $name ($id)", Toast.LENGTH_SHORT).show()
                     val stop = stopsViewModel.getStopByID(id)
                     stop?.let {
+                        if (isBottomSheetShowing){
+                            bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
+                            isBottomSheetShowing = false
+                        }
                         showStopInBottomSheet(it)
                         bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
+                        isBottomSheetShowing = true
                         //move camera
                         if(it.latitude!=null && it.longitude!=null)
                         //mapReady.cameraPosition = CameraPosition.Builder().target(LatLng(it.latitude!!, it.longitude!!)).build()
                             mapReady.animateCamera(CameraUpdateFactory.newLatLng(LatLng(it.latitude!!,it.longitude!!)),750)
                     }
 
 
 
 
                     return@addOnMapClickListener true
                 }
                 false
             }
                 //makeStyleMapBoxUrl(false))
 
         }
 
     }
     @SuppressLint("MissingPermission")
     private fun initLocation(style: Style, map: MapLibreMap, context: Context){
         locationComponent = map.locationComponent
         val locationComponentOptions =
             LocationComponentOptions.builder(context)
                 .pulseEnabled(true)
                 .build()
         val locationComponentActivationOptions =
             buildLocationComponentActivationOptions(style, locationComponentOptions, context)
         locationComponent.activateLocationComponent(locationComponentActivationOptions)
         locationComponent.isLocationComponentEnabled = true
         locationComponent.cameraMode = CameraMode.TRACKING //CameraMode.TRACKING
         locationComponent.forceLocationUpdate(lastLocation)
     }
     private fun buildLocationComponentActivationOptions(
         style: Style,
         locationComponentOptions: LocationComponentOptions,
         context: Context
     ): LocationComponentActivationOptions {
         return LocationComponentActivationOptions
             .builder(context, style)
             .locationComponentOptions(locationComponentOptions)
             .useDefaultLocationEngine(true)
             .locationEngineRequest(
                 LocationEngineRequest.Builder(750)
                     .setFastestInterval(750)
                     .setPriority(LocationEngineRequest.PRIORITY_HIGH_ACCURACY)
                     .build()
             )
             .build()
     }
 
     private fun startLayerStops(style: Style, features:FeatureCollection){
 
         stopsSource = GeoJsonSource(STOPS_SOURCE_ID,features)
         style.addSource(stopsSource)
 
         // add icon
         style.addImage(STOP_IMAGE_ID,
             ResourcesCompat.getDrawable(resources,R.drawable.bus_stop, activity?.theme)!!)
         // Stops layer
         val stopsLayer = SymbolLayer(STOPS_LAYER_ID, STOPS_SOURCE_ID)
         stopsLayer.withProperties(
                 PropertyFactory.iconImage(STOP_IMAGE_ID),
                 PropertyFactory.iconAllowOverlap(true),
                 PropertyFactory.iconIgnorePlacement(true)
             )
 
         style.addLayerBelow(stopsLayer, "label_country_1")
 
         isStopsLayerStarted = true
     }
 
     /**
      * Setup the Map Layers
      */
     private fun setupLayers(style: Style) {
-        // Stops source
-
-
         // Buses source
         // TODO when adding the buses
         //busesSource = GeoJsonSource(BUSES_SOURCE_ID)
         //style.addSource(busesSource)
 
         /*
         // TODO when adding the buses
         // Buses layer
         val busesLayer = SymbolLayer(BUSES_LAYER_ID, BUSES_SOURCE_ID).apply {
             withProperties(
                 PropertyFactory.iconImage("bus"),
                 PropertyFactory.iconSize(1.0f),
                 PropertyFactory.iconAllowOverlap(true),
                 PropertyFactory.iconRotate(Expression.get("bearing"))
             )
         }
         style.addLayer(busesLayer)
-
          */
     }
     private fun showStopInBottomSheet(stop: Stop?){
         if (stop==null) return
-        bottomLayout?.let { layout ->
-            layout.findViewById<TextView>(R.id.detail_title).text = "${stop.ID} - ${stop.stopDefaultName}"
+        bottomLayout?.let { _ ->
 
+            //layout.findViewById<TextView>(R.id.stopTitleTextView).text = stop.stopDefaultName//"${stop.ID} - ${stop.stopDefaultName}"
+            stopTitleTextView.text = stop.stopDefaultName
+            stopNumberTextView.text = stop.ID
+            linesPassingTextView.text = stop.routesThatStopHereToString()
         }
     }
 
     override fun onStart() {
         super.onStart()
         mapView.onStart()
     }
 
     override fun onResume() {
         super.onResume()
         mapView.onResume()
     }
 
     override fun onPause() {
         super.onPause()
         mapView.onPause()
     }
 
     override fun onStop() {
         super.onStop()
         mapView.onStop()
     }
 
     override fun onLowMemory() {
         super.onLowMemory()
         mapView.onLowMemory()
     }
 
     override fun onDestroy() {
         super.onDestroy()
         mapView.onDestroy()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         mapView.onSaveInstanceState(outState)
     }
 
     private fun observeViewModels() {
         // Observe stops
         stopsViewModel.stopsToShow.observe(viewLifecycleOwner) { stops ->
             stopsShowing = stops
             displayStops(stops)
         }
     }
 
     /**
      * Add the stops to the layers
      */
     private fun displayStops(stops: List<Stop>?) {
         if (stops.isNullOrEmpty()) return
 
         if (stops.size==lastStopsSizeShown){
             Log.d(DEBUG_TAG, "Not updating, we have the same stop (can only increase!)")
             return
         }
 
         val features = stops.mapNotNull { stop ->
             stop.latitude?.let { lat ->
                 stop.longitude?.let { lon ->
                     Feature.fromGeometry(
                         Point.fromLngLat(lon, lat),
                         JsonObject().apply {
                             addProperty("id", stop.ID)
                             addProperty("name", stop.stopDefaultName)
                             addProperty("routes", stop.routesThatStopHereToString()) // Add routes array to JSON object
                         }
                         )
                 }
             }
         }
         Log.d(DEBUG_TAG,"Have put ${features.size} stops to display")
 
         if (isStopsLayerStarted) {
             stopsSource.setGeoJson(FeatureCollection.fromFeatures(features))
             lastStopsSizeShown = features.size
         } else
             map?.let { startLayerStops(mapStyle, FeatureCollection.fromFeatures(features))
                 Log.d(DEBUG_TAG,"Started stops layer on map")
                 lastStopsSizeShown = features.size
             }
     }
 
     companion object {
         private const val STOPS_SOURCE_ID = "stops-source"
         private const val STOPS_LAYER_ID = "stops-layer"
         private const val BUSES_SOURCE_ID = "buses-source"
         private const val BUSES_LAYER_ID = "buses-layer"
         private const val STOP_IMAGE_ID ="bus-stop-icon"
         private const val DEFAULT_CENTER_LAT = 45.0708
         private const val DEFAULT_CENTER_LON = 7.6858
         private const val POSITION_FOUND_ZOOM = 16.5
         private const val NO_POSITION_ZOOM = 17.1
         private const val ACCESS_TOKEN="KxO8lF4U3kiO63m0c7lzqDCDrMUVg1OA2JVzRXxxmYSyjugr1xpe4W4Db5rFNvbQ"
         private const val MAPLIBRE_URL = "https://api.jawg.io/styles/"
         private const val DEBUG_TAG = "BusTO-MapLibreFrag"
 
         /**
          * Use this factory method to create a new instance of
          * this fragment using the provided parameters.
          *
          * @param param1 Parameter 1.
          * @param param2 Parameter 2.
          * @return A new instance of fragment MapLibreFragment.
          */
         // TODO: Rename and change types and number of parameters
         @JvmStatic
         fun newInstance(param1: String, param2: String) =
             MapLibreFragment().apply {
                 arguments = Bundle().apply {
                     putString(ARG_PARAM1, param1)
                     putString(ARG_PARAM2, param2)
                 }
             }
         private fun makeStyleUrl(style: String = "jawg-streets") =
             "${MAPLIBRE_URL+ style}.json?access-token=${ACCESS_TOKEN}"
         private fun makeStyleMapBoxUrl(dark: Boolean) =
              if(dark)
                 "https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json"
             else //"https://basemaps.cartocdn.com/gl/positron-gl-style/style.json"
                 "https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json"
 
         const val OPENFREEMAP_LIBERY = "https://tiles.openfreemap.org/styles/liberty"
 
         const val OPENFREEMAP_BRIGHT = "https://tiles.openfreemap.org/styles/bright"
 
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bottom_sheet_background.xml b/app/src/main/res/drawable/bottom_sheet_background.xml
index 96ea733..9b1165c 100644
--- a/app/src/main/res/drawable/bottom_sheet_background.xml
+++ b/app/src/main/res/drawable/bottom_sheet_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@android:color/white" />
     <corners
-        android:topLeftRadius="10sp"
-        android:topRightRadius="10sp" />
+        android:topLeftRadius="14sp"
+        android:topRightRadius="14sp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_departure_board_24.xml b/app/src/main/res/drawable/ic_baseline_departure_board_24.xml
index 0104e53..e9c8599 100644
--- a/app/src/main/res/drawable/ic_baseline_departure_board_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_departure_board_24.xml
@@ -1,5 +1,6 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M16,1c-2.4,0 -4.52,1.21 -5.78,3.05 0.01,-0.01 0.01,-0.02 0.02,-0.03C9.84,4 9.42,4 9,4c-4.42,0 -8,0.5 -8,4v10c0,0.88 0.39,1.67 1,2.22L2,22c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h8v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1.78c0.61,-0.55 1,-1.34 1,-2.22v-3.08c3.39,-0.49 6,-3.39 6,-6.92 0,-3.87 -3.13,-7 -7,-7zM4.5,19c-0.83,0 -1.5,-0.67 -1.5,-1.5S3.67,16 4.5,16s1.5,0.67 1.5,1.5S5.33,19 4.5,19zM3,13L3,8h6c0,1.96 0.81,3.73 2.11,5L3,13zM13.5,19c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM16,13c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM16.5,4L15,4v5l3.62,2.16 0.75,-1.23 -2.87,-1.68z"/>
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+        android:tint="?attr/colorOnPrimary">
+    <path android:fillColor="@color/black" android:pathData="M16,1c-2.4,0 -4.52,1.21 -5.78,3.05 0.01,-0.01 0.01,-0.02 0.02,-0.03C9.84,4 9.42,4 9,4c-4.42,0 -8,0.5 -8,4v10c0,0.88 0.39,1.67 1,2.22L2,22c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h8v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1.78c0.61,-0.55 1,-1.34 1,-2.22v-3.08c3.39,-0.49 6,-3.39 6,-6.92 0,-3.87 -3.13,-7 -7,-7zM4.5,19c-0.83,0 -1.5,-0.67 -1.5,-1.5S3.67,16 4.5,16s1.5,0.67 1.5,1.5S5.33,19 4.5,19zM3,13L3,8h6c0,1.96 0.81,3.73 2.11,5L3,13zM13.5,19c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM16,13c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM16.5,4L15,4v5l3.62,2.16 0.75,-1.23 -2.87,-1.68z"/>
 </vector>
diff --git a/app/src/main/res/drawable/navigation_right.xml b/app/src/main/res/drawable/navigation_right.xml
new file mode 100644
index 0000000..4f6f0b3
--- /dev/null
+++ b/app/src/main/res/drawable/navigation_right.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+        android:tint="?attr/colorOnPrimary"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,21L6,12C6,9.24 8.24,7 11,7L17,7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M18,7 L14,3m4,4 l-4,4"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_map_libre.xml b/app/src/main/res/layout/fragment_map_libre.xml
index d8c12a3..bdd4b57 100644
--- a/app/src/main/res/layout/fragment_map_libre.xml
+++ b/app/src/main/res/layout/fragment_map_libre.xml
@@ -1,58 +1,135 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:theme="@style/MapTheme"
     tools:context=".fragments.MapLibreFragment">
 
     <org.maplibre.android.maps.MapView
             android:id="@+id/libreMapView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
     />
 
     <!-- Bottom Sheet for details -->
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/bottom_sheet"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:orientation="vertical"
         android:background="@drawable/bottom_sheet_background"
         android:elevation="8dp"
-        android:padding="16dp"
+        android:padding="13dp"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
         app:behavior_hideable="true"
         app:behavior_peekHeight="0dp">
 
         <!-- Your detail content goes here -->
         <TextView
-            android:id="@+id/detail_title"
+                android:id="@+id/stopNumberTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentStart="true"
+                android:layout_toStartOf="@id/cardButton1"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="2dp"
+                android:fontFamily="@font/pitagon_semibold"
+
+        />
+        <TextView
+            android:id="@+id/stopTitleTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:layout_below="@id/stopNumberTextView"
+            android:layout_alignParentStart="true"
+            android:layout_toStartOf="@id/cardButton1"
+            android:layout_marginBottom="5dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:fontFamily="@font/pitagon_regular"
+        />
+        <TextView
+                android:id="@+id/linesPassingTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:layout_below="@id/stopTitleTextView"
+                android:layout_alignParentStart="true"
+                android:layout_toStartOf="@id/cardButton1"
+                android:layout_marginBottom="5dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+        />
+        <androidx.cardview.widget.CardView
+                android:id="@+id/cardButton1"
+                android:layout_width="50sp"
+                android:layout_height="50sp"
+                android:layout_margin="5sp"
+                app:cardCornerRadius="25sp"
+                app:cardElevation="5dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:layout_alignParentTop="true"
+                android:layout_toStartOf="@id/cardButton2"
+                android:backgroundTint="?android:attr/colorPrimary">
+
+            <ImageView
+                    android:layout_width="30sp"
+                    android:layout_height="30sp"
+                    android:layout_gravity="center"
+                    android:tint="?colorOnPrimary"
+                    app:srcCompat="@drawable/ic_baseline_departure_board_24" />
+
+        </androidx.cardview.widget.CardView>
+
+        <androidx.cardview.widget.CardView
+                android:id="@+id/cardButton2"
+                android:layout_width="50sp"
+                android:layout_height="50sp"
+                android:layout_margin="5sp"
+                app:cardCornerRadius="25sp"
+                app:cardElevation="5dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true"
+                android:backgroundTint="?android:attr/colorPrimary">
+
+            <ImageView
+                    android:layout_width="30sp"
+                    android:layout_height="30sp"
+                    android:layout_gravity="center"
+                    app:srcCompat="@drawable/navigation_right" />
+
+        </androidx.cardview.widget.CardView>
+
 
         <!-- Additional details -->
 
         <!-- Close button -->
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="30sp"
+            android:layout_height="30sp"
             app:srcCompat="@drawable/baseline_close_16"
             android:id="@+id/btnClose"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintLeft_toRightOf="@id/businfo_title"
-
-            android:layout_alignParentTop="true"
+            android:layout_margin="15dp"
+            android:layout_below="@id/cardButton2"
+            android:background="@drawable/ball"
+            android:tint="?colorOnPrimary"
+            android:layout_alignParentEnd="true"
             app:layout_constraintHorizontal_bias="0.5"
 
-            app:layout_constraintStart_toEndOf="@+id/businfo_title"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="2dp"
-            android:layout_marginStart="6dp"
             />
-    </LinearLayout>
+    </RelativeLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index 48c0dde..d6bf14f 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <style name="FavTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="colorPrimary">@color/blue_500</item>
         <item name="colorPrimaryDark">@color/blue_700</item>
         <item name="colorAccent">@color/teal_500</item>
     </style>
 
     <style name="AboutTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <item name="colorPrimary">@color/teal_500</item>
         <item name="colorPrimaryDark">@color/teal_900</item>
         <item name="colorAccent">@color/blue_700</item>
         <item name="colorOnPrimary">@color/white</item>
 
     </style>
 
     <style name="MapTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="colorPrimary">@color/orange_500</item>
         <item name="colorPrimaryDark">@color/orange_700</item>
         <item name="colorAccent">@color/teal_500</item>
+        <item name="colorOnPrimary">@color/white</item>
+
     </style>
 
     <style name="preferenceTheme" parent="PreferenceThemeOverlay"></style>
 
 
 
 </resources>
\ No newline at end of file