diff --git a/applications/voting/vote.js b/applications/voting/vote.js
index fce40af..44207e5 100644
--- a/applications/voting/vote.js
+++ b/applications/voting/vote.js
@@ -12,7 +12,6 @@
 /* global Script Tablet Messages MyAvatar Uuid*/
 
 // TODO: Documentation
-// TODO: Allow more than 9 candidates
 // TODO: Allow host voting
 // TODO: Sound for new vote
 // TODO: Clear poll host view on creating new poll
@@ -22,6 +21,8 @@
 // FIXME: Joining poll resets everyones vote
 // FIXME: Running election without votes causes max stack error
 
+// TODO: Voting results page
+
 (() => {
 	"use strict";
 	var tablet;
diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml
index 40a73d7..558b72d 100644
--- a/applications/voting/vote.qml
+++ b/applications/voting/vote.qml
@@ -591,22 +591,21 @@ Rectangle {
 
             color: index % 2 === 0 ? "transparent" : Qt.rgba(0.15,0.15,0.15,1)
 
-            Item {
+            Row {
                 width: parent.width - 10
                 anchors.horizontalCenter: parent.horizontalCenter
                 height: parent.height
                 clip: true
 
-                // FIXME: Allow more than 9 options
                 // TODO: Replace cap with total amount of options
                 TextField {
-                    width: 50
+                    width: 70
                     height: 50
                     font.pointSize: 20
                     horizontalAlignment: Text.AlignHCenter
                     verticalAlignment: Text.AlignVCenter    
                     color: "black"
-                    validator: RegExpValidator { regExp: /^[0-9]$/ } 
+                    validator: RegExpValidator { regExp: /^[0-9]+$/ } 
                     inputMethodHints: Qt.ImhDigitsOnly 
                     anchors.verticalCenter: parent.verticalCenter
                     text: rank
@@ -617,6 +616,7 @@ Rectangle {
                 }
 
                 Text {
+                    Layout.fillWidth: true
                     text: option
                     anchors.centerIn: parent
                     color: "white"