2 files changed, 21 insertions, 19 deletions

diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index c47359bf..2c5617e5 100644
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -26,15 +26,15 @@
             },
 
             "groupLine": {
-                "module": "js/components/layout/tool-button.reel",
-                "name": "ToolButton",
+                "module": "montage/ui/condition.reel",
+                "name": "Condition",
                 "properties": {
                     "element": {"#": "groupLine"}
                 },
                 "bindings": {
-                    "data": {
+                    "condition": {
                         "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration",
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.lastInGroup",
                         "oneway": true
                     }
                 }
@@ -178,7 +178,9 @@
         <div id="toolsList" class="toolsList">
             <div id="toolscontainer" class="toolscontainer">
                 <div id="toolbutton" class="toolbutton"></div>
-                <hr id="groupLine" />
+                <div id="groupLine">
+                    <hr />
+                </div>
             </div>
             <!-- TODO: Remove and add as a component -->
             <div id="colortoolbar"></div>
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 8356c422..4847fa7c 100644
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -28,7 +28,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "action":       "SubselectionTool",
                 "toolTip":      "Subselect Tool",
                 "cursor":       "auto",
-                "lastInGroup":  false,
+                "lastInGroup":  true,
                 "container":    false,
                 "selected":     false
             },
@@ -153,7 +153,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "action":       "FillTool",
                 "toolTip":      "Fill Tool",
                 "cursor":       "url('images/tools/bucket_down.png'), default",
-                "lastInGroup":  false,
+                "lastInGroup":  true,
                 "container":    false,
                 "selected":     false
             },
@@ -168,17 +168,17 @@ exports.ToolsData = Montage.create(Montage, {
 //                "container":    false,
 //                "selected":     false
 //            },
-//            {
-//                "id":           "EyedropperTool",
-//                "properties":   "eyedropperProperties",
-//                "spriteSheet":  true,
-//                "action":       "EyedropperTool",
-//                "toolTip":      "Eyedropper Tool",
-//                "cursor":       "url('images/tools/eyedropper_down.png'), default",
-//                "lastInGroup":  false,
-//                "container":    false,
-//                "selected":     false
-//            },
+            {
+                "id":           "EyedropperTool",
+                "properties":   "eyedropperProperties",
+                "spriteSheet":  true,
+                "action":       "EyedropperTool",
+                "toolTip":      "Eyedropper Tool",
+                "cursor":       "url('images/tools/eyedropper_down.png'), default",
+                "lastInGroup":  false,
+                "container":    false,
+                "selected":     false
+            },
 //            {
 //                "id":           "EraserTool",
 //                "properties":   "eraserProperties",
@@ -219,7 +219,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "action":       "ZoomTool",
                 "toolTip":      "Zoom Tool (Z)",
                 "cursor":       "url('images/cursors/zoom.png'),default",
-                "lastInGroup":  false,
+                "lastInGroup":  true,
                 "container":    false,
                 "selected":     false
             }