diff --git a/index.html b/index.html
index 34eee4f..765c3a5 100644
--- a/index.html
+++ b/index.html
@@ -35,11 +35,13 @@
 
     <script type="text/template" id="floor-template">
         <div class="floor" style="top: {yPosition}px">
-            <span class="floornumber">{level}</span>
-            <span class="buttonindicator">
-                <i class="fa fa-arrow-circle-up up"></i>
-                <i class="fa fa-arrow-circle-down down"></i>
-            </span>
+            <div class="floor-info">
+                <span class="buttonindicator">
+                    <i class="fa fa-arrow-circle-up up"></i>
+                    <i class="fa fa-arrow-circle-down down"></i>
+                </span>
+                <span class="floornumber">{level}</span>
+            </div>
         </div>
     </script>
 
diff --git a/style.css b/style.css
index ae460f9..97c091c 100644
--- a/style.css
+++ b/style.css
@@ -250,9 +250,12 @@ button.right {
 
 .elevator {
     background-color: #4F8686;
-    border: 2px solid white;
+    border: 1px outset slategray;
     height: 46px;
     z-index: 1;
+    -webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
+    -moz-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
+    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12)
 }
 
 .elevator .directionindicator {
@@ -283,7 +286,7 @@ button.right {
     width: 100%;
     font-size: 15px;
     text-align: center;
-    color: rgba(255, 255, 255, 0.3);
+    color: rgba(255, 255, 255, 0.5);
 }
 
 .elevator .buttonindicator {
@@ -314,10 +317,18 @@ button.right {
     border-bottom: 1px solid #333;
 }
 
+.floor-info {
+    position: absolute;
+    background-color: #3F3F3F;
+    background-color: rgba(0, 0, 0, 0.3);
+    width: 35px;
+    padding: 5px 5px 0 60px;
+    height: 43px;
+    text-align: right;
+}
+
 .floor .buttonindicator {
     cursor: pointer;
-    line-height: 50px;
-    padding-left: 50px;
     color: rgba(255, 255, 255, 0.2);
 }
 .floor .buttonindicator .activated {
@@ -325,14 +336,11 @@ button.right {
 }
 
 .floor .floornumber {
-    position: absolute;
     color: rgba(255, 255, 255, 0.15);
-    font-size: 32px;
-    line-height: 50px;
-    padding-left: 10px;
+    font-size: 22px;
+    font-weight: bold;
 }
 
-
 .footer {
     margin-top: 20px;
 }
diff --git a/world.js b/world.js
index 3adcfa7..19cb795 100644
--- a/world.js
+++ b/world.js
@@ -14,7 +14,7 @@ var createWorldCreator = function() {
     };
     creator.createElevators = function(elevatorCount, floorCount, floorHeight, elevatorCapacities) {
         elevatorCapacities = elevatorCapacities || [4];
-        var currentX = 200.0;
+        var currentX = 100.0;
         var elevators = _.map(_.range(elevatorCount), function(e, i) {
             var elevator = asMovable({});
             elevator = asElevator(elevator, 2.6, floorCount, floorHeight, elevatorCapacities[i%elevatorCapacities.length]);
@@ -45,7 +45,7 @@ var createWorldCreator = function() {
 
     creator.spawnUserRandomly = function(floorCount, floorHeight, floors) {
         var user = creator.createRandomUser(floorCount, floorHeight);
-        user.moveTo(105+_.random(40), 0);
+        user.moveTo(5+_.random(45), 0);
         var currentFloor = _.random(1) === 0 ? 0 : _.random(floorCount - 1);
         var destinationFloor;
         if(currentFloor === 0) {