diff --git a/RetroFE/Source/Control/UserInput.cpp b/RetroFE/Source/Control/UserInput.cpp
index ea0ce4e..f27b876 100644
--- a/RetroFE/Source/Control/UserInput.cpp
+++ b/RetroFE/Source/Control/UserInput.cpp
@@ -31,8 +31,25 @@ bool UserInput::Initialize()
 {
     bool retVal = true;
 
-    retVal = MapKey("nextItem", KeyCodeNextItem) && retVal;
-    retVal = MapKey("previousItem", KeyCodePreviousItem) && retVal;
+    if(!MapKey("up", KeyCodeUp))
+    {
+        retVal = MapKey("previousItem", KeyCodeUp) && retVal;
+    }
+    if(!MapKey("down", KeyCodePageDown))
+    {
+        retVal = MapKey("nextItem", KeyCodeDown) && retVal;
+    }
+
+    if(!MapKey("left", KeyCodeLeft))
+    {
+        retVal = MapKey("previousItem", KeyCodeLeft) && retVal;
+    }
+
+    if(!MapKey("right", KeyCodeRight))
+    {
+        retVal = MapKey("nextItem", KeyCodeRight) && retVal;
+    }
+
     retVal = MapKey("pageDown", KeyCodePageDown) && retVal;
     retVal = MapKey("pageUp", KeyCodePageUp) && retVal;
     retVal = MapKey("select", KeyCodeSelect) && retVal;
@@ -61,7 +78,6 @@ SDL_Scancode UserInput::GetScancode(KeyCode_E key)
 
 bool UserInput::MapKey(std::string keyDescription, KeyCode_E key)
 {
-    bool retVal = false;
     SDL_Scancode scanCode;
     std::string description;
 
@@ -70,22 +86,17 @@ bool UserInput::MapKey(std::string keyDescription, KeyCode_E key)
     if(!Config.GetProperty(configKey, description))
     {
         Logger::Write(Logger::ZONE_ERROR, "Configuration", "Missing property " + configKey);
+        return false;
     }
-    else
+    scanCode = SDL_GetScancodeFromName(description.c_str());
+
+    if(scanCode == SDL_SCANCODE_UNKNOWN)
     {
-        scanCode = SDL_GetScancodeFromName(description.c_str());
-
-        if(scanCode == SDL_SCANCODE_UNKNOWN)
-        {
-            Logger::Write(Logger::ZONE_ERROR, "Configuration", "Unsupported property value for " + configKey + "(" + description + "). See Documentation/Keycodes.txt for valid inputs");
-        }
-        else
-        {
-            KeyMap[key] = scanCode;
-            retVal = true;
-        }
+        Logger::Write(Logger::ZONE_ERROR, "Configuration", "Unsupported property value for " + configKey + "(" + description + "). See Documentation/Keycodes.txt for valid inputs");
+        return false;
     }
+    KeyMap[key] = scanCode;
 
-    return retVal;
+    return true;
 }
 
diff --git a/RetroFE/Source/Control/UserInput.h b/RetroFE/Source/Control/UserInput.h
index 455a87c..80232fe 100644
--- a/RetroFE/Source/Control/UserInput.h
+++ b/RetroFE/Source/Control/UserInput.h
@@ -25,8 +25,10 @@ class UserInput
 public:
     enum KeyCode_E
     {
-        KeyCodeNextItem,
-        KeyCodePreviousItem,
+        KeyCodeDown,
+        KeyCodeUp,
+        KeyCodeLeft,
+        KeyCodeRight,
         KeyCodeSelect,
         KeyCodeBack,
         KeyCodePageDown,
diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index 5eb324e..b7c00f4 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -376,11 +376,19 @@ RetroFE::RETROFE_STATE RetroFE::ProcessUserInput(Page *page)
 
         Attract.Reset();
 
-        if (keys[Input.GetScancode(UserInput::KeyCodePreviousItem)])
+        if (keys[Input.GetScancode(UserInput::KeyCodeUp)])
         {
             page->SetScrolling(Page::ScrollDirectionBack);
         }
-        if (keys[Input.GetScancode(UserInput::KeyCodeNextItem)])
+        if (keys[Input.GetScancode(UserInput::KeyCodeDown)])
+        {
+            page->SetScrolling(Page::ScrollDirectionForward);
+        }
+        if (keys[Input.GetScancode(UserInput::KeyCodeLeft)])
+        {
+            page->SetScrolling(Page::ScrollDirectionBack);
+        }
+        if (keys[Input.GetScancode(UserInput::KeyCodeRight)])
         {
             page->SetScrolling(Page::ScrollDirectionForward);
         }
@@ -430,8 +438,10 @@ RetroFE::RETROFE_STATE RetroFE::ProcessUserInput(Page *page)
             state = RETROFE_QUIT_REQUEST;
         }
 
-        if(!keys[Input.GetScancode(UserInput::KeyCodePreviousItem)] &&
-                !keys[Input.GetScancode(UserInput::KeyCodeNextItem)] &&
+        if(!keys[Input.GetScancode(UserInput::KeyCodeUp)] &&
+                !keys[Input.GetScancode(UserInput::KeyCodeDown)] &&
+                !keys[Input.GetScancode(UserInput::KeyCodeLeft)] &&
+                !keys[Input.GetScancode(UserInput::KeyCodeRight)] &&
                 !keys[Input.GetScancode(UserInput::KeyCodePageUp)] &&
                 !keys[Input.GetScancode(UserInput::KeyCodePageDown)])
         {