diff --git a/platform/features/layout/bundle.json b/platform/features/layout/bundle.json
index 221dad1ca5..8ded0c2f6f 100644
--- a/platform/features/layout/bundle.json
+++ b/platform/features/layout/bundle.json
@@ -27,15 +27,18 @@
                                 {
                                     "method": "add",
                                     "control": "button",
-                                    "text": "Add"
+                                    "text": "Add",
+                                    "inclusive": true
                                 }
                             ]
                         },
                         {
                             "items": [
                                 {
-                                    "property": "z",
-                                    "control": "textfield"
+                                    "method": "remove",
+                                    "control": "button",
+                                    "text": "Remove",
+                                    "inclusive": true
                                 }
                             ]
                         }
diff --git a/platform/features/layout/src/FixedController.js b/platform/features/layout/src/FixedController.js
index 982d06fddc..1ccc2a5f55 100644
--- a/platform/features/layout/src/FixedController.js
+++ b/platform/features/layout/src/FixedController.js
@@ -77,9 +77,9 @@ define(
             }
 
             // Decorate an element for display
-            function makeProxyElement(element) {
+            function makeProxyElement(element, index, elements) {
                 var ElementProxy = ElementProxies[element.type],
-                    e = ElementProxy && new ElementProxy(element);
+                    e = ElementProxy && new ElementProxy(element, index, elements);
 
                 if (e) {
                     // Provide a displayable position (convert from grid to px)