diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index 8a31095de9..abbb8e33d6 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -626,10 +626,10 @@ const KeyMap_IntStrPair psp_button_names[] = {
 	{CTRL_LTRIGGER, "L"},
 	{CTRL_RTRIGGER, "R"},
 
-	{VIRTKEY_AXIS_Y_MAX, "An.Up"},
-	{VIRTKEY_AXIS_Y_MIN, "An.Down"},
-	{VIRTKEY_AXIS_X_MIN, "An.Left"},
-	{VIRTKEY_AXIS_X_MAX, "An.Right"},
+	{VIRTKEY_AXIS_Y_MAX, "Analog Up"},
+	{VIRTKEY_AXIS_Y_MIN, "Analog Down"},
+	{VIRTKEY_AXIS_X_MIN, "Analog Left"},
+	{VIRTKEY_AXIS_X_MAX, "Analog Right"},
 #ifndef MOBILE_DEVICE
 	{ VIRTKEY_ANALOG_LIGHTLY, "Analog limiter" },
 #endif
diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp
index cc20a00e13..a410df17be 100644
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@@ -96,7 +96,7 @@ void ControlMapper::Refresh() {
 
 	float itemH = 45;
 
-	LinearLayout *root = Add(new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)));
+	LinearLayout *root = Add(new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(550, WRAP_CONTENT)));
 	root->SetSpacing(3.0f);
 
 	const int padding = 4;
@@ -113,6 +113,9 @@ void ControlMapper::Refresh() {
 		root->Add(c)->OnClick.Handle(this, &ControlMapper::OnReplaceAll);
 	}
 
+	Choice *p = root->Add(new Choice(" + ", new LayoutParams(FILL_PARENT, itemH)));
+	p->OnClick.Handle(this, &ControlMapper::OnAdd);
+
 	LinearLayout *rightColumn = root->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, 1.0f)));
 	rightColumn->SetSpacing(2.0f);
 	std::vector<KeyDef> mappings;
@@ -135,9 +138,6 @@ void ControlMapper::Refresh() {
 		Choice *d = row->Add(new Choice(" X ", new LayoutParams(FILL_PARENT, itemH)));
 		d->SetTag(tagbuf);
 		d->OnClick.Handle(this, &ControlMapper::OnDelete);
-
-		Choice *p = row->Add(new Choice(" + ", new LayoutParams(FILL_PARENT, itemH)));
-		p->OnClick.Handle(this, &ControlMapper::OnAdd);
 	}
 
 	if (mappings.size() == 0) {