3 files changed, 14 insertions, 7 deletions

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css
index c1f8a8ce..70a0e780 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.css
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css
@@ -9,10 +9,15 @@
 }
 
 .optionsShapeTool .shapeCustomProps {
-    margin-top: -3px;
-    margin-left: -31px;
+    margin-top: 0px;
+    margin-left: -7px;
 }
 
 .optionsShapeTool checkbox {
     padding: 6px;
+    margin-left: 4px;
 }
+
+.optionsShapeTool .hottextunit {
+    /*width: 46px;*/
+}
\ No newline at end of file
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html
index c6aa0c94..9b523a3f 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -118,6 +118,8 @@
                     "rectProperties": {"@": "rectProperties1"},
                     "lineProperties": {"@": "lineProperties1"},
 
+                    "endDivider": {"#": "endDivider"},
+
                     "components": [
                         {"@": "repetition1"}
                     ]
@@ -144,14 +146,14 @@
             <div class="nj-divider divider-vertical">&nbsp;</div>
             <label class="label">Stroke:</label>
             <div data-montage-id="strokeControl" class="label"></div>
+            <div class="nj-divider divider-vertical">&nbsp;</div>
             <div id="customProperties" class="shapeCustomProps">
                 <div data-montage-id="ovalProperties" class="label"></div>
                 <div data-montage-id="rectProperties" class="label"></div>
                 <div data-montage-id="lineProperties" class="label"></div>
             </div>
-
+            <div data-montage-id="endDivider" class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
             <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label>
-
             <label data-montage-id="materialLabel" class="label">Material:</label>
             <div data-montage-id="strokeIcon" class="toolColorChipIcon PencilTool"></div>
 
@@ -160,9 +162,7 @@
 
             <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div>
             <select class="selectBox" data-montage-id="fillMaterialCB">
-            </select>
-            
-            
+            </select>            
         </div>
     </body>
 
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index 23158493..bd0cf8cf 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -112,11 +112,13 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
                     this._fillColorCtrl.visible = false;
                     this._fillColorCtrlIcon.style["display"] = "none";
                     this._fillColorCtrlIcon.visible = false;                    
+                    this.endDivider.style["display"] = "none";
                 } else {
                     this._fillColorCtrl.style["display"] = "";
                     this._fillColorCtrl.visible = true;
                     this._fillColorCtrlIcon.style["display"] = "";
                     this._fillColorCtrlIcon.visible = true;
+                    this.endDivider.style["display"] = "";
                 }
 
                 if (this._useWebGL.checked) {