diff --git a/src/adapter/templates/edit-object-replacement.html b/src/adapter/templates/edit-object-replacement.html
index eb136ea796..f8fc33ca07 100644
--- a/src/adapter/templates/edit-object-replacement.html
+++ b/src/adapter/templates/edit-object-replacement.html
@@ -28,7 +28,8 @@
             <!-- Toolbar and Save/Cancel buttons -->
             <div class="l-edit-controls flex-elem l-flex-row flex-align-end">
                 <mct-representation key="'adapted-view-TOOLBAR'"
-                                    mct-object="domainObject">
+                                    mct-object="domainObject"
+                                    class="flex-elem grows">
                 </mct-representation>
                 <mct-representation key="'edit-action-buttons'"
                                     mct-object="domainObject"
diff --git a/tutorials/todo/todo-toolbar.html b/tutorials/todo/todo-toolbar.html
index bd99ad5be2..b955ceaee2 100644
--- a/tutorials/todo/todo-toolbar.html
+++ b/tutorials/todo/todo-toolbar.html
@@ -1 +1,9 @@
-<span>This is a toolbar.</span>
+<div class="tool-bar btn-bar contents abs">
+    <a class="s-btn labeled">
+        <span class="ui-symbol icon">+</span>
+        <span class="title-label">Add Task</span>
+    </a>
+    <a class="s-btn">
+        <span class="ui-symbol icon">Z</span>
+    </a>
+</div>