diff --git a/platform/forms/res/templates/toolbar.html b/platform/forms/res/templates/toolbar.html
index e2d6868263..2c7558eac2 100644
--- a/platform/forms/res/templates/toolbar.html
+++ b/platform/forms/res/templates/toolbar.html
@@ -1,41 +1,30 @@
-<form name="mctForm" novalidate>
+<form name="tool-bar btn-bar contents" novalidate>
 
 <div class="form">
-    <span ng-repeat="section in structure.sections">
-        <div class="section-header" ng-if="section.name">
-            {{section.name}}
-        </div>
-        <div class="form-section">
-            <ng-form name="mctFormInner" ng-repeat="row in section.rows">
-                <div class="form-row validates"
-                     ng-class="{
-                               req: row.required,
-                               valid: mctFormInner.$dirty && mctFormInner.$valid,
-                               invalid: mctFormInner.$dirty && !mctFormInner.$valid
-                               }">
+    <span ng-repeat="section in structure.sections"
+          class="control-group coordinates"
+          title="section.description">
+
+        <ng-form ng-repeat="item in section.items"
+                 ng-class="{ 'input-labeled': item.name }"
+                 class="inline"
+                 title="item.description"
+                 name="mctFormInner">
+
+            <label ng-if="item.name">
+                {{item.name}}:
+            </label>
+            <mct-control key="item.control"
+                         ng-model="ngModel"
+                         ng-required="item.required"
+                         ng-pattern="getRegExp(row.pattern)"
+                         options="item.options"
+                         structure="item"
+                         field="item.key">
+            </mct-control>
+
+        </ng-form>
 
-                    <div class='label' title="{{row.description}}">
-                        {{row.name}}
-                        <span ng-if="row.description"
-                              class="ui-symbol">
-                            i
-                        </span>
-                    </div>
-                    <div class='controls'>
-                        <div class="wrapper" ng-if="row.control">
-                            <mct-control key="row.control"
-                                         ng-model="ngModel"
-                                         ng-required="row.required"
-                                         ng-pattern="getRegExp(row.pattern)"
-                                         options="row.options"
-                                         structure="row"
-                                         field="row.key">
-                            </mct-control>
-                        </div>
-                    </div>
-                </div>
-            </ng-form>
-        </div>
     </span>
 </div>