diff --git a/openhantek/src/dockwindows.h b/openhantek/src/dockwindows.h
index 4fa645a..f2bcb2d 100644
--- a/openhantek/src/dockwindows.h
+++ b/openhantek/src/dockwindows.h
@@ -45,7 +45,7 @@ class HorizontalDock : public QDockWidget {
   Q_OBJECT
 
 public:
-  HorizontalDock(DsoSettings *settings, QWidget *parent = 0,
+  HorizontalDock(DsoSettings *settings, QWidget *parent,
                  Qt::WindowFlags flags = 0);
   ~HorizontalDock();
 
@@ -114,7 +114,7 @@ class TriggerDock : public QDockWidget {
 
 public:
   TriggerDock(DsoSettings *settings, const QStringList *specialTriggers,
-              QWidget *parent = 0, Qt::WindowFlags flags = 0);
+              QWidget *parent, Qt::WindowFlags flags = 0);
   ~TriggerDock();
 
   int setMode(Dso::TriggerMode mode);
@@ -162,7 +162,7 @@ class VoltageDock : public QDockWidget {
   Q_OBJECT
 
 public:
-  VoltageDock(DsoSettings *settings, QWidget *parent = 0,
+  VoltageDock(DsoSettings *settings, QWidget *parent,
               Qt::WindowFlags flags = 0);
   ~VoltageDock();
 
@@ -215,7 +215,7 @@ class SpectrumDock : public QDockWidget {
   Q_OBJECT
 
 public:
-  SpectrumDock(DsoSettings *settings, QWidget *parent = 0,
+  SpectrumDock(DsoSettings *settings, QWidget *parent,
                Qt::WindowFlags flags = 0);
   ~SpectrumDock();
 
diff --git a/openhantek/src/mainwindow.cpp b/openhantek/src/mainwindow.cpp
index 3a1ab2b..a84ec1d 100644
--- a/openhantek/src/mainwindow.cpp
+++ b/openhantek/src/mainwindow.cpp
@@ -18,6 +18,7 @@
 #include "dataanalyzer.h"
 #include "dockwindows.h"
 #include "hantekdsocontrol.h"
+#include "usb/usbdevice.h"
 #include "dsowidget.h"
 #include "hantek/hantekdsocontrol.h"
 #include "settings.h"
@@ -32,7 +33,7 @@ OpenHantekMainWindow::OpenHantekMainWindow(std::shared_ptr<HantekDsoControl> dso
 
     // Window title
     setWindowIcon(QIcon(":openhantek.png"));
-    setWindowTitle(tr("OpenHantek"));
+    setWindowTitle(tr("OpenHantek - Device %1").arg(QString::fromStdString(dsoControl->getDevice()->getModel().name)));
 
     // Application settings
     settings = new DsoSettings();
@@ -40,6 +41,7 @@ OpenHantekMainWindow::OpenHantekMainWindow(std::shared_ptr<HantekDsoControl> dso
     readSettings();
 
     // Create dock windows before the dso widget, they fix messed up settings
+    setDockOptions(dockOptions() | QMainWindow::GroupedDragging);
     createDockWindows();
 
     // Central oszilloscope widget
@@ -249,10 +251,10 @@ void OpenHantekMainWindow::createStatusBar() {
 
 /// \brief Create all docking windows.
 void OpenHantekMainWindow::createDockWindows() {
-    horizontalDock = new HorizontalDock(settings);
-    triggerDock = new TriggerDock(settings, dsoControl->getSpecialTriggerSources());
-    spectrumDock = new SpectrumDock(settings);
-    voltageDock = new VoltageDock(settings);
+    horizontalDock = new HorizontalDock(settings, this);
+    triggerDock = new TriggerDock(settings, dsoControl->getSpecialTriggerSources(), this);
+    spectrumDock = new SpectrumDock(settings, this);
+    voltageDock = new VoltageDock(settings, this);
 }
 
 /// \brief Connect general signals and device management signals.