diff --git a/examples/html/edit-style.css b/examples/html/edit-style.css
index ae70e206fa..1d34036307 100644
--- a/examples/html/edit-style.css
+++ b/examples/html/edit-style.css
@@ -425,7 +425,7 @@ input[type=checkbox]:checked + label:hover {
     margin-left: 12px;
 }
 
-.text label, .url label, .number label, .textarea label {
+.text label, .url label, .number label, .textarea label, .xyz label {
     float: left;
     margin-bottom: 4px;
 }
@@ -433,6 +433,9 @@ input[type=checkbox]:checked + label:hover {
     clear: both;
     float: left;
 }
+.xyz > div {
+    clear: both;
+}
 
 div.refresh {
     box-sizing: border-box;
@@ -486,54 +489,48 @@ div.refresh input[type="button"] {
     float: right;
 }
 
+.xyz .tuple input {
+    padding-left: 30px;
+}
 .color .tuple input {
     padding-left: 65px;
 }
-
-.tuple label {
+.tuple div label {
     display: inline !important;
     float: none !important;
     position: absolute;
-    left: -6px;
-    top: -4px;
+    margin-top: 8px;
+    margin-left: 6px;
+    left: 0;
+    font-family: FiraSans-SemiBold;
+    font-size: 12px;
 }
-.tuple .red + label {
+.tuple .x + label, .tuple .red + label {
     color: #e2334d;
 }
-.tuple .green + label {
+.tuple .y + label, .tuple .green + label {
     color: #1ac567;
 }
-.tuple .blue + label {
+.tuple .z + label, .tuple .blue + label {
     color: #1080b8;
 }
 
-.tuple .red:focus {
+.tuple .x:focus, .tuple .red:focus {
     outline-color: #e2334d;
 }
-.tuple .green:focus {
+.tuple .y:focus, .tuple .green:focus {
     outline-color: #1ac567;
 }
-.tuple .blue:focus {
+.tuple .z:focus.tuple, .blue:focus {
     outline-color: #1080b8;
 }
 
-
-.prop-x {
-    color:red !important;
-    background: rgba(255, 0, 0, .9);
-    height:2px !important;
+.xyz .buttons input {
+    margin-top: 12px;
 }
-
-.prop-y {
-    color:green !important;
-    background: rgba(0, 255, 0, .9);
-    height:2px !important;
-}
-
-.prop-z{
-    color:blue !important;
-    background: rgba(0, 0, 255, .9);
-    height:2px !important;
+.xyz .buttons span {
+    word-wrap: nowrap;
+    white-space: nowrap;
 }
 
 
diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html
index 507dc08d88..526f01897b 100644
--- a/examples/html/entityProperties.html
+++ b/examples/html/entityProperties.html
@@ -1388,17 +1388,17 @@
             <label>Spatial Properties</label><span>M</span>
         </div>
 
-        <div class="spatial-section property">
-            <div class="label">Position</div>
-            <div class="value">
-                <div class="input-area ">X<input class="coord" type='number' id="property-pos-x"><div class="prop-x"></div></div>
-                <div class="input-area ">Y<input class="coord" type='number' id="property-pos-y"><div class="prop-y"></div></div>
-                <div class="input-area ">Z<input class="coord" type='number' id="property-pos-z"><div class="prop-z"></div></div>
-                <div>
-                    <input type="button" id="move-selection-to-grid" value="Selection to Grid">
-                    <input type="button" id="move-all-to-grid" value="All to Grid">
-                    <input type="button" id="preview-camera-button" value="Preview Camera">
-                </div>
+        <div class="spatial-section property xyz">
+            <label>Position</label>
+            <div class="tuple">
+                <div><input type="number" class="x" id="property-pos-x"><label for="property-pos-x">X:</label></div>
+                <div><input type="number" class="y" id="property-pos-y"><label for="property-pos-y">Y:</label></div>
+                <div><input type="number" class="z" id="property-pos-z"><label for="property-pos-z">Z:</label></div>
+            </div>
+            <div class="buttons">
+                <input type="button" id="move-selection-to-grid" value="Selection to Grid">
+                <input type="button" id="move-all-to-grid" value="All to Grid">
+                <input type="button" id="preview-camera-button" value="Preview Camera">
             </div>
         </div>
 
@@ -1411,68 +1411,68 @@
             <input type="text" id="property-parent-joint-index">
         </div>
 
-        <div class="spatial-section property">
-            <div class="label">Registration</div>
-            <div class="value">
-                <div class="input-area">X <input class="coord" type="number" id="property-reg-x"><div class="prop-x"></div></div>
-                <div class="input-area">Y <input class="coord" type="number" id="property-reg-y"><div class="prop-y"></div></div>
-                <div class="input-area">Z <input class="coord" type="number" id="property-reg-z"><div class="prop-z"></div></div>
+        <div class="spatial-section property xyz">
+            <label>Registration</label>
+            <div class="tuple">
+                <div><input type="number" class="x" id="property-reg-x"><label for="property-reg-x">X:</label></div>
+                <div><input type="number" class="y" id="property-reg-y"><label for="property-reg-y">Y:</label></div>
+                <div><input type="number" class="z" id="property-reg-z"><label for="property-reg-z">Z:</label></div>
             </div>
         </div>
 
-        <div class="spatial-section property">
-            <div class="label">Dimensions</div>
-            <div class="value">
-                <div class="input-area">X <input class="coord" type="number" id="property-dim-x" step="0.1"><div class="prop-x"></div></div>
-                <div class="input-area">Y <input class="coord" type="number" id="property-dim-y" step="0.1"><div class="prop-y"></div></div>
-                <div class="input-area">Z <input class="coord" type="number" id="property-dim-z" step="0.1"><div class="prop-z"></div></div>
-                <div>
-                    <input type="button" id="reset-to-natural-dimensions" value="Reset to Natural Dimensions">
-                </div>
-                <div class="input-area">
-                    <input class="" type="number" id="dimension-rescale-pct" value=100>%
-                </div>
+        <div class="spatial-section property xyz">
+            <label>Dimensions</label>
+            <div class="tuple">
+                <div><input type="number" class="x" id="property-dim-x" step="0.1"><label for="property-dim-x">X:</label></div>
+                <div><input type="number" class="y" id="property-dim-y" step="0.1"><label for="property-dim-y">Y:</label></div>
+                <div><input type="number" class="z" id="property-dim-z" step="0.1"><label for="property-dim-z">Z:</label></div>
+            </div>
+            <div class="buttons">
+                <input type="button" id="reset-to-natural-dimensions" value="Reset to Natural Dimensions">
                 <span>
+                    <input class="" type="number" id="dimension-rescale-pct" value=100>&nbsp;%
                     <input type="button" id="dimension-rescale-button" value="Rescale">
                 </span>
             </div>
         </div>
 
-        <div class="spatial-section poly-vox-section property">
-            <div class="label">Voxel Volume Size</div>
-            <div class="value">
-              <div class="input-area">X <br> <input class="coord" type="number" id="property-voxel-volume-size-x"></div>
-              <div class="input-area">Y <br><input class="coord" type="number" id="property-voxel-volume-size-y"></div>
-              <div class="input-area">Z <br><input class="coord" type="number" id="property-voxel-volume-size-z"></div>
+        <div class="spatial-section poly-vox-section property XYZ">
+            <label>Voxel volume size</label>
+            <div class="tuple">
+                <div><input type="number" class="x" id="property-voxel-volume-size-x"><label for="property-voxel-volume-size-x">X:</label></div>
+                <div><input type="number" class="y" id="property-voxel-volume-size-y"><label for="property-voxel-volume-size-y">Y:</label></div>
+                <div><input type="number" class="z" id="property-voxel-volume-size-z"><label for="property-voxel-volume-size-z">Z:</label></div>
             </div>
+        </div>
 
+        <div class="property">
             <div class="label">Surface Extractor</div>
             <div class="value">
-              <select name="SelectVoxelSurfaceStyle" id="property-voxel-surface-style">
-                <option value='0'>marching cubes</option>
-                <option value='1'>cubic</option>
-                <option value='2'>edged cubic</option>
-                <option value='3'>edged marching cubes</option>
-              </select>
+                <select name="SelectVoxelSurfaceStyle" id="property-voxel-surface-style">
+                    <option value='0'>marching cubes</option>
+                    <option value='1'>cubic</option>
+                    <option value='2'>edged cubic</option>
+                    <option value='3'>edged marching cubes</option>
+                </select>
             </div>
+        </div>
 
-            <div class="property url refresh">
-                <label for="property-x-texture-url">X-axis texture URL</label>
-                <input type="text" id="property-x-texture-url">
-                <input type="button" class="update-url-version glyph" value="F" />
-            </div>
+        <div class="property url refresh">
+            <label for="property-x-texture-url">X-axis texture URL</label>
+            <input type="text" id="property-x-texture-url">
+            <input type="button" class="update-url-version glyph" value="F" />
+        </div>
 
-            <div class="property url refresh">
-                <label for="property-y-texture-url">Y-axis texture URL</label>
-                <input type="text" id="property-y-texture-url">
-                <input type="button" class="update-url-version glyph" value="F" />
-            </div>
+        <div class="property url refresh">
+            <label for="property-y-texture-url">Y-axis texture URL</label>
+            <input type="text" id="property-y-texture-url">
+            <input type="button" class="update-url-version glyph" value="F" />
+        </div>
 
-            <div class="property url refresh">
-                <label for="property-z-texture-url">Z-axis texture URL</label>
-                <input type="text" id="property-z-texture-url">
-                <input type="button" class="update-url-version glyph" value="F" />
-            </div>
+        <div class="property url refresh">
+            <label for="property-z-texture-url">Z-axis texture URL</label>
+            <input type="text" id="property-z-texture-url">
+            <input type="button" class="update-url-version glyph" value="F" />
         </div>
 
         <div class="spatial-section property">
@@ -1489,12 +1489,12 @@
             <label>Physical Properites</label><span>M</span>
         </div>
 
-        <div class="physical-section property">
-            <div class="label">Linear Velocity</div>
-            <div class="value">
-                <div class="input-area">X <input class="coord" type="number" id="property-lvel-x"><div class="prop-x"></div></div>
-                <div class="input-area">Y <input class="coord" type="number" id="property-lvel-y"><div class="prop-y"></div></div>
-                <div class="input-area">Z <input class="coord" type="number" id="property-lvel-z"><div class="prop-z"></div></div>
+        <div class="physical-section property xyz">
+            <label>Linear velocity</label>
+            <div class="tuple">
+                <div><input type="number" class="x" id="property-lvel-x"><label for="property-lvel-x">X:</label></div>
+                <div><input type="number" class="y" id="property-lvel-y"><label for="property-lvel-y">Y:</label></div>
+                <div><input type="number" class="z" id="property-lvel-z"><label for="property-lvel-z">Z:</label></div>
             </div>
         </div>
         <div class="physical-section property">
@@ -1530,21 +1530,21 @@
             </div>
         </div>
 
-        <div class="physical-section property">
-            <div class="label">Gravity</div>
-            <div class="value">
-                <div class="input-area">X <input class="coord" type="number" id="property-grav-x"><div class="prop-x"></div></div>
-                <div class="input-area">Y <input class="coord" type="number" id="property-grav-y"><div class="prop-y"></div></div>
-                <div class="input-area">Z <input class="coord" type="number" id="property-grav-z"><div class="prop-z"></div></div>
+        <div class="physical-section property xyz">
+            <label>Gravity</label>
+            <div class="tuple">
+                <div><input type="number" class="x" id="property-grav-x"><label for="property-grav-x">X:</label></div>
+                <div><input type="number" class="y" id="property-grav-y"><label for="property-grav-y">Y:</label></div>
+                <div><input type="number" class="z" id="property-grav-z"><label for="property-grav-z">Z:</label></div>
             </div>
         </div>
 
-        <div class="physical-section property">
-            <div class="label">Acceleration</div>
-            <div class="value">
-                <div class="input-area">X <input class="coord" type="number" id="property-lacc-x"><div class="prop-x"></div></div>
-                <div class="input-area">Y <input class="coord" type="number" id="property-lacc-y"><div class="prop-y"></div></div>
-                <div class="input-area">Z <input class="coord" type="number" id="property-lacc-z"><div class="prop-z"></div></div>
+        <div class="physical-section property xyz">
+            <label>Acceleration</label>
+            <div class="tuple">
+                <div><input type="number" class="x" id="property-lacc-x"><label for="property-lacc-x">X:</label></div>
+                <div><input type="number" class="y" id="property-lacc-y"><label for="property-lacc-y">Y:</label></div>
+                <div><input type="number" class="z" id="property-lacc-z"><label for="property-lacc-z">Z:</label></div>
             </div>
         </div>
 
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
index 45267e05ad..9c879a2fd6 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -155,6 +155,7 @@ Item {
         readonly property real sectionName: dimensions.largeScreen ? 12 : 10
         readonly property real inputLabel: dimensions.largeScreen ? 14 : 10
         readonly property real textFieldInput: dimensions.largeScreen ? 15 : 12
+        readonly property real textFieldInputLabel: dimensions.largeScreen ? 13 : 9
         readonly property real tableText: dimensions.largeScreen ? 15 : 12
         readonly property real buttonLabel: dimensions.largeScreen ? 13 : 9
         readonly property real iconButton: dimensions.largeScreen ? 13 : 9