diff --git a/rbutil/rbutilqt/comboboxviewdelegate.cpp b/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp
similarity index 100%
rename from rbutil/rbutilqt/comboboxviewdelegate.cpp
rename to rbutil/rbutilqt/gui/comboboxviewdelegate.cpp
diff --git a/rbutil/rbutilqt/comboboxviewdelegate.h b/rbutil/rbutilqt/gui/comboboxviewdelegate.h
similarity index 100%
rename from rbutil/rbutilqt/comboboxviewdelegate.h
rename to rbutil/rbutilqt/gui/comboboxviewdelegate.h
diff --git a/rbutil/rbutilqt/gui/infowidgetfrm.ui b/rbutil/rbutilqt/gui/infowidgetfrm.ui
index 41ac46f8dc..8c7fdb30f7 100644
--- a/rbutil/rbutilqt/gui/infowidgetfrm.ui
+++ b/rbutil/rbutilqt/gui/infowidgetfrm.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Info</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
@@ -31,7 +31,7 @@
     <widget class="QTreeWidget" name="treeInfo">
      <column>
       <property name="text">
-       <string>1</string>
+       <string>Package</string>
       </property>
      </column>
     </widget>
diff --git a/rbutil/rbutilqt/gui/manualwidgetfrm.ui b/rbutil/rbutilqt/gui/manualwidgetfrm.ui
index 8757c4569e..add26736c9 100644
--- a/rbutil/rbutilqt/gui/manualwidgetfrm.ui
+++ b/rbutil/rbutilqt/gui/manualwidgetfrm.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Manual</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
index dbbe4afb4d..ec8ce1cc64 100644
--- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
@@ -63,7 +63,7 @@ void SelectiveInstallWidget::selectedVersionChanged(int index)
     if(current == "release")
         ui.selectedDescription->setText(tr("This is the latest stable "
                     "release available."));
-    if(current == "current")
+    if(current == "development")
         ui.selectedDescription->setText(tr("The development version is "
                     "updated on every code change. Last update was on %1").arg(
                         ServerInfo::value(ServerInfo::BleedingDate).toString()));
@@ -89,7 +89,7 @@ void SelectiveInstallWidget::updateVersion(void)
     // re-populate all version items
     m_versions.clear();
     m_versions.insert("release", ServerInfo::value(ServerInfo::CurReleaseVersion).toString());
-    m_versions.insert("current", ServerInfo::value(ServerInfo::BleedingRevision).toString());
+    m_versions.insert("development", ServerInfo::value(ServerInfo::BleedingRevision).toString());
     m_versions.insert("rc", ServerInfo::value(ServerInfo::RelCandidateVersion).toString());
 
     ui.selectedVersion->clear();
@@ -97,9 +97,9 @@ void SelectiveInstallWidget::updateVersion(void)
         ui.selectedVersion->addItem(tr("Stable Release (Version %1)").arg(
                     m_versions["release"]), "release");
     }
-    if(!m_versions["current"].isEmpty()) {
+    if(!m_versions["development"].isEmpty()) {
         ui.selectedVersion->addItem(tr("Development Version (Revison %1)").arg(
-                    m_versions["current"]), "current");
+                    m_versions["development"]), "development");
     }
     if(!m_versions["rc"].isEmpty()) {
         ui.selectedVersion->addItem(tr("Release Candidate (Revison %1)").arg(
@@ -116,7 +116,7 @@ void SelectiveInstallWidget::updateVersion(void)
         ui.selectedVersion->setCurrentIndex(index);
     }
     else {
-        index = ui.selectedVersion->findData("current");
+        index = ui.selectedVersion->findData("development");
         ui.selectedVersion->setCurrentIndex(index);
     }
     // check if Rockbox is installed. If it is untick the bootloader option, as
@@ -377,7 +377,7 @@ void SelectiveInstallWidget::installRockbox(void)
 
         if(selected == "release") url = ServerInfo::platformValue(m_target,
                 ServerInfo::CurReleaseUrl).toString();
-        else if(selected == "current") url = ServerInfo::platformValue(m_target,
+        else if(selected == "development") url = ServerInfo::platformValue(m_target,
                 ServerInfo::CurDevelUrl).toString();
         else if(selected == "rc") url = ServerInfo::platformValue(m_target,
                 ServerInfo::RelCandidateUrl).toString();
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui b/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui
index 25cf44ba90..65a6f18620 100644
--- a/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui
+++ b/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui
@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Selective Installation</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <item row="0" column="0">
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 76c8497a5b..62a4f583f7 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -353,14 +353,14 @@ void RbUtilQt::updateDevice()
     QString name
         = QString("%1 (%2)").arg(SystemInfo::value(SystemInfo::CurName).toString(),
             ServerInfo::value(ServerInfo::CurStatus).toString());
-    ui.labelDevice->setText(tr("<b>%1 %2</b>").arg(brand, name));
+    ui.labelDevice->setText(QString("<b>%1 %2</b>").arg(brand, name));
 
     QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString();
     QString mountdisplay = QDir::toNativeSeparators(mountpoint);
     if(!mountdisplay.isEmpty()) {
         QString label = Utils::filesystemName(mountpoint);
         if(!label.isEmpty()) mountdisplay += QString(" (%1)").arg(label);
-        ui.labelMountpoint->setText(tr("<b>%1</b>").arg(mountdisplay));
+        ui.labelMountpoint->setText(QString("<b>%1</b>").arg(mountdisplay));
     }
     else {
         mountdisplay = "(unknown)";
diff --git a/rbutil/rbutilqt/rbutilqt.pri b/rbutil/rbutilqt/rbutilqt.pri
index ebb49f09ec..141c5eea75 100644
--- a/rbutil/rbutilqt/rbutilqt.pri
+++ b/rbutil/rbutilqt/rbutilqt.pri
@@ -76,7 +76,7 @@ SOURCES += \
  quazip/zip.c \
  quazip/ioapi.c \
  base/ziputil.cpp \
- comboboxviewdelegate.cpp \
+ gui/comboboxviewdelegate.cpp \
  gui/selectiveinstallwidget.cpp \
  gui/backupdialog.cpp \
 
@@ -148,7 +148,7 @@ HEADERS += \
  quazip/zip.h \
  base/ziputil.h \
  lame/lame.h \
- comboboxviewdelegate.h \
+ gui/comboboxviewdelegate.h \
  gui/selectiveinstallwidget.h \
  gui/backupdialog.h \