diff --git a/Changes.txt b/Changes.txt
index 743a72c4d..ade3f0c1d 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -31,6 +31,8 @@
       choice of 'red', 'orange', 'yellow', 'green', 'blue' and 'purple'.
       This is accessible through the new 'tia.dbgcolors' commandline
       argument.
+    - Several ROMs that have never worked in any emulator are now
+      emulated correctly.
     - ...
 
   * Implemented new phosphor emulation mode, which is much closer to real
diff --git a/docs/graphics/cheat.png b/docs/graphics/cheat.png
index 47b755f70..bdac1abbd 100644
Binary files a/docs/graphics/cheat.png and b/docs/graphics/cheat.png differ
diff --git a/docs/graphics/launcher.png b/docs/graphics/launcher.png
index c5407fb6c..c5a04f49d 100644
Binary files a/docs/graphics/launcher.png and b/docs/graphics/launcher.png differ
diff --git a/docs/graphics/rom_browser.png b/docs/graphics/rom_browser.png
index ba60c54a0..76c0cef5d 100644
Binary files a/docs/graphics/rom_browser.png and b/docs/graphics/rom_browser.png differ
diff --git a/docs/graphics/rominfo_1x_large.png b/docs/graphics/rominfo_1x_large.png
index c451bd906..76e29a384 100644
Binary files a/docs/graphics/rominfo_1x_large.png and b/docs/graphics/rominfo_1x_large.png differ
diff --git a/docs/graphics/rominfo_1x_small.png b/docs/graphics/rominfo_1x_small.png
index 9db78c702..fc1c5b73e 100644
Binary files a/docs/graphics/rominfo_1x_small.png and b/docs/graphics/rominfo_1x_small.png differ
diff --git a/docs/graphics/rominfo_2x_small.png b/docs/graphics/rominfo_2x_small.png
index 6d2f2e07b..aed5e9fec 100644
Binary files a/docs/graphics/rominfo_2x_small.png and b/docs/graphics/rominfo_2x_small.png differ
diff --git a/src/cheat/CheatCodeDialog.cxx b/src/cheat/CheatCodeDialog.cxx
index 5818b8b69..691587ec7 100644
--- a/src/cheat/CheatCodeDialog.cxx
+++ b/src/cheat/CheatCodeDialog.cxx
@@ -79,8 +79,8 @@ CheatCodeDialog::CheatCodeDialog(OSystem& osystem, DialogContainer& parent,
 
   // Inputbox which will pop up when adding/editing a cheat
   StringList labels;
-  labels.push_back("Name:       ");
-  labels.push_back("Code (hex): ");
+  labels.push_back("Name       ");
+  labels.push_back("Code (hex) ");
   myCheatInput = make_ptr<InputTextDialog>(this, font, labels);
   myCheatInput->setTarget(this);
 
diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx
index db57aa4b1..74a00a568 100644
--- a/src/gui/LauncherDialog.cxx
+++ b/src/gui/LauncherDialog.cxx
@@ -59,6 +59,7 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
 
   const int fontWidth = font.getMaxCharWidth(),
             fontHeight = font.getFontHeight(),
+            lineHeight = font.getLineHeight(),
             bwidth  = (_w - 2 * 10 - 8 * (4 - 1)) / 4,
             bheight = font.getLineHeight() + 4;
   int xpos = 0, ypos = 0, lwidth = 0, lwidth2 = 0;
@@ -98,7 +99,7 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
 
   int listWidth = _w - (romWidth > 0 ? romWidth+5 : 0) - 20;
   myList = new StringListWidget(this, font, xpos, ypos,
-                                listWidth, _h - 28 - bheight - 2*fontHeight);
+                                listWidth, _h - 35 - bheight - 2*fontHeight);
   myList->setEditable(false);
   wid.push_back(myList);
   if(myPattern)  wid.push_back(myPattern);  // Add after the list for tab order
@@ -113,16 +114,16 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
         xpos, ypos, romWidth, myList->getHeight());
   }
 
-  // Add note textwidget to show any notes for the currently selected ROM
+  // Add textfield to show current directory
   xpos = 10;
   xpos += 5;  ypos += myList->getHeight() + 4;
-  lwidth = font.getStringWidth("Note");
-  myDirLabel = new StaticTextWidget(this, font, xpos, ypos, lwidth, fontHeight,
-                                    "Dir:", kTextAlignLeft);
+  lwidth = font.getStringWidth("Dir ");
+  myDirLabel = new StaticTextWidget(this, font, xpos, ypos+2, lwidth, fontHeight,
+                                    "Dir", kTextAlignLeft);
   xpos += lwidth + 5;
-  myDir = new StaticTextWidget(this, font, xpos, ypos,
-                                _w - xpos - 10, fontHeight,
-                                "", kTextAlignLeft);
+  myDir = new EditTextWidget(this, font, xpos, ypos, _w - xpos - 10, lineHeight, "");
+  myDir->setEditable(false, true);
+  myDir->clearFlags(WIDGET_RETAIN_FOCUS);
 
   // Add four buttons at the bottom
   xpos = 10;  ypos += myDir->getHeight() + 4;
@@ -257,7 +258,7 @@ void LauncherDialog::updateListing(const string& nameToSelect)
 {
   // Start with empty list
   myGameList->clear();
-  myDir->setLabel("");
+  myDir->setText("");
 
   loadDirListing();
 
@@ -265,7 +266,7 @@ void LauncherDialog::updateListing(const string& nameToSelect)
   myPrevDirButton->setEnabled(myCurrentNode.hasParent());
 
   // Show current directory
-  myDir->setLabel(myCurrentNode.getShortPath());
+  myDir->setText(myCurrentNode.getShortPath());
 
   // Now fill the list widget with the contents of the GameList
   StringList l;
diff --git a/src/gui/LauncherDialog.hxx b/src/gui/LauncherDialog.hxx
index 0803a5b27..379bee155 100644
--- a/src/gui/LauncherDialog.hxx
+++ b/src/gui/LauncherDialog.hxx
@@ -106,7 +106,7 @@ class LauncherDialog : public Dialog
 
     StringListWidget* myList;
     StaticTextWidget* myDirLabel;
-    StaticTextWidget* myDir;
+    EditTextWidget*   myDir;
     StaticTextWidget* myRomCount;
     EditTextWidget*   myPattern;