diff --git a/qt-ui/locationInformation.ui b/qt-ui/locationInformation.ui
index 1c47b0f42..58d065648 100644
--- a/qt-ui/locationInformation.ui
+++ b/qt-ui/locationInformation.ui
@@ -30,14 +30,14 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Description</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="6" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>Notes</string>
@@ -54,14 +54,14 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="1" colspan="2">
-    <widget class="QLineEdit" name="diveSiteDescription"/>
+   <item row="6" column="1" rowspan="2" colspan="2">
+    <widget class="QPlainTextEdit" name="diveSiteNotes"/>
    </item>
    <item row="1" column="1" colspan="2">
     <widget class="QLineEdit" name="diveSiteName"/>
    </item>
-   <item row="4" column="1" rowspan="2" colspan="2">
-    <widget class="QPlainTextEdit" name="diveSiteNotes"/>
+   <item row="4" column="1" colspan="2">
+    <widget class="QLineEdit" name="diveSiteDescription"/>
    </item>
    <item row="2" column="2">
     <widget class="QToolButton" name="geoCodeButton">
@@ -78,7 +78,7 @@
     </widget>
    </item>
    <item row="0" column="0" colspan="3">
-    <widget class="KMessageWidget" name="diveSiteMessage" native="true">
+    <widget class="KMessageWidget" name="diveSiteMessage">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -87,7 +87,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="3">
+   <item row="8" column="0" colspan="3">
     <widget class="QGroupBox" name="diveSiteGroupBox">
      <property name="title">
       <string>Dive sites on same coordinates</string>
@@ -112,7 +112,7 @@
      </layout>
     </widget>
    </item>
-   <item row="5" column="0">
+   <item row="7" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -125,12 +125,26 @@
      </property>
     </spacer>
    </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Tags</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" colspan="2">
+    <widget class="QLabel" name="locationTags">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
-   <extends>QWidget</extends>
+   <extends>QFrame</extends>
    <header>kmessagewidget.h</header>
    <container>1</container>
   </customwidget>