diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index 05c50eb86..159fb91e6 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -1718,11 +1718,11 @@ EventHandler::ActionList EventHandler::ourEmulActionList[EMUL_ACTIONLIST_SIZE] =
 #endif
   { Event::ToggleTimeMachine,       "Toggle 'Time Machine' mode",            "" },
   { Event::TimeMachineMode,         "Toggle 'Time Machine' UI",              "" },
-  { Event::RewindPause,             "Rewind one state and enter pause mode", "" },
+  { Event::RewindPause,             "Rewind one state & enter pause mode",   "" },
   { Event::Rewind1Menu,             "Rewind one state & enter TM UI",        "" },
   { Event::Rewind10Menu,            "Rewind 10 states & enter TM UI",        "" },
   { Event::RewindAllMenu,           "Rewind all states & enter TM UI",       "" },
-  { Event::UnwindPause,             "Unwind one state and enter pause mode", "" },
+  { Event::UnwindPause,             "Unwind one state & enter pause mode",   "" },
   { Event::Unwind1Menu,             "Unwind one state & enter TM UI",        "" },
   { Event::Unwind10Menu,            "Unwind 10 states & enter TM UI",        "" },
   { Event::UnwindAllMenu,           "Unwind all states & enter TM UI",       "" },
diff --git a/src/gui/EventMappingWidget.cxx b/src/gui/EventMappingWidget.cxx
index 47527e809..81d579373 100644
--- a/src/gui/EventMappingWidget.cxx
+++ b/src/gui/EventMappingWidget.cxx
@@ -49,7 +49,6 @@ EventMappingWidget::EventMappingWidget(GuiObject* boss, const GUI::Font& font,
     myLastValue(0),
     myFirstTime(true)
 {
-  const GUI::Font& ifont = boss->instance().frameBuffer().infoFont();
   const int fontHeight   = font.getFontHeight(),
             lineHeight   = font.getLineHeight(),
             buttonWidth  = font.getStringWidth("Defaults") + 10,
@@ -59,7 +58,7 @@ EventMappingWidget::EventMappingWidget(GuiObject* boss, const GUI::Font& font,
   int xpos = HBORDER, ypos = VBORDER;
 
   myActionsList = new StringListWidget(boss, font, xpos, ypos,
-                                       _w - buttonWidth - HBORDER * 2 - 8, _h - 4*lineHeight - VBORDER);
+                                       _w - buttonWidth - HBORDER * 2 - 8, _h - 3*lineHeight - VBORDER);
   myActionsList->setTarget(this);
   myActionsList->setEditable(false);
   myActionsList->setList(actions);
@@ -120,10 +119,6 @@ EventMappingWidget::EventMappingWidget(GuiObject* boss, const GUI::Font& font,
                                     _w - xpos - t->getWidth() - 8 - HBORDER, lineHeight, "");
   myKeyMapping->setEditable(false, true);
   myKeyMapping->clearFlags(Widget::FLAG_RETAIN_FOCUS);
-
-  // Add information for hardcoded keys
-  ypos += lineHeight + 8;
-  new StaticTextWidget(boss, ifont, xpos, ypos, "(*) Hardcoded action, cannot be erased");
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/gui/InputDialog.cxx b/src/gui/InputDialog.cxx
index f5353ea7d..94d90d18a 100644
--- a/src/gui/InputDialog.cxx
+++ b/src/gui/InputDialog.cxx
@@ -51,7 +51,7 @@ InputDialog::InputDialog(OSystem& osystem, DialogContainer& parent,
   StringList actions;
 
   // Set real dimensions
-  setSize(50 * fontWidth + 10, 17 * (lineHeight + 4) + 16 + _th, max_w, max_h);
+  setSize(51 * fontWidth + 10, 17 * (lineHeight + 4) + 16 + _th, max_w, max_h);
 
   // The tab widget
   xpos = 2; ypos = vBorder + _th;