diff --git a/ground/src/plugins/emptygadget/emptygadget.cpp b/ground/src/plugins/emptygadget/emptygadget.cpp
index e5732796b..583a7b6bf 100644
--- a/ground/src/plugins/emptygadget/emptygadget.cpp
+++ b/ground/src/plugins/emptygadget/emptygadget.cpp
@@ -13,6 +13,7 @@ EmptyGadget::EmptyGadget(EmptyGadgetWidget *widget) :
         m_widget(widget),
         m_toolbar(new QToolBar())
 {
+    m_gadgetKind = QString("EmptyGadget");
 }
 
 EmptyGadget::~EmptyGadget()
diff --git a/ground/src/plugins/emptygadget/emptygadgetfactory.cpp b/ground/src/plugins/emptygadget/emptygadgetfactory.cpp
index 2afbdb9d4..0d315856d 100644
--- a/ground/src/plugins/emptygadget/emptygadgetfactory.cpp
+++ b/ground/src/plugins/emptygadget/emptygadgetfactory.cpp
@@ -11,6 +11,8 @@
 
 EmptyGadgetFactory::EmptyGadgetFactory(QObject *parent) : IUAVGadgetFactory(parent)
 {
+    m_name = tr("Choose gadget...");
+    m_gadgetKind = QString("EmptyGadget");
 }
 
 EmptyGadgetFactory::~EmptyGadgetFactory()
@@ -22,7 +24,3 @@ Core::IUAVGadget* EmptyGadgetFactory::createUAVGadget(QWidget *parent) {
         EmptyGadgetWidget* gadgetWidget = new EmptyGadgetWidget(parent);
         return new EmptyGadget(gadgetWidget);
 }
-
-QString EmptyGadgetFactory::name() {
-        return QString("EmptyGadget");
-}
diff --git a/ground/src/plugins/emptygadget/emptygadgetfactory.h b/ground/src/plugins/emptygadget/emptygadgetfactory.h
index 8bb028f6c..4279b78c7 100644
--- a/ground/src/plugins/emptygadget/emptygadgetfactory.h
+++ b/ground/src/plugins/emptygadget/emptygadgetfactory.h
@@ -22,7 +22,6 @@ public:
     ~EmptyGadgetFactory();
 
     Core::IUAVGadget *createUAVGadget(QWidget *parent);
-    QString name();
 };
 
 #endif // EMPTYGADGETFACTORY_H_
diff --git a/ground/src/plugins/emptygadget/emptygadgetwidget.cpp b/ground/src/plugins/emptygadget/emptygadgetwidget.cpp
index 50c7b7278..2f70e88df 100644
--- a/ground/src/plugins/emptygadget/emptygadgetwidget.cpp
+++ b/ground/src/plugins/emptygadget/emptygadgetwidget.cpp
@@ -17,8 +17,10 @@ EmptyGadgetWidget::EmptyGadgetWidget(QWidget *parent) : QLabel(parent)
 {
     setMinimumSize(64,64);
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-    setText(QString("Empty gadget"));
-
+    this->
+    setText(tr("Choose a gadget to display in this view.\n") +
+            tr("You can also split this view in two.\n\n") +
+            tr("Once you are done, choose Hide Toolbars in the Window menu."));
 }
 
 EmptyGadgetWidget::~EmptyGadgetWidget()
diff --git a/ground/src/plugins/emptygadget/emptyplugin.cpp b/ground/src/plugins/emptygadget/emptyplugin.cpp
index 93d361311..82f502086 100644
--- a/ground/src/plugins/emptygadget/emptyplugin.cpp
+++ b/ground/src/plugins/emptygadget/emptyplugin.cpp
@@ -28,7 +28,6 @@ bool EmptyPlugin::initialize(const QStringList& args, QString *errMsg)
    Q_UNUSED(errMsg);
    mf = new EmptyGadgetFactory(this);
    addAutoReleasedObject(mf);
-   qDebug() << "EmptyPlugin::initialize()";
 
    return true;
 }
diff --git a/ground/src/plugins/map/mapgadget.cpp b/ground/src/plugins/map/mapgadget.cpp
index 0e5d10bcd..0592ec606 100644
--- a/ground/src/plugins/map/mapgadget.cpp
+++ b/ground/src/plugins/map/mapgadget.cpp
@@ -13,6 +13,7 @@ MapGadget::MapGadget(MapGadgetWidget *widget) :
         m_widget(widget),
         m_toolbar(new QToolBar())
 {
+    m_gadgetKind = QString("MapGadget");
 }
 
 MapGadget::~MapGadget()
diff --git a/ground/src/plugins/map/mapgadgetfactory.cpp b/ground/src/plugins/map/mapgadgetfactory.cpp
index d300b6bb6..46ccc34b1 100644
--- a/ground/src/plugins/map/mapgadgetfactory.cpp
+++ b/ground/src/plugins/map/mapgadgetfactory.cpp
@@ -11,6 +11,8 @@
 
 MapGadgetFactory::MapGadgetFactory(QObject *parent) : IUAVGadgetFactory(parent)
 {
+    m_name = tr("Map Gadget");
+    m_gadgetKind = QString("MapGadget");
 }
 
 MapGadgetFactory::~MapGadgetFactory()
@@ -22,7 +24,3 @@ Core::IUAVGadget* MapGadgetFactory::createUAVGadget(QWidget *parent) {
 	MapGadgetWidget* gadgetWidget = new MapGadgetWidget(parent);
 	return new MapGadget(gadgetWidget);
 }
-
-QString MapGadgetFactory::name() {
-	return QString("MapGadget");
-}
diff --git a/ground/src/plugins/map/mapgadgetfactory.h b/ground/src/plugins/map/mapgadgetfactory.h
index 612f32468..4bc964042 100644
--- a/ground/src/plugins/map/mapgadgetfactory.h
+++ b/ground/src/plugins/map/mapgadgetfactory.h
@@ -22,7 +22,6 @@ public:
     ~MapGadgetFactory();
 
     Core::IUAVGadget *createUAVGadget(QWidget *parent);
-    QString name();
 };
 
 #endif // MAPGADGETFACTORY_H_
diff --git a/ground/src/plugins/map/mapplugin.cpp b/ground/src/plugins/map/mapplugin.cpp
index 1a56c878b..42d1042f2 100644
--- a/ground/src/plugins/map/mapplugin.cpp
+++ b/ground/src/plugins/map/mapplugin.cpp
@@ -28,7 +28,6 @@ bool MapPlugin::initialize(const QStringList& args, QString *errMsg)
    Q_UNUSED(errMsg);
    mf = new MapGadgetFactory(this);
    addAutoReleasedObject(mf);
-   qDebug() << "MapPlugin::initialize()";
 
    return true;
 }
diff --git a/ground/src/plugins/scope/scopegadget.cpp b/ground/src/plugins/scope/scopegadget.cpp
index 86a2020e3..a50128ce8 100644
--- a/ground/src/plugins/scope/scopegadget.cpp
+++ b/ground/src/plugins/scope/scopegadget.cpp
@@ -13,6 +13,7 @@ ScopeGadget::ScopeGadget(ScopeGadgetWidget *widget) :
         m_widget(widget),
         m_toolbar(new QToolBar())
 {
+    m_gadgetKind = QString("ScopeGadget");
 }
 
 ScopeGadget::~ScopeGadget()
diff --git a/ground/src/plugins/scope/scopegadgetfactory.cpp b/ground/src/plugins/scope/scopegadgetfactory.cpp
index 93269b08e..9db994206 100644
--- a/ground/src/plugins/scope/scopegadgetfactory.cpp
+++ b/ground/src/plugins/scope/scopegadgetfactory.cpp
@@ -11,6 +11,8 @@
 
 ScopeGadgetFactory::ScopeGadgetFactory(QObject *parent) : IUAVGadgetFactory(parent)
 {
+    m_name = tr("Scope Gadget");
+    m_gadgetKind = QString("ScopeGadget");
 }
 
 ScopeGadgetFactory::~ScopeGadgetFactory()
@@ -22,7 +24,3 @@ Core::IUAVGadget* ScopeGadgetFactory::createUAVGadget(QWidget *parent) {
         ScopeGadgetWidget* gadgetWidget = new ScopeGadgetWidget(parent);
         return new ScopeGadget(gadgetWidget);
 }
-
-QString ScopeGadgetFactory::name() {
-        return QString("ScopeGadget");
-}
diff --git a/ground/src/plugins/scope/scopegadgetfactory.h b/ground/src/plugins/scope/scopegadgetfactory.h
index e05ec7f52..d0e377f2b 100644
--- a/ground/src/plugins/scope/scopegadgetfactory.h
+++ b/ground/src/plugins/scope/scopegadgetfactory.h
@@ -22,7 +22,6 @@ public:
     ~ScopeGadgetFactory();
 
     Core::IUAVGadget *createUAVGadget(QWidget *parent);
-    QString name();
 };
 
 #endif // SCOPEGADGETFACTORY_H_
diff --git a/ground/src/plugins/scope/scopeplugin.cpp b/ground/src/plugins/scope/scopeplugin.cpp
index fa1a3ae75..bc9cba2d1 100644
--- a/ground/src/plugins/scope/scopeplugin.cpp
+++ b/ground/src/plugins/scope/scopeplugin.cpp
@@ -28,7 +28,6 @@ bool ScopePlugin::initialize(const QStringList& args, QString *errMsg)
    Q_UNUSED(errMsg);
    mf = new ScopeGadgetFactory(this);
    addAutoReleasedObject(mf);
-   qDebug() << "ScopePlugin::initialize()";
 
    return true;
 }