diff --git a/res/drawable-xxxhdpi/bus_stop_background.xml b/res/drawable/bus_stop_background.xml
similarity index 100%
copy from res/drawable-xxxhdpi/bus_stop_background.xml
copy to res/drawable/bus_stop_background.xml
diff --git a/res/drawable-xxxhdpi/bus_stop_background.xml b/res/drawable/bus_stop_background_pattern.xml
similarity index 69%
rename from res/drawable-xxxhdpi/bus_stop_background.xml
rename to res/drawable/bus_stop_background_pattern.xml
index 3d9ef7a..3f86294 100644
--- a/res/drawable-xxxhdpi/bus_stop_background.xml
+++ b/res/drawable/bus_stop_background_pattern.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <solid android:color="@color/blue_500" />
+    <solid android:color="@color/line_pattern_color" />
 
     <corners android:radius="100dp" />
 
 </shape>
\ No newline at end of file
diff --git a/res/drawable/line.xml b/res/drawable/line.xml
new file mode 100644
index 0000000..f2c2c6a
--- /dev/null
+++ b/res/drawable/line.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <solid android:color="@color/grey_100" />
+
+    <padding
+            android:top="10dp"
+            android:left="10dp"
+            android:right="10dp"
+            android:bottom="10dp"/>
+</shape>
\ No newline at end of file
diff --git a/res/drawable/line_drawable.xml b/res/drawable/line_drawable.xml
new file mode 100644
index 0000000..86276c2
--- /dev/null
+++ b/res/drawable/line_drawable.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+            android:state_pressed="true"
+            android:drawable="@drawable/line"/>
+
+    <item
+            android:drawable="@drawable/line"/>
+</selector>
\ No newline at end of file
diff --git a/res/drawable/thumb.xml b/res/drawable/thumb.xml
new file mode 100644
index 0000000..f7d476f
--- /dev/null
+++ b/res/drawable/thumb.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <corners
+            android:topLeftRadius="40dp"
+            android:topRightRadius="40dp"
+            android:bottomLeftRadius="40dp"
+            android:bottomRightRadius="40dp"
+    />
+
+    <padding
+            android:paddingLeft="22dp"
+            android:paddingRight="22dp" />
+
+    <solid android:color="@color/grey_600" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/thumb_drawable.xml b/res/drawable/thumb_drawable.xml
new file mode 100644
index 0000000..d8556ff
--- /dev/null
+++ b/res/drawable/thumb_drawable.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+            android:state_pressed="true"
+            android:drawable="@drawable/thumb"/>
+
+    <item
+            android:drawable="@drawable/thumb"/>
+</selector>
\ No newline at end of file
diff --git a/res/layout/arrivals_nearby_card.xml b/res/layout/arrivals_nearby_card.xml
index a728c51..8c10ca7 100644
--- a/res/layout/arrivals_nearby_card.xml
+++ b/res/layout/arrivals_nearby_card.xml
@@ -1,98 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView
         xmlns:card_view="http://schemas.android.com/apk/res-auto"
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/stop_cardView"
         android:foreground="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        card_view:cardCornerRadius="1dp"
-        android:layout_margin="8dp" android:padding="4dp">
+        card_view:cardCornerRadius="5dp"
+        android:layout_margin="5dp" android:padding="6dp">
 
 
     <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="8dp"
     >
         <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
                   android:id="@+id/lineNameTextView"
                   android:text="10" android:textSize="22sp"
                   android:textColor="@color/orange_700"
-                  android:layout_marginLeft="20dp"
-                  android:layout_marginStart="20dp"
+                  android:layout_marginLeft="10dp"
+                  android:layout_marginStart="10dp"
                   android:layout_alignParentLeft="true"
-                  android:layout_margin="10dp"
-                  android:textStyle="normal" android:layout_marginRight="20dp" android:layout_marginEnd="20dp"
-                  android:layout_marginBottom="20dp"/>
+                  android:gravity="center_vertical"
+                  android:textStyle="normal" android:layout_marginRight="10dp" android:layout_marginEnd="10dp"
+                  android:layout_marginBottom="10dp" android:layout_marginTop="10dp"/>
 
         <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/lineDirectionTextView"
-                android:text="piazza statuto"
+                android:text="MADONNA DEL PILONE, LARGO TABACCHI"
                 android:textSize="20sp"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:layout_toLeftOf="@id/arrivalsDistanceTextView"
                 android:layout_toRightOf="@id/lineNameTextView"
+                android:layout_toEndOf="@id/lineNameTextView"
                 android:textStyle="normal"
                 android:layout_marginRight="6dp"
                 android:layout_marginEnd="6dp"
                 android:layout_alignBaseline="@id/lineNameTextView"
                 android:layout_marginLeft="10dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginStart="10dp" />
+                android:layout_marginStart="10dp"/>
         <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
                   android:layout_alignBaseline="@id/arrivalsTimeTextView"
                   android:textAppearance="?android:attr/textAppearanceMedium"
                   android:id="@+id/arrivalsDescriptionTextView" android:text="@string/bus_arriving_at"
                   android:textSize="@dimen/text_size_nearby_indicate"
                   android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginStart="8dp"
                   android:layout_marginRight="8dp" android:layout_marginEnd="8dp" android:layout_marginBottom="8dp"/>
         <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
                   android:layout_toRightOf="@id/arrivalsDescriptionTextView"
                   android:layout_marginLeft="6dp" android:layout_marginTop="6dp" android:layout_marginStart="6dp"
                   android:layout_marginRight="8dp" android:layout_marginEnd="8dp" android:layout_marginBottom="8dp"
                   android:id="@+id/arrivalsTimeTextView" android:text="Orario" android:textSize="@dimen/text_size_nearby"
                   android:layout_below="@id/lineDirectionTextView"
 
                   android:textAppearance="?android:attr/textAppearanceLarge"
                   android:layout_alignParentRight="true"
                   android:layout_alignParentEnd="true"/>
         <!-- Second line -->
         <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
                   android:layout_marginBottom="10dp"
                   android:id="@+id/arrivalStopDescription"
                   android:text="@string/arrivals_card_at_the_stop" android:textSize="@dimen/text_size_nearby_indicate"
                   android:textAppearance="?android:attr/textAppearanceMedium"
                   android:layout_below="@id/arrivalsDescriptionTextView"
                   android:layout_margin="@dimen/default_textView_margin"
                   android:layout_alignBaseline="@id/arrivalStopName"
         />
         <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
                   android:layout_toRightOf="@id/arrivalStopDescription"
                   android:layout_toEndOf="@id/arrivalStopDescription"
                   android:layout_below="@id/arrivalsTimeTextView"
                   android:layout_marginBottom="10dp"
                   android:id="@+id/arrivalStopName" android:text="Prova prova" android:textSize="@dimen/text_size_nearby"
                   android:layout_marginLeft="10dp"
                   android:layout_marginStart="10dp"
                   android:textAppearance="?android:attr/textAppearanceLarge"
         />
         <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
-                  android:layout_margin="@dimen/default_textView_margin"
+                  android:layout_marginTop="12dp"
                   android:layout_marginBottom="10dp"
-                  android:layout_marginEnd="15dp"
+                  android:layout_marginEnd="12dp"
+                  android:layout_marginRight="12dp"
                   android:id="@+id/arrivalsDistanceTextView" android:text="200 m" android:textSize="15sp"
                   android:layout_marginLeft="15dp"
                   android:layout_marginStart="15dp"
                   android:textAppearance="?android:attr/textAppearanceSmall"
                   android:layout_alignParentRight="true"
                   android:layout_alignParentEnd="true"
         />
 
     </RelativeLayout>
 
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/res/layout/entry_bus_stop.xml b/res/layout/entry_bus_stop.xml
index f6cd113..6914fb3 100644
--- a/res/layout/entry_bus_stop.xml
+++ b/res/layout/entry_bus_stop.xml
@@ -1,74 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:paddingTop="8dip"
-    android:paddingBottom="8dip" >
+    android:paddingBottom="8dip"
+                android:background="?android:attr/selectableItemBackground"
+>
 
     <TextView
             android:id="@+id/busStopName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="16sp"
             android:layout_marginStart="16sp"
             android:layout_marginRight="16sp"
             android:layout_marginEnd="16sp"
             android:layout_marginTop="2sp"
             android:layout_alignParentTop="true"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_toLeftOf="@+id/busStopID"
             android:layout_toStartOf="@+id/busStopID"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/blue_500"/>
 
     <TextView
             android:id="@+id/busStopLocality"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="16sp"
             android:layout_marginStart="16sp"
             android:layout_marginRight="16sp"
             android:layout_marginEnd="16sp"
             android:layout_below="@id/busStopName"
             android:layout_toLeftOf="@+id/busStopID"
             android:layout_toStartOf="@+id/busStopID"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:textColor="@color/grey_600"
             android:textAppearance="?android:attr/textAppearanceMedium"/>
 
     <TextView
             android:id="@+id/routesThatStopHere"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/busStopLocality"
             android:layout_marginLeft="16sp"
             android:layout_marginStart="16sp"
             android:layout_marginRight="16sp"
             android:layout_marginEnd="16sp"
             android:gravity="center_vertical"
             android:layout_toLeftOf="@id/busStopID"
             android:layout_toStartOf="@id/busStopID"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/grey_600"/>
 
 
     <TextView
             android:id="@+id/busStopID"
             android:layout_width="70dip"
             android:layout_height="70dip"
             android:layout_marginRight="16sp"
             android:layout_marginEnd="16sp"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
             android:layout_alignTop="@id/busStopName"
             android:layout_centerVertical="true"
             android:background="@drawable/bus_stop_background"
             android:gravity="center"
             android:textColor="@color/grey_100"
             android:textSize="21sp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_lines.xml b/res/layout/fragment_lines.xml
index f82eeb0..e0c393a 100644
--- a/res/layout/fragment_lines.xml
+++ b/res/layout/fragment_lines.xml
@@ -1,103 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".fragments.LinesFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
         <Spinner
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:id="@+id/linesSpinner"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/linesLabel"
                 android:layout_marginLeft="16dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="8dp"
 
         />
 
         <Spinner
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:id="@+id/patternsSpinner"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="@+id/linesSpinner"
                 app:layout_constraintTop_toBottomOf="@id/routeDescriptionTextView"
                 android:layout_marginTop="16dp" />
 
         <TextView
                 android:text="@string/line"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/linesLabel"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 android:layout_marginTop="8dp"
                 android:layout_marginLeft="16dp"
                 android:layout_marginStart="16dp"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 app:layout_constraintBottom_toBottomOf="@+id/linesSpinner"
 
                 android:gravity="center_vertical"
 
         />
 
         <TextView
                 android:text="Descr"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:id="@+id/routeDescriptionTextView"
                 app:layout_constraintStart_toStartOf="@id/linesSpinner"
                 app:layout_constraintTop_toBottomOf="@id/linesSpinner"
                 app:layout_constraintEnd_toEndOf="parent"
 
                 android:layout_marginTop="8dp"
                 android:layout_marginLeft="16dp"
                 android:layout_marginStart="16dp"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
 
                 android:gravity="center_vertical"
 
                 android:layout_marginRight="16dp" android:layout_marginEnd="16dp"/>
         <View
                 android:id="@+id/divider"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="?android:attr/listDivider"
                 app:layout_constraintTop_toBottomOf="@id/patternsSpinner"
                 android:layout_marginTop="8dp"/>
         <androidx.recyclerview.widget.RecyclerView
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:id="@+id/patternStopsRecyclerView"
                 app:layout_constraintTop_toBottomOf="@+id/divider"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintVertical_bias="0.0"
                 android:layout_marginBottom="8dp"
                 android:layout_marginTop="0dp"
                 android:layout_margin="4dp"
-                app:layout_constraintHorizontal_bias="0.0" />
+                app:layout_constraintHorizontal_bias="0.0"
+                app:fastScrollEnabled="true"
+                app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
+                app:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
+                app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
+                app:fastScrollVerticalTrackDrawable="@drawable/line_drawable"
+
+        />
         <!--
         <TextView
                 android:text="TextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/textView2"
                 app:layout_constraintTop_toBottomOf="@+id/linesSpinner"
                 android:layout_marginTop="16dp"
                 app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginLeft="16dp"
                 android:layout_marginStart="16dp" />
                 -->
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/stop_card.xml b/res/layout/stop_card.xml
index b707222..c18c1c1 100644
--- a/res/layout/stop_card.xml
+++ b/res/layout/stop_card.xml
@@ -1,117 +1,117 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView
 		xmlns:card_view="http://schemas.android.com/apk/res-auto"
 		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/stop_cardView"
 		android:foreground="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		card_view:cardCornerRadius="1dp"
-		android:layout_margin="8dp" android:padding="4dp">
+		card_view:cardCornerRadius="5dp"
+		android:layout_margin="5dp" android:padding="4dp">
 
 	<LinearLayout
 			android:orientation="horizontal"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent" android:gravity="center_vertical">
 		<RelativeLayout
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content" android:layout_weight="1">
 
 			<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:text="Title"
 					android:id="@+id/stop_nameText"
 					style="@style/TextAppearance.AppCompat.Medium"
 					android:layout_alignParentLeft="true"
 					android:layout_alignParentStart="true" android:paddingLeft="6dp"
 					android:textColor="@color/primary_material_dark" android:layout_marginBottom="6dp"
 					android:layout_marginTop="6dp" android:layout_marginLeft="6dp"
 					android:layout_marginStart="6dp" android:layout_marginRight="6dp" android:layout_marginEnd="6dp"/>
 			<TextView
 					android:id="@+id/stop_numberText"
 					android:layout_width="wrap_content"
 					android:layout_height="20dp"
 					android:text="stopNumber"
 					android:gravity="center_vertical"
 					android:textAppearance="@style/TextAppearance.AppCompat.Medium"
 					android:layout_below="@id/stop_nameText"
 					android:textIsSelectable="true" android:layout_marginTop="8dp"
 					android:textColor="@color/orange_500" android:layout_marginLeft="12dp"
 					android:layout_marginStart="12dp" android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
 					android:layout_marginBottom="8dp"/>
 			<TextView
 					android:text="TextView"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginRight="6dp"
 					android:layout_marginLeft="10dp"
 					android:minWidth="50dp"
 					android:id="@+id/stop_distanceTextView" android:layout_toEndOf="@+id/stop_numberText"
 					android:layout_toRightOf="@id/stop_numberText"
 					android:layout_alignTop="@+id/stop_numberText"
 			/>
 
 			<!--
         <LinearLayout
                 android:orientation="horizontal"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent" android:id="@+id/row1" android:layout_below="@+id/stopTitle">
             <TextView
                     android:id="@+id/txtLine1_1"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
                     android:text="Name"
                     android:gravity="center_vertical"
                     android:textSize="14sp"
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="5dp" android:layout_margin="3dp"/>
             <TextView
                     android:id="@+id/txtPass1_1"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
                     android:text="Name"
                     android:gravity="center_vertical"
 
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="5dp" android:layout_margin="3dp"/>
             <TextView
                     android:id="@+id/txtPass2"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
                     android:text="Name"
                     android:gravity="center_vertical"
                     android:textSize="14sp"
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="5dp" android:layout_margin="3dp"/>
             <TextView
                     android:id="@+id/txtPass3"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
                     android:text="Name"
                     android:gravity="center_vertical"
                     android:textSize="14sp"
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="5dp" android:layout_margin="3dp"/>
         </LinearLayout>
         -->
 		</RelativeLayout>
 		<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text=""
 				android:id="@+id/stop_linesText"
 				android:layout_toRightOf="@+id/stop_distanceTextView"
 				android:minWidth="80dp"
 				android:layout_alignParentRight="true"
 				android:layout_alignParentEnd="true" android:layout_alignBottom="@+id/stop_distanceTextView"
 				android:layout_alignTop="@+id/stop_nameText"
 				android:nestedScrollingEnabled="true"
 				android:gravity="center_horizontal|center"
 				android:textColor="@color/blue_700" android:textSize="14sp" android:layout_weight="1"
 				android:padding="5dp" android:maxWidth="100sp" android:layout_gravity="center_vertical|end"
 				android:layout_marginRight="5dp"/>
 	</LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/res/layout/bus_stop_line_elmt.xml b/res/layout/stop_line_element.xml
similarity index 78%
rename from res/layout/bus_stop_line_elmt.xml
rename to res/layout/stop_line_element.xml
index 75e65ec..d057fc7 100644
--- a/res/layout/bus_stop_line_elmt.xml
+++ b/res/layout/stop_line_element.xml
@@ -1,96 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                                    xmlns:app="http://schemas.android.com/apk/res-auto"
-                                                   xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+                                                   xmlns:tools="http://schemas.android.com/tools"
+                                                   android:background="?android:attr/selectableItemBackground"
+                                                   android:layout_width="match_parent"
                                                    android:layout_height="wrap_content">
 
     <TextView
             android:id="@+id/busStopID"
             android:layout_width="60dp"
             android:layout_height="60dp"
 
             android:layout_centerVertical="true"
-            android:background="@drawable/bus_stop_background"
+            android:background="@drawable/bus_stop_background_pattern"
             android:gravity="center"
             android:textColor="@color/grey_100"
             android:textSize="20sp"
             android:layout_margin="-1dp"
             app:layout_constraintStart_toStartOf="parent"
             android:layout_marginLeft="14dp"
             android:layout_marginStart="14dp"
                 app:layout_constraintTop_toBottomOf="@+id/topStub"/>
     <View
             android:layout_width="8dp"
-            android:layout_height="16dp" android:id="@+id/topStub"
-            android:background="@color/blue_500"
+            android:layout_height="6dp" android:id="@+id/topStub"
+            android:background="@color/line_pattern_color"
 
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="@id/busStopID"
-            android:layout_marginLeft="25dp"
-            android:layout_marginStart="25dp"/>
+            android:layout_marginLeft="26dp"
+            android:layout_marginStart="26dp"/>
     <View
             android:layout_width="8dp"
             android:layout_height="0dp" android:id="@+id/bottomStub"
-            android:background="@color/blue_500"
+            android:background="@color/line_pattern_color"
 
             app:layout_constraintTop_toBottomOf="@id/busStopID"
             app:layout_constraintStart_toStartOf="@id/busStopID"
             app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginLeft="25dp"
-            android:layout_marginStart="25dp"/>
+            android:layout_marginLeft="26dp"
+            android:layout_marginStart="26dp"/>
 
     <TextView
             android:id="@+id/busStopName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/blue_500"
+            android:textColor="@color/line_pattern_color"
             app:layout_constraintStart_toEndOf="@id/busStopID"
             app:layout_constraintTop_toTopOf="@id/busStopID"
             android:layout_marginStart="10dp"
             android:layout_marginLeft="10dp"
             android:layout_marginTop="0dp"
             android:layout_marginEnd="10dp"
 
             android:layout_marginRight="10dp"
             app:layout_constraintEnd_toEndOf="parent"/>
 
     <TextView
             android:id="@+id/busStopLocality"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginRight="16dp"
             android:layout_marginEnd="16dp"
             app:layout_constraintTop_toBottomOf="@id/busStopName"
             app:layout_constraintStart_toStartOf="@id/busStopName"
             android:layout_marginStart="3dp"
             android:layout_marginLeft="3dp"
             android:layout_marginTop="4dp"
 
             android:textColor="@color/grey_600"
             android:textAppearance="?android:attr/textAppearanceMedium" app:layout_constraintEnd_toEndOf="parent"/>
 
     <TextView
             android:id="@+id/routesThatStopHere"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_below="@id/busStopLocality"
             android:layout_marginRight="25dp"
             android:layout_marginEnd="25dp"
             android:gravity="center_vertical"
 
             app:layout_constraintStart_toStartOf="@id/busStopName"
             android:layout_marginStart="10dp"
             android:layout_marginLeft="10dp"
 
-
             app:layout_constraintTop_toBottomOf="@id/busStopLocality"
             android:layout_marginTop="5dp"
 
-
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/grey_600" app:layout_constraintEnd_toEndOf="parent"/>
+            android:textColor="@color/grey_600"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginBottom="9dp"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8ebd3c7..c2f96f2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,188 +1,192 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
 
     <string name="app_description">Stai utilizzando l\'ultimo ritrovato in materia di rispetto della tua privacy.</string>
     <string name="search">Cerca</string>
     <string name="qrcode">QR Code</string>
     <string name="insert_bus_stop_number">Numero fermata</string>
     <string name="insert_bus_stop_name">Nome fermata</string>
     <string name="insert_bus_stop_number_error">Inserisci il numero della fermata</string>
     <string name="insert_bus_stop_name_error">Inserisci il nome della fermata</string>
     <string name="network_error">Verifica l\'accesso ad Internet!</string>
     <string name="no_bus_stop_have_this_name">Sembra che nessuna fermata abbia questo nome</string>
     <string name="no_arrivals_stop">Nessun passaggio trovato alla fermata</string>
     <string name="parsing_error">Errore di lettura del sito 5T/GTT (dannato sito!)</string>
     <string name="passages">Fermata: %1$s</string>
     <string name="line">Linea</string>
     <string name="lines">Linee</string>
 
     <string name="line_fill">Linea: %1$s</string>
     <string name="lines_fill">Linee: %1$s</string>
     <string name="results">Scegli la fermata…</string>
     <string name="no_passages">Nessun passaggio</string>
     <string name="no_qrcode">Nessun QR code</string>
     <string name="action_favorites">Preferiti</string>
     <string name="action_help">Aiuto</string>
     <string name="action_about">Informazioni</string>
     <string name="action_about_more">Più informazioni</string>
     <string name="action_wiki">Contribuisci</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/it/</string>
     <string name="action_source">Codice sorgente</string>
     <string name="action_licence">Licenza</string>
     <string name="action_author">Incontra l\'autore</string>
     <string name="added_in_favorites">Fermata aggiunta ai preferiti</string>
     <string name="cant_add_to_favorites">Impossibile aggiungere ai preferiti (memoria piena o database corrotto?)!</string>
     <string name="title_activity_favorites">Preferiti</string>
     <string name="title_activity_map">Mappa</string>
     <string name="tip_add_favorite">Nessun preferito? Arghh!\nSchiaccia sulla stella di una fermata per aggiungerla a questa lista!</string>
     <string name="action_remove_from_favourites">Rimuovi</string>
     <string name="action_rename_bus_stop_username">Rinomina</string>
     <string name="dialog_rename_bus_stop_username_title">Rinomina fermata</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about">Informazioni</string>
     <string name="howDoesItWork"><b>Tocca la stella</b> per aggiungere la fermata ai preferiti\n\n<b>Come leggere gli orari:</b>
         \n<b>&#160;&#160;&#160;12:56*</b> Orario in tempo reale\n<b>&#160;&#160;&#160;12:56</b> &#160; Orario programmato\n\n<b>Trascina giù per aggiornare</b> l\'orario.
         \n<b>Tocca a lungo</b> su <b>Fonte Orari</b> per cambiare sorgente degli orari di arrivo.
     </string>
     <string name="hint_button">OK!</string>
     <string name="about_history">
 <![CDATA[
         <h1>Benvenuto!</h1>
         
         <p>Grazie per aver scelto BusTO, un\'app <b>indipendente</b> da GTT/5T, per spostarsi a Torino attraverso <b>software libero</b>:</p>
 		
 		<p>Perché usare BusTO?</p>
 		<p>
         - Non sei <b>monitorato</b><br>
         - Non ci sono <b>pubblicità</b><br>
         - La tua <b>privacy</b> è al sicuro<br>
         - Inoltre l\'app è molto leggera!<br>
         </p>
 
         <h2>Come Funziona?</h2>
         <p>Quest\'app ottiene i passaggi dei bus in tempo reale filtrando i dati forniti pubblicamente sul sito <b>www.gtt.to.it</b> o <i>www.5t.torino.it</i> "per uso personale".</p>
 
 		<p>Ingredienti:<br>
 		- <b>Fabio Mazza</b> attuale rockstar developer anziano.<br>
 		- <b>Andrea Ugo</b> attuale rockstar developer in formazione.<br>
 		- <b>Silviu Chiriac</b> designer del logo 2021.<br>
 		- <b>Marco M</b> formidabile tester e cacciatore di bug.<br>
 		- <b>Ludovico Pavesi</b> ex rockstar developer anziano asd.<br>
 		- <b>Valerio Bozzolan</b> attuale manutentore.<br>
 		- <b>Marco Gagino</b> apprezzato ex collaboratore, ideatore icona e grafica.<br>
 		- <b>JSoup</b> libreria per "<i>web scaping</i>".<br>
 		- <b>Google</b> icone e libreria di supporto per il Material Design.<br>
 		- Tutti i contributori!
 		</p>
 
 		<h2>Licenze</h2>
 		<p>L\'app e il relativo codice sorgente sono distribuiti sotto la licenza <i>GNU General Public License v3+</i>.
 		Ciò <b>significa</b> che puoi usare, studiare, migliorare e ricondividere quest\'app con <b>qualunque mezzo</b> e per <b>qualsiasi scopo</b>: a patto di mantenere sempre questi diritti a tua volta e di dare credito a Valerio Bozzolan.
 		</p>
 		
 		<h2>Note</h2>
 		<p>Quest\'applicazione è rilasciata <b>nella speranza che sia utile a tutti</b> ma senza NESSUNA garanzia.</p>
 		<p>Buon utilizzo! :)</p>
     ]]>
     </string>
     <string name="query_too_short">Nome troppo corto, digita più caratteri e riprova</string>
     <string name="route_towards_destination">%1$s verso %2$s</string>
     <string name="route_towards_unknown">%s (destinazione sconosciuta)</string>
     <string name="internal_error">Errore interno inaspettato, impossibile estrarre dati dal sito GTT/5T</string>
     <string name="action_view_on_map">Visualizza sulla mappa</string>
     <string name="cannot_show_on_map_no_activity">Non trovo un\'applicazione dove mostrarla</string>
     <string name="cannot_show_on_map_no_position">Posizione della fermata non trovata</string>
 
 
     <string name="nearby_stops_message">Fermate vicine</string>
     <string name="position_searching_message">Ricerca della posizione in corso&#8230;</string>
     <string name="no_stops_nearby">Nessuna fermata nei dintorni</string>
     <string name="main_menu_pref">Preferenze</string>
     <string name="database_update_msg_inapp">Aggiornamento del database&#8230;</string>
     <string name="database_update_msg_notif">Aggiornamento del database</string>
     <string name="database_update_req">Aggiornamento database forzato</string>
     <string name="database_update_req_descr">Tocca per aggiornare ora il database</string>
     <string name="pref_num_elements">Numero minimo di fermate</string>
     <string name="num_stops_nearby_not_number">Il numero di fermate da ricercare non è valido</string>
     <string name="invalid_number">Valore errato, inserisci un numero</string>
     <string name="title_activity_settings">Impostazioni</string>
     <string name="settings_search_radius">Distanza massima di ricerca (m)</string>
     <string name="settings_experimental">Funzionalità sperimentali</string>
     <string name="action_settings">Impostazioni</string>
     <string name="general_settings">Generali</string>
     <string name="pref_recents_group_title">Fermate recenti</string>
     <string name="settings_group_general">Impostazioni generali</string>
     <string name="settings_group_database">Gestione del database</string>
     <string name="settings_reset_database">Comincia aggiornamento manuale del database</string>
 
 
     <string name="enable_position_message_map">Consenti l\'accesso alla posizione per mostrarla sulla mappa</string>
     <string name="enableGpsText">Abilitare il GPS</string>
     <string name="bus_arriving_at">arriva alle</string>
     <string name="arrivals_card_at_the_stop">alla fermata</string>
     <string name="show_arrivals">Mostra arrivi</string>
     <string name="show_stops">Mostra fermate</string>
     <string name="nearby_arrivals_message">Arrivi qui vicino</string>
     <string name="removed_from_favorites">Fermata rimossa dai preferiti</string>
 
     <!--
     Map view buttons strings
     !-->
     <string name="bt_center_map_description">La mia posizione</string>
     <string name="bt_follow_me_description">Segui posizione</string>
 
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Fonte orari: %1$s</string>
     <string name="fivetapifetcher">App GTT</string>
     <string name="gttjsonfetcher">Sito GTT</string>
     <string name="fivetscraper">Sito 5T Torino</string>
     <string name="source_mato">App Muoversi a Torino</string>
     <string name="undetermined_source">Sconosciuta</string>
 
     <string name="arrival_source_changing">Cambiamento sorgente orari…</string>
     <string name="change_arrivals_source_message">Premi a lungo per cambiare la sorgente degli orari</string>
 
 
     <string name="default_notification_channel_description">Canale unico delle notifiche</string>
     <string name="database_notification_channel">Database</string>
     <string name="database_notification_channel_desc">Informazioni sul database (aggiornamento)</string>
 
 
     <string name="too_many_permission_asks">Chiesto troppe volte per il permesso %1$s</string>
     <string name="permission_storage_maps_msg">Non si può usare questa funzionalità senza il permesso di archivio</string>
     <string name="storage_permission">di archivio</string>
     <string name="message_crash">Un bug ha fatto crashare l\'app!
         \nPremi \"OK\" per inviare il report agli sviluppatori via email, così potranno scovare e risolvere il tuo bug!
         \nIl report contiene piccole informazioni non sensibili sulla configurazione del tuo telefono e sullo stato dell\'app al momento del crash.
     </string>
     <string name="acra_email_message">L\'applicazione è crashata, e il crash report è stato messo negli allegati. Se vuoi, descrivi cosa stavi facendo prima che si interrompesse: \n</string>
     <string name="nav_arrivals_text">Arrivi</string>
     <string name="nav_map_text">Mappa</string>
     <string name="nav_favorites_text">Preferiti</string>
     <string name="drawer_open">Apri drawer</string>
     <string name="drawer_close">Chiudi drawer</string>
     <string name="experiments">Esperimenti</string>
     <string name="donate_now">Offrici un caffè</string>
     <string name="map">Mappa</string>
     <string name="stop_search_view_title">Ricerca fermate</string>
     <string name="app_version">Versione app</string>
     <string name="arrival_times">Orari di arrivo</string>
 
     <!--  Preferences -->
     <string name="requesting_db_update">Richiesto aggiornamento del database</string>
 
 
 
     <string name="pref_directions_capitalize">Mostra direzioni in maiuscolo</string>
     <string-array name="directions_capitalize">
         <item>Non cambiare</item>
         <item>Tutto in maiuscolo</item>
         <item>Solo la prima lettera maiuscola</item>
     </string-array>
+    <string name="pref_lines_click_msg">Mostra arrivi quando tocchi una fermata</string>
+    <string name="pref_experimental_msg">Abilita esperimenti</string>
+
+
 
     <!-- lines -->
-    <string name="long_press_for_options">Tocca a lungo per le opzioni</string>
+    <string name="long_press_stop_4_options">Tocca a lungo la fermata per le opzioni</string>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 800aec7..8f32e5f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,20 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <color name="orange_500">#ff9800</color>
     <color name="orange_700">#F57C00</color>
     <color name="blue_500">#2196F3</color>
+    <color name="blue_620">#2a65e8</color>
     <color name="blue_700">#2060dd</color> <!-- #1976D2 -->
+
+    <color name="blue_mid_2">#2378e8</color>
+    <color name="blue_c_or_700">#0079f5</color>
+
     <color name="teal_500">#009688</color>
     <color name="teal_300">#4DB6AC</color>
     <color name="teal_200">#80cbc4</color>
     <color name="grey_100">#F5F5F5</color>
     <color name="grey_600">#757575</color>
     <!--<color name="white">#FFFFFF</color>
     <color name="accent">#009688</color>-->
     <color name="metro_red">#DE0908</color>
     <color name="blue_extraurbano">#2060DD</color>
     <color name="white">#FFFFFF</color>
     <color name="black">#000000</color>
+    <color name="line_pattern_color">@color/blue_mid_2</color><!-- 2e8df0-->
 
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 06b37fd..31ee1ec 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,207 +1,210 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="app_name" translatable="false">BusTO</string>
     <string name="app_name_full" translatable="false">Libre BusTO</string>
     <string name="app_name_debug" translatable="false">BusTO dev</string>
     <string name="app_description">You\'re using the latest in technology when it comes to respecting your privacy.
     </string>
     <string name="search">Search</string>
     <string name="qrcode">Scan QR Code</string>
     <string name="insert_bus_stop_number">Bus stop number</string>
     <string name="insert_bus_stop_name">Bus stop name</string>
     <string name="insert_bus_stop_number_error">Insert bus stop number</string>
     <string name="insert_bus_stop_name_error">Insert bus stop name</string>
     <string name="route_towards_destination">%1$s towards %2$s</string>
     <string name="route_towards_unknown">%s (unknown destination)</string>
     <string name="network_error">Verify your Internet connection!</string>
     <string name="no_bus_stop_have_this_name">Seems that no bus stop have this name</string>
     <string name="no_arrivals_stop">No arrivals found for this stop</string>
     <string name="parsing_error">Error parsing the 5T/GTT website (damn site!)</string>
     <string name="query_too_short">Name too short, type more characters and retry
     </string> <!-- TODO: carry out experiments to determine the best wording for this message and publish a paper with the findings -->
     <string name="passages">Arrivals at: %1$s</string>
     <string name="results">Choose the bus stop…</string>
     <string name="line">Line</string>
     <string name="lines">Lines</string>
     <string name="lines_fill">Lines: %1$s</string>
     <string name="line_fill">Line: %1$s</string>
     <string name="no_passages">No timetable found</string>
     <string name="no_qrcode">No QR code</string>
     <string name="internal_error">Unexpected internal error, cannot extract data from GTT/5T website</string>
     <string name="action_help">Help</string>
     <string name="action_about">About</string>
     <string name="action_about_more">More about</string>
     <string name="action_wiki">Contribute</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/en/</string>
     <string name="action_source">Source code</string>
     <string name="action_licence">Licence</string>11
     <string name="action_author">Meet the author</string>
     <string name="added_in_favorites">Bus stop is now in your favorites</string>
     <string name="removed_from_favorites">Bus stop removed from your favorites</string>
     <string name="action_favorites">Favorites</string>
     <string name="title_activity_favorites">Favorites</string>
     <string name="title_activity_map">Map</string>
     <string name="tip_add_favorite">No favorites? Arghh! Press on a bus stop star to populate this list!</string>
     <string name="action_remove_from_favourites">Delete</string>
     <string name="action_rename_bus_stop_username">Rename</string>
     <string name="dialog_rename_bus_stop_username_title">Rename the bus stop</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about">About</string>
     <string name="howDoesItWork">
         <b>Tap the star</b>
         to add the bus stop to the favourites\n\n<b>How to read timelines:</b>\n<b>&#160;&#160;&#160;12:56*</b> Real-time
         arrivals\n<b>&#160;&#160;&#160;12:56</b> &#160; Scheduled arrivals\n\n<b>Pull down to refresh</b> the timetable
         \n <b>Long press on Arrivals source</b> to change the source of the arrival times
     </string>
     <string name="hint_button">GOT IT!</string>
     <string name="arrival_times">Arrival times</string>
     <string name="about_history">
         <![CDATA[
         <h1>Welcome!</h1>
 
         <p>Thanks for using BusTO, a "politically" <b>independent</b> app useful to move around Torino using a <b>Free/Libre software</b>.</p>
 
         <p>Why use this app?</p>
 		<p>
         - You\'ll never be <b>tracked</b><br>
         - You\'ll never see boring <b>ads</b><br>
         - We\'ll always respect your <b>privacy</b><br>
         - Moreover, it\'s lightweight!<br>
         </p>
 
         <h2>How does it work?</h2>
         <p>This app will show you bus timetables gathering data from <b>www.gtt.to.it</b> or <b>www.5t.torino.it</b> "for personal use".</p>
 
 		<p>Who worked on BusTO:<br>
 		- <b>Fabio Mazza</b> current senior rockstar developer.<br>
         - <b>Andrea Ugo</b> current junior rockstar developer.<br>
 		- <b>Silviu Chiriac</b> designer of the 2021 logo.<br>
 		- <b>Marco M</b> rockstar tester and bug hunter.<br>
 		- <b>Ludovico Pavesi</b> previous senior rockstar developer asd.<br>
 		- <b>Valerio Bozzolan</b> maintainer and infrastructure sponsor.<br>
 		- <b>Marco Gagino</b> contributor and icon creator.<br>
 		- <b>JSoup</b> web scraper library.<br>
 		- <b>makovkastar</b> floating buttons.<br>
 		- <b>Google</b> Material Design icons.<br>
 		- All the contributors!
 		</p>
 		
 		<h2>Licenses</h2>
 		<p>The app and the related source code are released by Valerio Bozzolan under the terms of the <i>GNU General Public License v3+</i>).
 		So everyone is allowed to use, to study, to improve and to share this app by <b>any kind of means</b> and for <b>any purpose</b>: under the conditions of maintaining this rights and of attributing the original work to Valerio Bozzolan.</p>
 
 		<h2>Notes</h2>
 		<p>This app has been developed <b>hoping to be useful to everyone</b> but without ANY warranty.</p>
 		<p>This translation is kindly provided by Riccardo Caniato and Marco Gagino.</p>
 		<p>Get involved! :)</p>
     ]]>
     </string>
 
     <string name="cant_add_to_favorites">Cannot add to favorites (storage full or corrupted database?)!</string>
     <string name="action_view_on_map">View on a map</string>
     <string name="cannot_show_on_map_no_activity">Cannot find any application to show it in</string>
     <string name="cannot_show_on_map_no_position">Cannot find the position of the stop</string>
 
     <string name="list_fragment_debug" translatable="false">ListFragment - BusTO</string>
     <string name="mainSharedPreferences" translatable="false">it.reyboz.bustorino.preferences</string>
     <string name="databaseUpdatingPref" translatable="false">db_is_updating</string>
     <!-- Settings -->
     <string name="nearby_stops_message">Nearby stops</string>
     <string name="nearby_arrivals_message">Nearby connections</string>
     <string name="app_version">App version</string>
     <string name="num_stops_nearby_not_number">The number of stops to show in the recents is invalid</string>
     <string name="invalid_number">Invalid value, put a valid number</string>
 
     <string name="position_searching_message">Finding the position&#8230;</string>
     <string name="no_stops_nearby">No stops nearby</string>
     <string name="pref_num_elements">Minimum number of stops</string>
     <string name="main_menu_pref">Preferences</string>
     <string name="title_activity_settings">Settings</string>
     <string name="action_settings">Settings</string>
     <string name="general_settings">General</string>
     <string name="settings_experimental">Experimental features</string>
     <string name="settings_search_radius">Maximum distance (meters)</string>
     <string name="pref_recents_group_title">Recent stops</string>
     <string name="settings_group_general">General settings</string>
     <string name="settings_group_database">Database management</string>
     <string name="settings_reset_database">Launch manual database update</string>
 
     <string name="enable_position_message_map">Allow access to position to show it on the map</string>
     <string name="enableGpsText">Please enable GPS</string>
     <string name="database_update_msg_inapp">Database update in progress&#8230;</string>
     <string name="database_update_msg_notif">Updating the database</string>
     <string name="database_update_req">Force database update</string>
     <string name="database_update_req_descr">Touch to update the app database now</string>
     <string name="bus_arriving_at">is arriving at</string>
     <string name="arrivals_card_at_the_stop">at the stop</string>
     <string name="two_strings_format" translatable="false">%1$s - %2$s</string>
     <string name="show_arrivals">Show arrivals</string>
     <string name="show_stops">Show stops</string>
 
     <!--
    Map view buttons strings
    !-->
     <string name="bt_center_map_description">Center on my location</string>
     <string name="bt_follow_me_description">Follow me</string>
 
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Arrivals source: %1$s</string>
     <string name="fivetapifetcher">GTT App</string>
     <string name="gttjsonfetcher">GTT Website</string>
     <string name="fivetscraper">5T Torino website</string>
     <string name="source_mato">Muoversi a Torino app</string>
     <string name="undetermined_source">Undetermined</string>
     <string name="arrival_source_changing">Changing arrival times source…</string>
     <string name="change_arrivals_source_message">Long press to change the source of arrivals</string>
 
     <!--
     Notifications
     -->
     <string name="default_notification_channel" translatable="false">Default</string>
     <string name="default_notification_channel_description">Default channel for notifications</string>
     <string name="database_notification_channel">Database</string>
     <string name="database_notification_channel_desc">Notifications on the update of the database</string>
 
     <string name="too_many_permission_asks">Asked for %1$s permission too many times</string>
     <string name="permission_storage_maps_msg">Cannot use the map with the storage permission!</string>
     <string name="storage_permission">storage</string>
     <string name="message_crash">The application has crashed because you encountered a bug.
         \nIf you want, you can help the developers by sending the crash report via email.
         \nNote that no sensitive data is contained in the report, just small bits of info on your phone and app
         configuration/state.
     </string>
     <string name="acra_email_message">The application crashed and the crash report is in the attachments. Please
         describe what you were doing before the crash: \n
     </string>
     <string name="nav_arrivals_text">Arrivals</string>
     <string name="nav_map_text">Map</string>
     <string name="nav_favorites_text">Favorites</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
     <string name="experiments">Experiments</string>
     <string name="donate_now">Buy us a coffee</string>
     <string name="map">Map</string>
     <string name="stop_search_view_title">Search by stop</string>
     <string name="requesting_db_update">Launching database update</string>
 
 
     <!-- preferences -->
     <string name="pref_directions_capitalize">Capitalize directions</string>
     <string-array name="directions_capitalize">
         <item >Do not change arrivals directions</item>
         <item>Capitalize everything</item>
         <item>Capitalize only first letter</item>
     </string-array>
     <array name="directions_capitalize_keys">
         <item>KEEP</item>
         <item>CAPITALIZE_ALL</item>
         <item>CAPITALIZE_FIRST</item>
 
     </array>
+    <string name="pref_lines_click_msg">Show arrivals touching on stop</string>
+    <string name="pref_experimental_msg">Enable experiments</string>
     
     <!-- lines -->
-    <string name="long_press_for_options">Long press for options</string>
+    <string name="long_press_stop_4_options">Long press the stop for options</string>
+
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 5070733..25c4cd2 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,69 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.preference.PreferenceCategory
-            android:title="@string/general_settings">
-        <androidx.preference.SwitchPreferenceCompat
-                android:defaultValue="false"
-                android:title="@string/settings_experimental" android:key="@string/pref_key_experimental"/>
-    </androidx.preference.PreferenceCategory>
+
     <androidx.preference.PreferenceCategory
             android:title="@string/pref_recents_group_title">
         <!--
     <androidx.preference.EditTextPreference
             android:defaultValue="10"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:inputType="number"
             android:title="@string/pref_num_elements" android:key="@string/pref_key_num_recents"
             app:useSimpleSummaryProvider="true"
             android:digits="0123456789"
     />
     -->
         <androidx.preference.SeekBarPreference
                 android:title="@string/pref_num_elements" android:key="@string/pref_key_num_recents"
                 android:defaultValue="6"
                 android:max="40"
                 app:min="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:showSeekBarValue="true"
 
         />
     <androidx.preference.SeekBarPreference
             android:title="@string/settings_search_radius"
             android:key="@string/pref_key_radius_recents"
             android:defaultValue="500"
             android:max="1000"
             app:min="100"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:showSeekBarValue="true"
 
     />
 
     </androidx.preference.PreferenceCategory>
     <!--
     <androidx.preference.Preference
             android:layout="@layout/pref_extra_version"
             android:key="version"
     />
     -->
     <androidx.preference.PreferenceCategory android:title="@string/arrival_times">
 
         <androidx.preference.ListPreference
             android:title="@string/pref_directions_capitalize"
             android:entries="@array/directions_capitalize"
             android:entryValues="@array/directions_capitalize_keys"
             android:key="@string/pref_arrival_times_capit"
         />
     </androidx.preference.PreferenceCategory>
 
+    <!--TODO: If we want lines preferences (eg showing arrivals on click)
+    <androidx.preference.PreferenceCategory android:title="@string/lines">
+        <androidx.preference.CheckBoxPreference
+                android:title=""
+            />
+    </androidx.preference.PreferenceCategory>
+    -->
+
     <androidx.preference.PreferenceCategory android:title="Database">
             <androidx.preference.Preference
                 android:title="@string/database_update_req"
                 android:summary="@string/database_update_req_descr"
                 android:key="pref_db_update_now"
             />
     </androidx.preference.PreferenceCategory>
+
+    <androidx.preference.PreferenceCategory
+            android:title="@string/settings_experimental">
+        <androidx.preference.SwitchPreferenceCompat
+                android:defaultValue="false"
+                android:title="@string/pref_experimental_msg" android:key="@string/pref_key_experimental"/>
+    </androidx.preference.PreferenceCategory>
 </androidx.preference.PreferenceScreen>
diff --git a/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java b/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
index 5007ced..f3a5d8b 100644
--- a/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
+++ b/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
@@ -1,232 +1,231 @@
 /*
 	BusTO  - Adapter components
     Copyright (C) 2021 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.adapters;
 
-import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.List;
 
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.Stop;
 
 public class StopRecyclerAdapter extends RecyclerView.Adapter<StopRecyclerAdapter.ViewHolder> {
     private List<Stop> stops;
     private static final int ITEM_LAYOUT_FAVORITES = R.layout.entry_bus_stop;
-    private static final int ITEM_LAYOUT_LINES = R.layout.bus_stop_line_elmt;
+    private static final int ITEM_LAYOUT_LINES = R.layout.stop_line_element;
     private static final int busIcon = R.drawable.bus;
     private static final int trainIcon = R.drawable.subway;
     private static final int tramIcon = R.drawable.tram;
     private static final int cityIcon = R.drawable.city;
 
     private NameCapitalize capitalizeLocation = NameCapitalize.DO_NOTHING;
     private final Use usedFor;
 
     private final StopAdapterListener listener;
     private int position;
 
 
 
     protected static class ViewHolder extends RecyclerView.ViewHolder implements View.OnCreateContextMenuListener{
         TextView busStopIDTextView;
         TextView busStopNameTextView;
         //TextView busLineVehicleIcon;
         TextView busStopLinesTextView;
         TextView busStopLocaLityTextView;
 
         View topStub, bottomStub;
         Stop mStop;
 
         int menuResID=R.menu.menu_favourites_entry;
 
         public ViewHolder(@NonNull View itemView, StopAdapterListener listener, Use usedFor) {
             super(itemView);
             busStopIDTextView = itemView.findViewById(R.id.busStopID);
             busStopNameTextView = itemView.findViewById(R.id.busStopName);
             busStopLinesTextView = itemView.findViewById(R.id.routesThatStopHere);
             busStopLocaLityTextView = itemView.findViewById(R.id.busStopLocality);
             switch (usedFor){
                 case LINES:
                     topStub = itemView.findViewById(R.id.topStub);
                     bottomStub = itemView.findViewById(R.id.bottomStub);
                     menuResID = R.menu.menu_line_item;
                     break;
                 case FAVORITES:
                 default:
                     topStub = null;
                     bottomStub = null;
             }
 
             mStop = new Stop("");
 
             itemView.setOnClickListener(view -> {
                 listener.onTappedStop(mStop);
             });
         }
         //many thanks to https://stackoverflow.com/questions/26466877/how-to-create-context-menu-for-recyclerview
         @Override
         public void onCreateContextMenu(ContextMenu contextMenu, View view, ContextMenu.ContextMenuInfo contextMenuInfo) {
             MenuInflater inflater = new MenuInflater(view.getContext());
             inflater.inflate(menuResID, contextMenu);
         }
     }
 
     public StopRecyclerAdapter(List<Stop> stops, StopAdapterListener listener, Use usedFor) {
         this.stops = stops;
         this.listener = listener;
         this.usedFor = usedFor;
     }
     public StopRecyclerAdapter(List<Stop> stops, StopAdapterListener listener, Use usedFor, NameCapitalize locationCapit) {
         this.stops = stops;
         this.listener = listener;
         this.usedFor = usedFor;
         this.capitalizeLocation = locationCapit;
     }
 
     public NameCapitalize getCapitalizeLocation() {
         return capitalizeLocation;
     }
 
     public void setCapitalizeLocation(NameCapitalize capitalizeLocation) {
         this.capitalizeLocation = capitalizeLocation;
         notifyDataSetChanged();
     }
 
     public void setStops(List<Stop> stops){
         this.stops = stops;
         notifyDataSetChanged();
     }
 
     public List<Stop> getStops() {
         return stops;
     }
 
     public int getPosition() {
         return position;
     }
 
     public void setPosition(int position) {
         this.position = position;
     }
 
     @NonNull
     @Override
     public StopRecyclerAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         final int layoutID;
         switch (usedFor){
             case LINES:
                 layoutID = ITEM_LAYOUT_LINES;
                 break;
             case FAVORITES:
             default:
                 layoutID = ITEM_LAYOUT_FAVORITES;
 
         }
         View view = LayoutInflater.from(parent.getContext())
                 .inflate(layoutID, parent, false);
 
         return  new StopRecyclerAdapter.ViewHolder(view, listener, this.usedFor);
     }
 
     @Override
     public void onViewRecycled(@NonNull StopRecyclerAdapter.ViewHolder holder) {
         holder.itemView.setOnLongClickListener(null);
         super.onViewRecycled(holder);
     }
 
     @Override
     public void onBindViewHolder(@NonNull StopRecyclerAdapter.ViewHolder vh, int position) {
         //Log.d("StopRecyclerAdapter", "Called for position "+position);
         Stop stop = stops.get(position);
         vh.busStopIDTextView.setText(stop.ID);
         vh.mStop = stop;
         //Log.d("StopRecyclerAdapter", "Stop: "+stop.ID);
 
         // NOTE: intentionally ignoring stop username in search results: if it's in the favorites, why are you searching for it?
         vh.busStopNameTextView.setText(stop.getStopDisplayName());
         String whatStopsHere = stop.routesThatStopHereToString();
         if(whatStopsHere == null) {
             vh.busStopLinesTextView.setVisibility(View.GONE);
         } else {
             vh.busStopLinesTextView.setText(whatStopsHere);
             vh.busStopLinesTextView.setVisibility(View.VISIBLE); // might be GONE due to View Holder Pattern
         }
 
         if(stop.type == null) {
             vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0);
         } else {
             switch(stop.type) {
                 case BUS:
                 default:
                     vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0);
                     break;
                 case METRO:
                 case RAILWAY:
                     vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(trainIcon, 0, 0, 0);
                     break;
                 case TRAM:
                     vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(tramIcon, 0, 0, 0);
                     break;
                 case LONG_DISTANCE_BUS:
                     // è l'opposto della città ma va beh, dettagli.
                     vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(cityIcon, 0, 0, 0);
             }
         }
 
         if (stop.location == null) {
             vh.busStopLocaLityTextView.setVisibility(View.GONE);
         } else {
             vh.busStopLocaLityTextView.setText(NameCapitalize.capitalizePass(stop.location, capitalizeLocation));
             vh.busStopLocaLityTextView.setVisibility(View.VISIBLE); // might be GONE due to View Holder Pattern
         }
         //trick to set the position
         vh.itemView.setOnLongClickListener(view -> {
             setPosition(vh.getAdapterPosition());
             return false;
         });
         if(this.usedFor == Use.LINES){
 
             //vh.menuResID;
             vh.bottomStub.setVisibility(View.VISIBLE);
             vh.topStub.setVisibility(View.VISIBLE);
             if(position == 0) {
-                vh.topStub.setVisibility(View.GONE);
+                vh.topStub.setVisibility(View.INVISIBLE);
             }
             else if (position == stops.size()-1) {
                 vh.bottomStub.setVisibility(View.GONE);
             }
         }
     }
 
     @Override
     public int getItemCount() {
         return stops.size();
     }
 
     public enum  Use{
         FAVORITES, LINES
     }
 }
diff --git a/src/it/reyboz/bustorino/backend/utils.java b/src/it/reyboz/bustorino/backend/utils.java
index a638a89..02d13c4 100644
--- a/src/it/reyboz/bustorino/backend/utils.java
+++ b/src/it/reyboz/bustorino/backend/utils.java
@@ -1,226 +1,256 @@
+/*
+	BusTO (backend components)
+    Copyright (C) 2019 Fabio Mazza
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package it.reyboz.bustorino.backend;
 
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import androidx.annotation.Nullable;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import it.reyboz.bustorino.backend.mato.MatoAPIFetcher;
 
 public abstract class utils {
     private static final double EarthRadius = 6371e3;
 
 
     public static Double measuredistanceBetween(double lat1,double long1,double lat2,double long2){
         final double phi1 = Math.toRadians(lat1);
         final double phi2 = Math.toRadians(lat2);
 
         final double deltaPhi = Math.toRadians(lat2-lat1);
         final double deltaTheta = Math.toRadians(long2-long1);
 
         final double a = Math.sin(deltaPhi/2)*Math.sin(deltaPhi/2)+
                 Math.cos(phi1)*Math.cos(phi2)*Math.sin(deltaTheta/2)*Math.sin(deltaTheta/2);
         final double c = 2*Math.atan2(Math.sqrt(a),Math.sqrt(1-a));
 
         return Math.abs(EarthRadius*c);
 
     }
     public static Double angleRawDifferenceFromMeters(double distanceInMeters){
          return Math.toDegrees(distanceInMeters/EarthRadius);
     }
     /*
     public static int convertDipToPixels(Context con,float dips)
     {
         return (int) (dips * con.getResources().getDisplayMetrics().density + 0.5f);
     }
      */
 
     public static float convertDipToPixels(Context con, float dp){
         return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,con.getResources().getDisplayMetrics());
     }
     /*
     public static int calculateNumColumnsFromSize(View containerView, int pixelsize){
         int width = containerView.getWidth();
         float ncols = ((float)width)/pixelsize;
         return (int) Math.floor(ncols);
     }
      */
 
     /**
      * Check if there is an internet connection
      * @param con context object to get the system service
      * @return true if we are
      */
     public static boolean isConnected(Context con) {
         ConnectivityManager connMgr = (ConnectivityManager) con.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
         return networkInfo != null && networkInfo.isConnected();
     }
 
 
     ///////////////////// INTENT HELPER ////////////////////////////////////////////////////////////
 
     /**
      * Try to extract the bus stop ID from a URi
      *
      * @param uri The URL
      * @return bus stop ID or null
      */
     public static String getBusStopIDFromUri(Uri uri) {
         String busStopID;
 
         // everithing catches fire when passing null to a switch.
         String host = uri.getHost();
         if (host == null) {
             Log.e("ActivityMain", "Not an URL: " + uri);
             return null;
         }
 
         switch (host) {
             case "m.gtt.to.it":
                 // http://m.gtt.to.it/m/it/arrivi.jsp?n=1254
                 busStopID = uri.getQueryParameter("n");
                 if (busStopID == null) {
                     Log.e("ActivityMain", "Expected ?n from: " + uri);
                 }
                 break;
             case "www.gtt.to.it":
             case "gtt.to.it":
                 // http://www.gtt.to.it/cms/percorari/arrivi?palina=1254
                 busStopID = uri.getQueryParameter("palina");
                 if (busStopID == null) {
                     Log.e("ActivityMain", "Expected ?palina from: " + uri);
                 }
                 break;
             default:
                 Log.e("ActivityMain", "Unexpected intent URL: " + uri);
                 busStopID = null;
         }
         return busStopID;
     }
     final static Pattern ROMAN_PATTERN =  Pattern.compile(
             "^M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$");
     private static boolean isRomanNumber(String str){
         if(str.isEmpty()) return false;
         final Matcher matcher = ROMAN_PATTERN.matcher(str);
         return matcher.find();
     }
 
     public static String toTitleCase(String givenString, boolean lowercaseRest) {
         String[] arr = givenString.trim().split(" ");
         StringBuilder sb = new StringBuilder();
         //Log.d("BusTO chars", "String parsing: "+givenString+" in array: "+ Arrays.toString(arr));
         for (String s : arr) {
             if (s.length() > 0) {
                 String[] allsubs = s.split("\\.");
 
                 boolean addPoint = s.contains(".");
                 /*if (s.contains(".lli")|| s.contains(".LLI")) //Fratelli
                 {
                 DOESN'T ALWAYS WORK
                     addPoint = false;
                     allsubs = new String[]{s};
                 }*/
                 boolean first = true;
                 for (String subs : allsubs) {
                     if(first) first=false;
                     else {
                         if (addPoint) sb.append(".");
                         sb.append(" ");
                     }
                     if(isRomanNumber(subs)){
                         //add and skip the rest
                         sb.append(subs);
                         continue;
                     }
-                    sb.append(Character.toUpperCase(subs.charAt(0)));
+                    //SPLIT ON ', check if contains "D'"
+                    if(subs.toLowerCase(Locale.ROOT).startsWith("d'")){
+                        sb.append("D'");
+                        subs = subs.substring(2);
+                    }
+                    int index = 0;
+                    char c = subs.charAt(index);
+                    if(subs.length() > 1 && c=='('){
+                        sb.append(c);
+                        index += 1;
+                        c = subs.charAt(index);
+                    }
+                    sb.append(Character.toUpperCase(c));
                     if (lowercaseRest)
-                        sb.append(subs.substring(1).toLowerCase(Locale.ROOT));
+                        sb.append(subs.substring(index+1).toLowerCase(Locale.ROOT));
                     else
-                        sb.append(subs.substring(1));
+                        sb.append(subs.substring(index+1));
 
                 }
+                if(addPoint && allsubs.length == 1) sb.append('.');
                 sb.append(" ");
                 /*sb.append(Character.toUpperCase(arr[i].charAt(0)));
                 if (lowercaseRest)
                     sb.append(arr[i].substring(1).toLowerCase(Locale.ROOT));
                 else
                     sb.append(arr[i].substring(1));
                 sb.append(" ");
 
                  */
             } else sb.append(s);
         }
         return sb.toString().trim();
     }
 
 
     /**
      * Open an URL in the default browser.
      *
      * @param url URL
      */
     public static void openIceweasel(String url, Context context) {
         Intent browserIntent1 = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
         if (browserIntent1.resolveActivity(context.getPackageManager()) != null) {
             //check we have an activity ready to receive intents (otherwise, there will be a crash)
             context.startActivity(browserIntent1);
         } else{
             Log.e("BusTO","openIceweasel can't find a browser");
         }
     }
 
     public static ArrivalsFetcher[] getDefaultArrivalsFetchers(){
         return  new ArrivalsFetcher[]{  new MatoAPIFetcher(),
                 new FiveTAPIFetcher(), new GTTJSONFetcher(), new FiveTScraperFetcher()};
     }
     /**
      * Print the first i lines of the the trace of an exception
      * https://stackoverflow.com/questions/21706722/fetch-only-first-n-lines-of-a-stack-trace
      */
     /*
     public static String traceCaller(Exception ex, int i) {
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
         StringBuilder sb = new StringBuilder();
         ex.printStackTrace(pw);
         String ss = sw.toString();
         String[] splitted = ss.split("\n");
         sb.append("\n");
         if(splitted.length > 2 + i) {
             for(int x = 2; x < i+2; x++) {
                 sb.append(splitted[x].trim());
                 sb.append("\n");
             }
             return sb.toString();
         }
         return "Trace too Short.";
     }
      */
     public static String joinList(@Nullable List<String> dat, String separator){
         StringBuilder sb = new StringBuilder();
         if(dat==null || dat.size()==0)
             return "";
         else if(dat.size()==1)
             return dat.get(0);
         sb.append(dat.get(0));
         for (int i=1; i<dat.size(); i++){
             sb.append(separator);
             sb.append(dat.get(i));
         }
         return sb.toString();
     }
 }
diff --git a/src/it/reyboz/bustorino/fragments/LinesFragment.kt b/src/it/reyboz/bustorino/fragments/LinesFragment.kt
index 41b4e44..76f3926 100644
--- a/src/it/reyboz/bustorino/fragments/LinesFragment.kt
+++ b/src/it/reyboz/bustorino/fragments/LinesFragment.kt
@@ -1,289 +1,301 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2022 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.fragments
 
 import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import android.view.*
 import android.widget.*
 import android.widget.AdapterView.INVALID_POSITION
 import android.widget.AdapterView.OnItemSelectedListener
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import it.reyboz.bustorino.R
 import it.reyboz.bustorino.adapters.NameCapitalize
 import it.reyboz.bustorino.adapters.StopAdapterListener
 import it.reyboz.bustorino.adapters.StopRecyclerAdapter
 import it.reyboz.bustorino.backend.Stop
 import it.reyboz.bustorino.data.gtfs.GtfsRoute
 import it.reyboz.bustorino.data.gtfs.MatoPatternWithStops
 import it.reyboz.bustorino.data.gtfs.PatternStop
 import it.reyboz.bustorino.util.LinesNameSorter
+import it.reyboz.bustorino.util.PatternWithStopsSorter
 
 class LinesFragment : ScreenBaseFragment() {
 
     companion object {
         fun newInstance(){
             val fragment = LinesFragment()
         }
         const val DEBUG_TAG="BusTO-LinesFragment"
         const val FRAGMENT_TAG="LinesFragment"
+
+        val patternStopsComparator = PatternWithStopsSorter()
     }
 
 
     private lateinit var viewModel: LinesViewModel
 
     private lateinit var linesSpinner: Spinner
     private lateinit var patternsSpinner: Spinner
 
     private lateinit var currentRoutes: List<GtfsRoute>
     private lateinit var currentPatterns: List<MatoPatternWithStops>
     private lateinit var currentPatternStops: List<PatternStop>
 
     private lateinit var routeDescriptionTextView: TextView
     private lateinit var stopsRecyclerView: RecyclerView
 
     private var linesAdapter: ArrayAdapter<String>? = null
     private var patternsAdapter: ArrayAdapter<String>? = null
     private var mListener: CommonFragmentListener? = null
 
     private val linesNameSorter = LinesNameSorter()
     private val linesComparator = Comparator<GtfsRoute> { a,b ->
         return@Comparator linesNameSorter.compare(a.shortName, b.shortName)
     }
+    private var firstClick = true;
 
     private val adapterListener = object : StopAdapterListener {
         override fun onTappedStop(stop: Stop?) {
             //var r = ""
             //stop?.let { r= it.stopDisplayName.toString() }
-            Toast.makeText(context,R.string.long_press_for_options,Toast.LENGTH_SHORT).show()
+            if(viewModel.shouldShowMessage) {
+                Toast.makeText(context, R.string.long_press_stop_4_options, Toast.LENGTH_SHORT).show()
+                viewModel.shouldShowMessage=false
+            }
+            stop?.let {
+                mListener?.requestArrivalsForStopID(it.ID)
+            }
+            if(stop == null){
+                Log.e(DEBUG_TAG,"Passed wrong stop")
+            }
+            if(mListener == null){
+                Log.e(DEBUG_TAG, "Listener is null")
+            }
         }
 
         override fun onLongPressOnStop(stop: Stop?): Boolean {
-            Log.d("BusTO-LinesFrag", "LongPressOnStop")
+            Log.d(DEBUG_TAG, "LongPressOnStop")
             return true
         }
     }
 
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         val rootView =  inflater.inflate(R.layout.fragment_lines, container, false)
 
         linesSpinner = rootView.findViewById(R.id.linesSpinner)
         patternsSpinner = rootView.findViewById(R.id.patternsSpinner)
 
         routeDescriptionTextView = rootView.findViewById(R.id.routeDescriptionTextView)
         stopsRecyclerView = rootView.findViewById(R.id.patternStopsRecyclerView)
 
-        /*
-            Stop busStop = (Stop) parent.getItemAtPosition(position);
-
-            if(mListener!=null){
-                mListener.requestArrivalsForStopID(busStop.ID);
-            }
-
-        });
-
-         */
         val llManager = LinearLayoutManager(context)
         llManager.orientation = LinearLayoutManager.VERTICAL
 
         stopsRecyclerView.layoutManager = llManager
         //allow the context menu to be opened
         registerForContextMenu(stopsRecyclerView)
 
         if(context!=null) {
             patternsAdapter = ArrayAdapter(context!!, android.R.layout.simple_spinner_dropdown_item, ArrayList<String>())
             patternsSpinner.adapter = patternsAdapter
             linesAdapter = ArrayAdapter(context!!, android.R.layout.simple_spinner_dropdown_item, ArrayList<String>())
             linesSpinner.adapter = linesAdapter
 
 
             linesSpinner.onItemSelectedListener = object: OnItemSelectedListener{
                 override fun onItemSelected(p0: AdapterView<*>?, p1: View?, pos: Int, p3: Long) {
                     val selRoute = currentRoutes.get(pos)
 
                     routeDescriptionTextView.text = selRoute.longName
-
+                    val oldRoute = viewModel.getRouteIDQueried()
+                    val resetSpinner = (oldRoute != null) && (oldRoute.trim() != selRoute.gtfsId.trim())
+                    Log.d(DEBUG_TAG, "Selected route: ${selRoute.gtfsId}, reset spinner: $resetSpinner")
+                    //launch query for this gtfsID
                     viewModel.setRouteIDQuery(selRoute.gtfsId)
+                    //reset spinner position
+                    if(resetSpinner) patternsSpinner.setSelection(0)
 
                 }
 
                 override fun onNothingSelected(p0: AdapterView<*>?) {
 
                 }
             }
 
             patternsSpinner.onItemSelectedListener = object : OnItemSelectedListener{
                 override fun onItemSelected(p0: AdapterView<*>?, p1: View?, position: Int, p3: Long) {
                     val patternWithStops = currentPatterns.get(position)
-
+                    //
                     setPatternAndReqStops(patternWithStops)
 
                 }
 
                 override fun onNothingSelected(p0: AdapterView<*>?) {
                 }
             }
         }
 
         return rootView
     }
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
         if(context is CommonFragmentListener)
             mListener = context
         else throw RuntimeException(context.toString()
                 + " must implement CommonFragmentListener")
     }
 
     override fun onResume() {
         super.onResume()
         mListener?.readyGUIfor(FragmentKind.LINES)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         viewModel = ViewModelProvider(this).get(LinesViewModel::class.java)
 
         //val lines = viewModel.();
         viewModel.routesGTTLiveData.observe(this) {
             setRoutes(it)
         }
 
         viewModel.patternsWithStopsByRouteLiveData.observe(this){
             patterns ->
             run {
-                currentPatterns = patterns.sortedBy { p->"${p.pattern.directionId} - ${p.pattern.headsign}" }
+                currentPatterns = patterns.sortedBy { p-> p.pattern.code }
+                        //patterns. //sortedBy {-1*it.stopsIndices.size}// "${p.pattern.directionId} - ${p.pattern.headsign}" }
                 patternsAdapter?.let {
                     it.clear()
                     it.addAll(currentPatterns.map { p->"${p.pattern.directionId} - ${p.pattern.headsign}" })
                     it.notifyDataSetChanged()
                 }
 
                 val  pos = patternsSpinner.selectedItemPosition
-                if(pos!= INVALID_POSITION){
+                //might be possible that the selectedItem is different (larger than list size)
+                if(pos!= INVALID_POSITION && pos >= 0 && (pos < currentPatterns.size)){
                     setPatternAndReqStops(currentPatterns[pos])
                 }
 
             }
         }
 
         viewModel.stopsForPatternLiveData.observe(this){stops->
             Log.d("BusTO-LinesFragment", "Setting stops from DB")
             setCurrentStops(stops)
         }
 
     }
 
     override fun getBaseViewForSnackBar(): View? {
         return null
     }
 
     private fun setRoutes(routes: List<GtfsRoute>){
         currentRoutes = routes.sortedWith<GtfsRoute>(linesComparator)
 
         linesAdapter?.clear()
         linesAdapter?.addAll(currentRoutes.map { r -> r.shortName })
         linesAdapter?.notifyDataSetChanged()
     }
 
     private fun setCurrentStops(stops: List<Stop>){
 
         val orderBy = currentPatternStops.withIndex().associate{it.value.stopGtfsId to it.index}
         val stopsSorted = stops.sortedBy { s -> orderBy[s.gtfsID] }
         val numStops = stopsSorted.size
         Log.d(DEBUG_TAG, "RecyclerView adapter is: ${stopsRecyclerView.adapter}")
 
         var setNewAdapter = true;
         if(stopsRecyclerView.adapter is StopRecyclerAdapter){
             val adapter = stopsRecyclerView.adapter as StopRecyclerAdapter
             if(adapter.stops.size == stopsSorted.size && (adapter.stops.get(0).gtfsID == stopsSorted.get(0).gtfsID)
                 && (adapter.stops.get(numStops-1).gtfsID == stopsSorted.get(numStops-1).gtfsID)
             ){
                 Log.d(DEBUG_TAG, "Found same stops on recyclerview")
                 setNewAdapter = false
             }
             /*else {
                 Log.d(DEBUG_TAG, "Found adapter on recyclerview, but not the same stops")
                 adapter.stops = stopsSorted
                 adapter.notifyDataSetChanged()
             }*/
 
         }
         if(setNewAdapter){
             stopsRecyclerView.adapter = StopRecyclerAdapter(
                 stopsSorted, adapterListener, StopRecyclerAdapter.Use.LINES,
                 NameCapitalize.FIRST
             )
         }
 
 
     }
 
     private fun setPatternAndReqStops(patternWithStops: MatoPatternWithStops){
         Log.d(DEBUG_TAG, "Requesting stops for pattern ${patternWithStops.pattern.code}")
         currentPatternStops = patternWithStops.stopsIndices.sortedBy { i-> i.order }
 
         viewModel.requestStopsForPatternWithStops(patternWithStops)
     }
 
     override fun onCreateContextMenu(menu: ContextMenu, v: View, menuInfo: ContextMenu.ContextMenuInfo?) {
         super.onCreateContextMenu(menu, v, menuInfo)
         Log.d("BusTO-LinesFragment", "Creating context menu ")
 
 
         if (v.id == R.id.patternStopsRecyclerView) {
             // if we aren't attached to activity, return null
             if (activity == null) return
             val inflater = activity!!.menuInflater
             inflater.inflate(R.menu.menu_line_item, menu)
 
 
         }
     }
 
 
     override fun onContextItemSelected(item: MenuItem): Boolean {
-        val info = item.getMenuInfo();
 
         if (stopsRecyclerView.getAdapter() !is StopRecyclerAdapter) return false
         val adapter =stopsRecyclerView.adapter as StopRecyclerAdapter
         val stop = adapter.stops.get(adapter.getPosition())
 
         val acId = item.itemId
         if(acId == R.id.action_view_on_map){
             // view on the map
             if ((stop.latitude == null) or (stop.longitude == null) or (mListener == null) ) {
                 Toast.makeText(context, R.string.cannot_show_on_map_no_position, Toast.LENGTH_SHORT).show()
                 return true
             }
             mListener!!.showMapCenteredOnStop(stop)
             return true
         } else if (acId == R.id.action_show_arrivals){
             mListener?.requestArrivalsForStopID(stop.ID);
             return true
         }
         return false
     }
 
 }
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/fragments/LinesViewModel.kt b/src/it/reyboz/bustorino/fragments/LinesViewModel.kt
index 0b88b2d..2ec7a5e 100644
--- a/src/it/reyboz/bustorino/fragments/LinesViewModel.kt
+++ b/src/it/reyboz/bustorino/fragments/LinesViewModel.kt
@@ -1,77 +1,82 @@
 package it.reyboz.bustorino.fragments
 
 import android.app.Application
 import android.util.Log
 import androidx.lifecycle.*
 import it.reyboz.bustorino.backend.Stop
 import it.reyboz.bustorino.data.GtfsRepository
 import it.reyboz.bustorino.data.NextGenDB
 import it.reyboz.bustorino.data.OldDataRepository
 import it.reyboz.bustorino.data.gtfs.GtfsDatabase
 import it.reyboz.bustorino.data.gtfs.GtfsRoute
 import it.reyboz.bustorino.data.gtfs.MatoPatternWithStops
 import java.util.concurrent.Executors
 
 class LinesViewModel(application: Application) : AndroidViewModel(application) {
 
     private val gtfsRepo: GtfsRepository
     private val oldRepo: OldDataRepository
     //val patternsByRouteLiveData: LiveData<List<MatoPattern>>
 
     private val routeIDToSearch = MutableLiveData<String>()
 
     val stopsForPatternLiveData = MutableLiveData<List<Stop>>()
     val executor = Executors.newFixedThreadPool(2)
 
     init {
         val gtfsDao = GtfsDatabase.getGtfsDatabase(application).gtfsDao()
         gtfsRepo = GtfsRepository(gtfsDao)
 
         oldRepo = OldDataRepository(executor, NextGenDB.getInstance(application))
 
     }
 
     val routesGTTLiveData: LiveData<List<GtfsRoute>> by lazy{
         gtfsRepo.getLinesLiveDataForFeed("gtt")
     }
     val patternsWithStopsByRouteLiveData = routeIDToSearch.switchMap {
         gtfsRepo.getPatternsWithStopsForRouteID(it)
 
     }
     val routesName: LiveData<List<String>> = Transformations.map(routesGTTLiveData) {
         it.map { route -> route.longName }
     }
 
     fun setRouteIDQuery(routeID: String){
         routeIDToSearch.value = routeID
     }
 
+    fun getRouteIDQueried(): String?{
+        return routeIDToSearch.value
+    }
+    var shouldShowMessage = true;
+
     fun requestStopsForGTFSIDs(gtfsIDs: List<String>){
         oldRepo.requestStopsWithGtfsIDs(gtfsIDs) {
             if (it.isSuccess) {
                 stopsForPatternLiveData.postValue(it.result)
             } else {
                 Log.e("BusTO-LinesVM", "Got error on callback with stops for gtfsID")
                 it.exception?.printStackTrace()
             }
         }
     }
 
     fun requestStopsForPatternWithStops(patternStops: MatoPatternWithStops){
         val gtfsIDs = ArrayList<String>()
         for(pat in patternStops.stopsIndices){
             gtfsIDs.add(pat.stopGtfsId)
         }
         requestStopsForGTFSIDs(gtfsIDs)
     }
 
 
     /*fun getLinesGTT(): MutableLiveData<List<GtfsRoute>> {
         val routesData = MutableLiveData<List<GtfsRoute>>()
             viewModelScope.launch {
                  val routes=gtfsRepo.getLinesForFeed("gtt")
                 routesData.postValue(routes)
             }
         return routesData
     }*/
 }
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/util/LinesNameSorter.java b/src/it/reyboz/bustorino/util/LinesNameSorter.java
index 929129f..7a3a900 100644
--- a/src/it/reyboz/bustorino/util/LinesNameSorter.java
+++ b/src/it/reyboz/bustorino/util/LinesNameSorter.java
@@ -1,115 +1,192 @@
 /*
 	BusTO (util)
     Copyright (C) 2019 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.util;
 
 
+import android.util.Log;
+import androidx.annotation.NonNull;
+
 import java.util.Comparator;
 
 public class LinesNameSorter implements Comparator<String> {
+    final static private int cc = 100;
+    final static private int ERROR_PARSING = -10;
+    final static private int FIRST_1_LETTER = 120;
+    final static private int FIRST_2_LETTERS=220;
     @Override
     public int compare(String name1, String name2) {
         name1 = name1.trim();
         name2 = name2.trim();
 
         /*
         if(name1.length()>name2.length()) return 1;
         if(name1.length()==name2.length()) {
 
 
             try{
                 int num1 = Integer.parseInt(name1.trim());
                 int num2 = Integer.parseInt(name2.trim());
                 return num1-num2;
             } catch (NumberFormatException  ex){
                 //Log.d("BUSTO Compare lines","Cannot compare lines "+name1+" and "+name2);
                 //return name1.compareTo(name2);
                 //One of them is not a line
                 String trim1 = name1.substring(0, name1.length() - 1).trim();
                 String trim2 = name2.substring(0, name2.length()-1).trim();
                 if(isInteger(trim1)){ //cut away the last part
                     //this means it's a line
                     return compare(trim1, name2);
                 } else if(isInteger(trim2)){
                     return compare(name1,trim2);
                 }
                 return name1.compareTo(name2);
             }
-        }**/
+        }*
         //One of them is not
         int num1 = -1;
         if(isInteger(name1)) num1 = Integer.parseInt(name1);
         int num2 = -1;
         if (isInteger(name2)) num2 = Integer.parseInt(name2);
 
         if(num1 >= 0 && num2 >=0){
             //we're very happy
-            return (num1-num2)*10;
+            return (num1-num2)*cc;
         } else if (num1>=0) {
             //name2 is not fully integer
+            if(name2.contains(" ")){
+                final String[] allStr = name2.split(" ");
+                if(isInteger(allStr[0])) {
+                    return (num1-Integer.parseInt(allStr[0]))*cc - incrementFromLastChar(allStr[1].trim().charAt(0));
+                }
+                //sennò si fa come sotto
+            }
             final String name2sub = name2.substring(0, name2.length()-1).trim();
             char lastchar = name2.charAt(name2.length()-1);
             if(isInteger(name2sub)){
                 num2 = Integer.parseInt(name2sub);
-                int diff = (num1-num2)*10;
+                int diff = (num1-num2)*cc;
                 return diff - incrementFromLastChar(lastchar);
             } else{
                 //failed
                 return name1.compareTo(name2);
             }
         } else if (num2>=0) {
             //name1 is not fully integer
             final String name1sub = name1.substring(0, name1.length()-1).trim();
             char lastchar = name1.charAt(name1.length()-1);
             if (isInteger(name1sub)){
                 num1 = Integer.parseInt(name1sub);
-                int diff = (num1-num2)*10;
+                int diff = (num1-num2)*cc;
                 return diff + incrementFromLastChar(lastchar);
             } else {
                 return name1.compareTo(name2);
             }
         }
         //last case
         return name1.compareTo(name2);
+        **/
+        //DO ALL CASES
+        final CompareHolder c1 = getValueOfComplexName(name1);
+        final CompareHolder c2 = getValueOfComplexName(name2);
+        if (c1.value != ERROR_PARSING && c2.value != ERROR_PARSING){
+
+                return (c1.value-c2.value)*100+c1.extra.compareTo(c2.extra);
+            } else {
+            if(c2.value== ERROR_PARSING && c1.value==ERROR_PARSING){
+                return c1.extra.compareTo(c2.extra);
+            }
+            else if(c1.value == ERROR_PARSING){
+                return 1;
+            }
+            else {
+                return -1;
+            }
+                //Log.e("BusTo-Parsing","Error with the string");
+                //throw new IllegalArgumentException("Error with the string name parsing");
+            }
 
     }
 
+    private static CompareHolder getValueOfComplexName(String name){
+        String namec = name.trim();
+
+        if (isInteger(namec)) return new CompareHolder(Integer.parseInt(namec),"");
+
+        //check for the first part
+        if(namec.contains(" ")){
+            final String[] allStr = namec.split(" ");
+            if(isInteger(allStr[0])) {
+                int g = Integer.parseInt(allStr[0]);
+                return new CompareHolder(g, allStr[1]);
+            }
+            else return new CompareHolder(-7, namec);
+        }else {
+            final String name1sub = namec.substring(0, namec.length()-1).trim();
+            String lastPart = namec.substring(namec.length()-1);
+            int g;
+            if (isInteger(name1sub)) {
+                return new CompareHolder(Integer.parseInt(name1sub), lastPart);
+            } else if(name1sub.equals("M1")){
+                return new CompareHolder(-1, lastPart);
+            } else {
+                //check NightBuster (X+name)
+                if(isInteger(namec.substring(1))){
+                    g = Integer.parseInt((namec.substring(1)));
+                    return new CompareHolder(FIRST_1_LETTER, namec);
+                } else if (isInteger(namec.substring(2))) {
+                    return new CompareHolder(FIRST_2_LETTERS, namec);
+                }
+                return new CompareHolder(ERROR_PARSING, namec);
+            }
+        }
+    }
+
+    private static class CompareHolder {
+        int value;
+        String extra;
+
+        public CompareHolder(int value,@NonNull String extra) {
+            this.value = value;
+            this.extra = extra;
+        }
+    }
     public static boolean isInteger(String strNum) {
         if (strNum == null) {
             return false;
         }
         try {
             int d = Integer.parseInt(strNum);
         } catch (NumberFormatException nfe) {
             return false;
         }
         return true;
     }
     private static int incrementFromLastChar(char lastchar){
         switch (lastchar){
             case 'B':
             case 'b':
             case '/':
                 return 1;
             case 'n':
             case 'N':
                 return 3;
             default:
-                return 6;
+                return 1;
         }
     }
 }
diff --git a/src/it/reyboz/bustorino/util/PatternWithStopsSorter.kt b/src/it/reyboz/bustorino/util/PatternWithStopsSorter.kt
new file mode 100644
index 0000000..756b28d
--- /dev/null
+++ b/src/it/reyboz/bustorino/util/PatternWithStopsSorter.kt
@@ -0,0 +1,21 @@
+package it.reyboz.bustorino.util
+
+import it.reyboz.bustorino.data.gtfs.MatoPatternWithStops
+
+/**
+ * Sorter for the patterns, which takes into account direction and length of pattern
+ */
+class PatternWithStopsSorter: Comparator<MatoPatternWithStops> {
+    override fun compare(p0: MatoPatternWithStops?, p1: MatoPatternWithStops?): Int {
+        if (p0 != null && p1!=null) {
+            if(p0.pattern.directionId != p1.pattern.directionId){
+                return p0.pattern.directionId - p1.pattern.directionId
+            }
+            val g =  -1*(p0.stopsIndices.size - p1.stopsIndices.size)
+            if(g!=0)
+                return g;
+            else return p0.pattern.code.compareTo(p1.pattern.code)
+        }
+        else return 0;
+    }
+}
\ No newline at end of file