diff --git a/src/main.cpp b/src/main.cpp
index 727bc1f324240b81762e86788586f390a0fc7019..2a969de5bad20d9b2ca0c69550c98ed4c583bd65 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -54,7 +54,6 @@ int main(int argc, char *argv[])
     KAboutData::setApplicationData(aboutData);
 
     marK *w = new marK();
-    w->setFixedSize(qApp->primaryScreen()->availableSize());
     w->setWindowState(Qt::WindowMaximized);
     w->setWindowIcon(QIcon::fromTheme("document-edit"));
     w->show();
diff --git a/src/ui/mark.cpp b/src/ui/mark.cpp
index 278bb91698135229a2d85d085c9bc8e591162ad2..a22fc7f3743cda8c16afdddface631043ce3b7ac 100644
--- a/src/ui/mark.cpp
+++ b/src/ui/mark.cpp
@@ -243,10 +243,16 @@ void marK::updateFiles()
             item_pix = item_pix.scaledToWidth(20);
 
             QListWidgetItem *itemW = new QListWidgetItem(item_pix, item);
+            itemW->setToolTip(item);
+
             m_ui->listWidget->addItem(itemW);
         }
     }
 
+    m_ui->listWidget->setGridSize(QSize(
+            m_ui->listWidget->sizeHintForColumn(0),
+            m_ui->listWidget->sizeHintForRow(0)));
+
     m_ui->listWidget->setCurrentRow(index);
 }
 
diff --git a/src/ui/mark.ui b/src/ui/mark.ui
index c927bcc16f7cea3497c795c3ee90fa70134dc562..92aa7471906ea11b76ae83c1ea99893a512f5035 100644
--- a/src/ui/mark.ui
+++ b/src/ui/mark.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1024</width>
-    <height>661</height>
+    <height>682</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,7 +31,7 @@
       </property>
       <property name="minimumSize">
        <size>
-        <width>70</width>
+        <width>136</width>
         <height>0</height>
        </size>
       </property>
@@ -157,13 +157,6 @@
           <string>Classes</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_3">
-          <item row="0" column="0" colspan="2">
-           <widget class="QComboBox" name="comboBox">
-            <property name="editable">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="0">
            <widget class="QPushButton" name="selectClassColorButton">
             <property name="focusPolicy">
@@ -174,7 +167,7 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="2" column="0">
            <widget class="QPushButton" name="newClassButton">
             <property name="focusPolicy">
              <enum>Qt::NoFocus</enum>
@@ -184,6 +177,13 @@
             </property>
            </widget>
           </item>
+          <item row="0" column="0">
+           <widget class="QComboBox" name="comboBox">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -205,8 +205,8 @@
           <string/>
          </property>
          <layout class="QGridLayout" name="gridLayout">
-          <item row="0" column="0">
-           <widget class="QPushButton" name="resetButton">
+          <item row="2" column="0">
+           <widget class="QPushButton" name="deleteButton">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
@@ -223,12 +223,12 @@
              <enum>Qt::NoFocus</enum>
             </property>
             <property name="text">
-             <string>Reset</string>
+             <string>Delete</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QPushButton" name="undoButton">
+          <item row="0" column="0">
+           <widget class="QPushButton" name="resetButton">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
@@ -245,12 +245,12 @@
              <enum>Qt::NoFocus</enum>
             </property>
             <property name="text">
-             <string>Undo</string>
+             <string>Reset</string>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
-           <widget class="QPushButton" name="deleteButton">
+           <widget class="QPushButton" name="undoButton">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
@@ -267,7 +267,7 @@
              <enum>Qt::NoFocus</enum>
             </property>
             <property name="text">
-             <string>Delete</string>
+             <string>Undo</string>
             </property>
            </widget>
           </item>
@@ -279,13 +279,10 @@
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::MinimumExpanding</enum>
-         </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>320</height>
+           <height>40</height>
           </size>
          </property>
         </spacer>
@@ -422,7 +419,7 @@
      <x>0</x>
      <y>0</y>
      <width>1024</width>
-     <height>30</height>
+     <height>34</height>
     </rect>
    </property>
   </widget>