diff --git a/Package/Environment/Common/controls.conf b/Package/Environment/Common/controls.conf
index 77c89f0..d42051b 100644
--- a/Package/Environment/Common/controls.conf
+++ b/Package/Environment/Common/controls.conf
@@ -1,7 +1,7 @@
 up = Up
 down = Down
 left = Left
-right: Right
+right = Right
 pageUp = A
 pageDown = B
 select = Space
diff --git a/RetroFE/Source/Control/UserInput.cpp b/RetroFE/Source/Control/UserInput.cpp
index 23d3707..79c11af 100644
--- a/RetroFE/Source/Control/UserInput.cpp
+++ b/RetroFE/Source/Control/UserInput.cpp
@@ -33,19 +33,19 @@ bool UserInput::Initialize()
 
     if(!MapKey("up", KeyCodeUp))
     {
-        retVal = MapKey("previousItem", KeyCodeUp) && retVal;
+        retVal = MapKey("left", KeyCodeUp) && retVal;
     }
     if(!MapKey("left", KeyCodeLeft))
     {
-        retVal = MapKey("previousItem", KeyCodeLeft) && retVal;
+        retVal = MapKey("up", KeyCodeLeft) && retVal;
     }
     if(!MapKey("down", KeyCodeDown))
     {
-        retVal = MapKey("nextItem", KeyCodeDown) && retVal;
+        retVal = MapKey("right", KeyCodeDown) && retVal;
     }
     if(!MapKey("right", KeyCodeRight))
     {
-        retVal = MapKey("nextItem", KeyCodeRight) && retVal;
+        retVal = MapKey("down", KeyCodeRight) && retVal;
     }
 
     retVal = MapKey("pageDown", KeyCodePageDown) && retVal;
@@ -76,7 +76,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;
 
@@ -85,22 +84,18 @@ 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;
     }
 
-    return retVal;
+    KeyMap[key] = scanCode;
+    return true;
 }
 
diff --git a/RetroFE/Source/Graphics/PageBuilder.cpp b/RetroFE/Source/Graphics/PageBuilder.cpp
index ec03da4..77c4713 100644
--- a/RetroFE/Source/Graphics/PageBuilder.cpp
+++ b/RetroFE/Source/Graphics/PageBuilder.cpp
@@ -580,7 +580,7 @@ ScrollingList * PageBuilder::BuildMenu(xml_node<> *menuXml)
     xml_attribute<> *menuTypeXml = menuXml->first_attribute("type");
     xml_attribute<> *scrollTimeXml = menuXml->first_attribute("scrollTime");
     xml_attribute<> *scrollAccelerationXml = menuXml->first_attribute("scrollAcceleration");
-    xml_attribute<> *scrollOrientationXml = menuXml->first_attribute("scrollOrientation");
+    xml_attribute<> *scrollOrientationXml = menuXml->first_attribute("orientation");
 
     if(menuTypeXml)
     {
diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index 92ee853..238f656 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -378,7 +378,7 @@ RetroFE::RETROFE_STATE RetroFE::ProcessUserInput(Page *page)
 
         Attract.Reset();
 
-	if(page->IsHorizontalScroll())
+	    if(page->IsHorizontalScroll())
         {
             if (keys[Input.GetScancode(UserInput::KeyCodeLeft)])
             {
@@ -386,30 +386,30 @@ RetroFE::RETROFE_STATE RetroFE::ProcessUserInput(Page *page)
             }
             if (keys[Input.GetScancode(UserInput::KeyCodeRight)])
             {
-               page->SetScrolling(Page::ScrollDirectionForward);
+                page->SetScrolling(Page::ScrollDirectionForward);
             } 
+        }
+        else
+        { 
             if (keys[Input.GetScancode(UserInput::KeyCodeUp)])
             {
                 page->SetScrolling(Page::ScrollDirectionBack);
             }
             if (keys[Input.GetScancode(UserInput::KeyCodeDown)])
             {
-                 page->SetScrolling(Page::ScrollDirectionForward);
+                    page->SetScrolling(Page::ScrollDirectionForward);
             }
         }
-        else
-        { 
-            if (keys[Input.GetScancode(UserInput::KeyCodePageUp)])
-            {
-                page->PageScroll(Page::ScrollDirectionBack);
-            }
-            if (keys[Input.GetScancode(UserInput::KeyCodePageDown)])
-            {
-                page->PageScroll(Page::ScrollDirectionForward);
-            }
-       }
-       if (keys[Input.GetScancode(UserInput::KeyCodeAdminMode)])
-       {
+        if (keys[Input.GetScancode(UserInput::KeyCodePageUp)])
+        {
+            page->PageScroll(Page::ScrollDirectionBack);
+        }
+        if (keys[Input.GetScancode(UserInput::KeyCodePageDown)])
+        {
+            page->PageScroll(Page::ScrollDirectionForward);
+        }
+        if (keys[Input.GetScancode(UserInput::KeyCodeAdminMode)])
+        {
             //todo: add admin mode support
         }
         if (keys[Input.GetScancode(UserInput::KeyCodeSelect)])