diff --git a/raspberry/roberto/views/frontend/templates/gamepad.js b/raspberry/roberto/views/frontend/templates/gamepad.js
index 113cd03..2850e8d 100644
--- a/raspberry/roberto/views/frontend/templates/gamepad.js
+++ b/raspberry/roberto/views/frontend/templates/gamepad.js
@@ -108,8 +108,8 @@ var joystick_axes = {
     });
 
     joystick.on('move', function(evt, data) {
-      joystick_axes.x1 = data.vector.x;
-      joystick_axes.y2 = -data.vector.y;
+      joystick_axes.x2 = data.vector.x;
+      joystick_axes.y1 = -data.vector.y;
       joystick_axes.moved = true;
     });
     joystick.on('end', function(evt, data) {
diff --git a/raspberry/roberto/views/frontend/templates/index.html b/raspberry/roberto/views/frontend/templates/index.html
index f1efff3..b390aab 100644
--- a/raspberry/roberto/views/frontend/templates/index.html
+++ b/raspberry/roberto/views/frontend/templates/index.html
@@ -46,6 +46,7 @@
         z-index: 1;
         top: 20px;
         right: 50px
+        text-align: right;
       }
       .stats-box {
         display: none;