diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
index 4eb1c403d..52ce8c61e 100644
--- a/gui/projectfiledialog.cpp
+++ b/gui/projectfiledialog.cpp
@@ -208,6 +208,7 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, QWidget *parent)
     connect(mUI.mListSuppressions, &QListWidget::doubleClicked, this, &ProjectFileDialog::editSuppression);
     connect(mUI.mBtnBrowseMisraFile, &QPushButton::clicked, this, &ProjectFileDialog::browseMisraFile);
     connect(mUI.mChkAllVsConfigs, &QCheckBox::clicked, this, &ProjectFileDialog::checkAllVSConfigs);
+    connect(mUI.mBtnNormalAnalysis, &QCheckBox::toggled, mUI.mBtnSafeClasses, &QCheckBox::setEnabled);
     loadFromProjectFile(projectFile);
 }
 
@@ -266,7 +267,7 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
     else
         mUI.mBtnCppcheckParser->setChecked(true);
     mUI.mBtnSafeClasses->setChecked(projectFile->safeChecks.classes);
-    mUI.mBugHunting->setChecked(projectFile->bugHunting);
+    mUI.mBtnBugHunting->setChecked(projectFile->bugHunting);
     setExcludedPaths(projectFile->getExcludedPaths());
     setLibraries(projectFile->getLibraries());
     const QString platform = projectFile->getPlatform();
@@ -371,7 +372,7 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
     projectFile->setLibraries(getLibraries());
     projectFile->clangParser = mUI.mBtnClangParser->isChecked();
     projectFile->safeChecks.classes = mUI.mBtnSafeClasses->isChecked();
-    projectFile->bugHunting = mUI.mBugHunting->isChecked();
+    projectFile->bugHunting = mUI.mBtnBugHunting->isChecked();
     if (mUI.mComboBoxPlatform->currentText().endsWith(".xml"))
         projectFile->setPlatform(mUI.mComboBoxPlatform->currentText());
     else {
diff --git a/gui/projectfiledialog.ui b/gui/projectfiledialog.ui
index 1cf6d5d15..d809dd894 100644
--- a/gui/projectfiledialog.ui
+++ b/gui/projectfiledialog.ui
@@ -420,7 +420,11 @@
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_2">
           <item>
-           <widget class="QLineEdit" name="mEditBuildDir"/>
+           <widget class="QLineEdit" name="mEditBuildDir">
+            <property name="toolTip">
+             <string>This is a workfolder that Cppcheck will use for various purposes.</string>
+            </property>
+           </widget>
           </item>
           <item>
            <widget class="QPushButton" name="mBtnBrowseBuildDir">
@@ -461,18 +465,31 @@
        <item>
         <widget class="QGroupBox" name="groupBox_11">
          <property name="title">
-          <string>Check that code is safe</string>
+          <string>Analysis</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_19">
           <item>
-           <widget class="QCheckBox" name="mBugHunting">
+           <widget class="QRadioButton" name="mBtnNormalAnalysis">
             <property name="text">
-             <string>Bug hunting -- Detect all bugs. Generates mostly noise.</string>
+             <string>Normal analysis -- Avoid false positives.</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="mBtnBugHunting">
+            <property name="text">
+             <string>Bug hunting -- Generates mostly noise. The goal is to be &quot;soundy&quot; and detect most bugs.</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="mBtnSafeClasses">
+            <property name="toolTip">
+             <string>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</string>
+            </property>
             <property name="text">
              <string>Check that each class has a safe public interface</string>
             </property>
@@ -605,7 +622,11 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_13">
           <item>
-           <widget class="QLineEdit" name="mEditProjectRoot"/>
+           <widget class="QLineEdit" name="mEditProjectRoot">
+            <property name="toolTip">
+             <string>Filepaths in warnings will be relative to this path</string>
+            </property>
+           </widget>
           </item>
          </layout>
         </widget>
@@ -617,7 +638,11 @@
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_3">
           <item>
-           <widget class="QLineEdit" name="mEditTags"/>
+           <widget class="QLineEdit" name="mEditTags">
+            <property name="toolTip">
+             <string>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</string>
+            </property>
+           </widget>
           </item>
          </layout>
         </widget>
@@ -625,7 +650,7 @@
        <item>
         <widget class="QGroupBox" name="groupBox_7">
          <property name="title">
-          <string>Exclude source files in paths</string>
+          <string>Exclude source files</string>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_4">
           <item>
diff --git a/gui/resultsview.ui b/gui/resultsview.ui
index 584c8a9ea..cfe8b57d5 100644
--- a/gui/resultsview.ui
+++ b/gui/resultsview.ui
@@ -159,49 +159,34 @@
        </attribute>
        <layout class="QVBoxLayout" name="verticalLayout_6">
         <item>
-         <widget class="QSplitter" name="splitter">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
+         <widget class="QLabel" name="label_2">
+          <property name="text">
+           <string>Configured contracts:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QListWidget" name="mListAddedContracts">
+          <property name="editTriggers">
+           <set>QAbstractItemView::NoEditTriggers</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Missing contracts:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QListWidget" name="mListMissingContracts">
+          <property name="editTriggers">
+           <set>QAbstractItemView::NoEditTriggers</set>
+          </property>
+          <property name="sortingEnabled">
+           <bool>true</bool>
           </property>
-          <widget class="QWidget" name="layoutWidget">
-           <layout class="QVBoxLayout" name="verticalLayout_4">
-            <item>
-             <widget class="QLabel" name="label_2">
-              <property name="text">
-               <string>Configured contracts:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QListWidget" name="mListAddedContracts">
-              <property name="editTriggers">
-               <set>QAbstractItemView::NoEditTriggers</set>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-          <widget class="QWidget" name="layoutWidget">
-           <layout class="QVBoxLayout" name="verticalLayout_5">
-            <item>
-             <widget class="QLabel" name="label">
-              <property name="text">
-               <string>Missing contracts:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QListWidget" name="mListMissingContracts">
-              <property name="editTriggers">
-               <set>QAbstractItemView::NoEditTriggers</set>
-              </property>
-              <property name="sortingEnabled">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
          </widget>
         </item>
        </layout>