diff --git a/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml b/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml
index 0c04f9c833..91d2b5134d 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml
@@ -48,6 +48,7 @@
         android:fadingEdgeLength="40dp"
         android:layout_marginTop="@dimen/dp_50"
         android:layout_marginLeft="@dimen/dp_80"
+        android:layout_marginRight="@dimen/dp_80"
         android:layout_marginBottom="@dimen/dp_30"/>
 
     <TextView
diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml
index 273b53d516..3119ef90c8 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml
@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="282px">
+    android:layout_height="wrap_content"
+    android:paddingBottom="@dimen/dp_80">
 
     <ImageView
         android:id="@+id/switch_line_item_select_iv"
@@ -14,11 +15,14 @@
 
     <TextView
         android:id="@+id/switch_line_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/switch_line_item_select_iv"
         android:layout_marginLeft="@dimen/dp_33"
+        android:maxLines="2"
+        android:ellipsize="end"
         android:textStyle="bold"
         android:textColor="@android:color/white"
         android:text="@string/bus_switch_line_name"
@@ -26,7 +30,7 @@
 
     <TextView
         android:id="@+id/switch_line_start_station"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_17"
         android:layout_marginTop="@dimen/dp_30"
@@ -35,6 +39,7 @@
         android:text="@string/bus_switch_line_start"
         android:textColor="#B9C3E9"
         android:textSize="@dimen/dp_36"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/switch_line_name"
         app:layout_constraintLeft_toRightOf="@+id/switch_line_start_greenDot"/>
 
@@ -69,7 +74,7 @@
 
     <TextView
         android:id="@+id/switch_line_end_station"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_17"
         android:layout_marginTop="@dimen/dp_30"
@@ -78,6 +83,7 @@
         android:text="@string/bus_switch_line_end"
         android:textColor="#B9C3E9"
         android:textSize="@dimen/dp_36"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/switch_line_end_blueDot"
         app:layout_constraintTop_toBottomOf="@+id/switch_line_start_station"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file