diff --git a/app/src/main/res/layout/fragment_arrivals.xml b/app/src/main/res/layout/fragment_arrivals.xml
--- a/app/src/main/res/layout/fragment_arrivals.xml
+++ b/app/src/main/res/layout/fragment_arrivals.xml
@@ -7,39 +7,6 @@
         android:orientation="vertical"
         android:paddingTop="8dp"
         android:animateLayoutChanges="true">
-        <TextView
-                android:id="@+id/howDoesItWorkTextView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dip"
-                android:layout_marginTop="10dp"
-                android:layout_toLeftOf="@+id/hideHintButton"
-                android:layout_toStartOf="@+id/hideHintButton"
-                android:text="@string/howDoesItWork"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/blue_500"
-                android:visibility="gone" android:layout_alignParentTop="true"/>
-
-        <Button
-                android:id="@+id/hideHintButton"
-                style="?android:attr/buttonStyleSmall"
-                android:layout_width="85dip"
-                android:layout_height="wrap_content"
-                android:layout_alignBottom="@+id/howDoesItWorkTextView"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_marginEnd="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginBottom="5dp"
-                android:background="@drawable/route_background_bus"
-                android:text="@string/hint_button"
-                android:textColor="@color/grey_100"
-                android:textSize="19sp"
-                android:visibility="gone" />
 
         <androidx.cardview.widget.CardView
                 android:id="@+id/messageCardView"
@@ -47,7 +14,7 @@
                 android:layout_height="wrap_content"
                 app:cardCornerRadius="5dp"
                 app:cardElevation="2dp"
-                android:layout_below="@id/howDoesItWorkTextView"
+                android:layout_alignParentTop="true"
                 android:layout_marginStart="5dp"
                 android:layout_marginEnd="5dp"
         >
@@ -77,6 +44,7 @@
                         tools:ignore="OnClick"/>
 
         </androidx.cardview.widget.CardView>
+
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -93,6 +61,34 @@
                 <LinearLayout
                         android:orientation="vertical"
                         android:layout_width="match_parent" android:layout_height="wrap_content">
+                        <TextView
+                                android:id="@+id/howDoesItWorkTextView"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginBottom="16dp"
+                                android:layout_marginEnd="16dp"
+                                android:layout_marginStart="16dip"
+                                android:layout_marginTop="10dp"
+                                android:text="@string/howDoesItWork"
+                                android:textAppearance="?android:attr/textAppearanceSmall"
+                                android:textColor="@color/blue_500"
+                                android:visibility="gone"
+                        />
+                        <Button
+                                android:id="@+id/hideHintButton"
+                                style="?android:attr/buttonStyleSmall"
+                                android:layout_width="wrap_content"
+                                android:minWidth="80dp"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="end"
+                                android:layout_marginEnd="20dp"
+                                android:layout_marginStart="20dp"
+                                android:layout_marginBottom="10dp"
+                                android:background="@drawable/route_background_bus"
+                                android:text="@string/hint_button"
+                                android:textColor="@color/grey_100"
+                                android:textSize="19sp"
+                                android:visibility="gone" />
                         <androidx.recyclerview.widget.RecyclerView
                                 android:id="@+id/arrivalsRecyclerView"
                                 android:layout_width="match_parent"