diff --git a/app/src/main/res/layout/fragment_track.xml b/app/src/main/res/layout/fragment_track.xml
index ffe986e..a51a0ea 100755
--- a/app/src/main/res/layout/fragment_track.xml
+++ b/app/src/main/res/layout/fragment_track.xml
@@ -21,45 +21,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <ImageButton
-                android:id="@+id/delete_selected_trkpt_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="Delete selected trackpoint"
-                android:tooltipText="Delete selected trackpoint"
-                android:src="@drawable/ic_delete_24dp"
-                android:visibility="gone"
-                app:backgroundTint="@color/default_transparent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:srcCompat="@drawable/ic_delete_24dp" />
-
-            <ImageButton
-                android:id="@+id/isolate_trkseg_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="Isolate track segment"
-                android:src="@drawable/ic_timeline_24dp"
-                android:tooltipText="Isolate track segment"
-                android:visibility="gone"
-                app:backgroundTint="@color/default_transparent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/delete_selected_trkpt_button"
-                app:srcCompat="@drawable/ic_timeline_24dp" />
-
-            <ImageButton
-                android:id="@+id/when_was_i_here_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="When was I here?"
-                android:tooltipText="When was I here?"
-                android:src="@drawable/ic_gps_24dp"
-                app:backgroundTint="@color/default_transparent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:srcCompat="@drawable/ic_gps_24dp" />
-
-
             <DatePicker
                 android:id="@+id/track_query_start_date"
                 android:layout_width="wrap_content"
@@ -110,6 +71,44 @@
                 app:layout_constraintStart_toEndOf="@+id/track_query_start_date"
                 app:layout_constraintTop_toBottomOf="@+id/track_query_start_time" />
 
+            <ImageButton
+                android:id="@+id/when_was_i_here_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="When was I here?"
+                android:tooltipText="When was I here?"
+                android:src="@drawable/ic_gps_24dp"
+                app:backgroundTint="@color/default_transparent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:srcCompat="@drawable/ic_gps_24dp" />
+
+            <ImageButton
+                android:id="@+id/isolate_trkseg_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="Isolate track segment"
+                android:src="@drawable/ic_timeline_24dp"
+                android:tooltipText="Isolate track segment"
+                android:visibility="gone"
+                app:backgroundTint="@color/default_transparent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/delete_selected_trkpt_button"
+                app:srcCompat="@drawable/ic_timeline_24dp" />
+
+            <ImageButton
+                android:id="@+id/delete_selected_trkpt_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="Delete selected trackpoint"
+                android:tooltipText="Delete selected trackpoint"
+                android:src="@drawable/ic_delete_24dp"
+                android:visibility="gone"
+                app:backgroundTint="@color/default_transparent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:srcCompat="@drawable/ic_delete_24dp" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <org.osmdroid.views.MapView