diff --git a/data/gui/options_av.stkgui b/data/gui/options_av.stkgui
index 6a1612d8c..8ffde8b51 100644
--- a/data/gui/options_av.stkgui
+++ b/data/gui/options_av.stkgui
@@ -62,7 +62,7 @@
         
         <spacer height="10" width="10"/>
 
-        <button id="apply_resolution" width="40%" height="30"
+        <button id="apply_resolution" height="35"
                 I18N="In the video settings menu" text="Apply video changes" />
         
     </box>
diff --git a/data/gui/options_players.stkgui b/data/gui/options_players.stkgui
index 3afa063e0..abb1de9c7 100644
--- a/data/gui/options_players.stkgui
+++ b/data/gui/options_players.stkgui
@@ -27,7 +27,7 @@
         <list id="players" proportion="5" width="75%" align="center"/>
         <spacer width="20" height="25"/>
         
-        <button id="addplayer" x="20" width="35%" height="30"
+        <button id="addplayer" x="20" height="35"
                 I18N="In players configuration menu"  
                 text="Add Player" align="center"/>
         <!--
diff --git a/src/guiengine/widget.cpp b/src/guiengine/widget.cpp
index ecbf597f1..290e845c1 100644
--- a/src/guiengine/widget.cpp
+++ b/src/guiengine/widget.cpp
@@ -314,10 +314,10 @@ void Widget::readCoords(Widget* parent)
     {
         IGUIFont* font = (m_title_font ? GUIEngine::getTitleFont() : GUIEngine::getFont());
         core::dimension2d< u32 > dim = font->getDimension( m_text.c_str() );
-        label_w = dim.Width;
+        label_w = dim.Width + getWidthNeededAroundLabel();
         // FIXME - won't work with multiline labels. thus, for now, when multiple
         // lines are required, we need to specify a height explicitely
-        label_h = dim.Height;
+        label_h = dim.Height + getHeightNeededAroundLabel();
     }
 
     // ---- read dimension
diff --git a/src/guiengine/widget.hpp b/src/guiengine/widget.hpp
index 77e9365dd..434653ef4 100644
--- a/src/guiengine/widget.hpp
+++ b/src/guiengine/widget.hpp
@@ -173,7 +173,15 @@ namespace GUIEngine
         bool m_player_focus[MAX_PLAYER_COUNT];
 
         bool m_reserve_id;
-                
+               
+        /** When inferring widget size from its label length, this method will be called to
+          * if/how much space must be added to the raw label's size for the widget to be large enough */
+        virtual int getWidthNeededAroundLabel()  const { return 0; }
+        
+        /** When inferring widget size from its label length, this method will be called to
+         * if/how much space must be added to the raw label's size for the widget to be large enough */
+        virtual int getHeightNeededAroundLabel() const { return 0; }
+        
     public:
         /**
          * This is set to NULL by default; set to something else in a widget to mean
diff --git a/src/guiengine/widgets/button_widget.hpp b/src/guiengine/widgets/button_widget.hpp
index 607c7b225..270789c08 100644
--- a/src/guiengine/widgets/button_widget.hpp
+++ b/src/guiengine/widgets/button_widget.hpp
@@ -30,6 +30,14 @@ namespace GUIEngine
     /** A text button widget. See guiengine/engine.hpp for a detailed overview */
     class ButtonWidget : public Widget
     {
+        /** When inferring widget size from its label length, this method will be called to
+         * if/how much space must be added to the raw label's size for the widget to be large enough */
+        virtual int getWidthNeededAroundLabel()  const { return 35; }
+        
+        /** When inferring widget size from its label length, this method will be called to
+         * if/how much space must be added to the raw label's size for the widget to be large enough */
+        virtual int getHeightNeededAroundLabel() const { return 16; }
+        
     public:
         ButtonWidget();
         virtual ~ButtonWidget() {}
diff --git a/src/guiengine/widgets/spinner_widget.hpp b/src/guiengine/widgets/spinner_widget.hpp
index 700699b8f..96ac4afd2 100644
--- a/src/guiengine/widgets/spinner_widget.hpp
+++ b/src/guiengine/widgets/spinner_widget.hpp
@@ -38,6 +38,15 @@ namespace GUIEngine
         EventPropagation transmitEvent(Widget* w, std::string& originator, const int playerID);
         EventPropagation rightPressed(const int playerID);
         EventPropagation leftPressed(const int playerID);
+        
+        /** When inferring widget size from its label length, this method will be called to
+         * if/how much space must be added to the raw label's size for the widget to be large enough */
+        virtual int getWidthNeededAroundLabel()  const { return 25; }
+        
+        /** When inferring widget size from its label length, this method will be called to
+         * if/how much space must be added to the raw label's size for the widget to be large enough */
+        virtual int getHeightNeededAroundLabel() const { return 16; }
+        
     public:
         
         SpinnerWidget(const bool gauge=false);
diff --git a/src/guiengine/widgets/text_box_widget.hpp b/src/guiengine/widgets/text_box_widget.hpp
index b73b6e9f3..2d67b20c6 100644
--- a/src/guiengine/widgets/text_box_widget.hpp
+++ b/src/guiengine/widgets/text_box_widget.hpp
@@ -30,6 +30,14 @@ namespace GUIEngine
     /** A text field widget. See guiengine/engine.hpp for a detailed overview */
     class TextBoxWidget : public Widget
     {
+        /** When inferring widget size from its label length, this method will be called to
+         * if/how much space must be added to the raw label's size for the widget to be large enough */
+        virtual int getWidthNeededAroundLabel()  const { return 10; }
+        
+        /** When inferring widget size from its label length, this method will be called to
+         * if/how much space must be added to the raw label's size for the widget to be large enough */
+        virtual int getHeightNeededAroundLabel() const { return 10; }
+        
     public:
         TextBoxWidget();
         ~TextBoxWidget()
diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index b8b996543..4dfb028f7 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -264,17 +264,18 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID, int btnID,
     bool action_found = m_device_manager->translateInput( type, deviceID, btnID, axisDirection, value, &player, &action);
 
     // in menus, some keyboard keys are standard (before each player selected his device)
-    // FIXME: should enter always work to accept for a player using keyboard?
+    // So if a key could not be mapped to any known binding, fall back to check the defaults.
     if (!action_found && StateManager::get()->getGameState() != GUIEngine::GAME && type == Input::IT_KEYBOARD &&
         m_mode == MENU && m_device_manager->getAssignMode() == NO_ASSIGN)
     {
         action = PA_FIRST;
 
-        if      (btnID == KEY_UP)    action = PA_ACCEL;
-        else if (btnID == KEY_DOWN)  action = PA_BRAKE;
-        else if (btnID == KEY_LEFT)  action = PA_LEFT;
-        else if (btnID == KEY_RIGHT) action = PA_RIGHT;
-        else if (btnID == KEY_SPACE) action = PA_FIRE;
+        if      (btnID == KEY_UP)     action = PA_ACCEL;
+        else if (btnID == KEY_DOWN)   action = PA_BRAKE;
+        else if (btnID == KEY_LEFT)   action = PA_LEFT;
+        else if (btnID == KEY_RIGHT)  action = PA_RIGHT;
+        else if (btnID == KEY_SPACE)  action = PA_FIRE;
+        else if (btnID == KEY_RETURN) action = PA_FIRE;
 
         if (btnID == KEY_RETURN && GUIEngine::ModalDialog::isADialogActive())
         {