diff --git a/src/features/edit/templates/cellEditor.html b/src/features/edit/templates/cellEditor.html
index 4f67815461..9f6f3a2b10 100644
--- a/src/features/edit/templates/cellEditor.html
+++ b/src/features/edit/templates/cellEditor.html
@@ -1,5 +1,10 @@
 <div>
-    <form name="inputForm">
-        <input type="INPUT_TYPE" ng-class="'colt' + col.uid" ui-grid-editor ng-model="MODEL_COL_FIELD" />
-    </form>
+  <form
+    name="inputForm">
+    <input
+      type="INPUT_TYPE"
+      ng-class="'colt' + col.uid"
+      ui-grid-editor
+      ng-model="MODEL_COL_FIELD" />
+  </form>
 </div>
diff --git a/src/features/edit/templates/dropdownEditor.html b/src/features/edit/templates/dropdownEditor.html
index d7d6745d73..7d8f8a5ae2 100644
--- a/src/features/edit/templates/dropdownEditor.html
+++ b/src/features/edit/templates/dropdownEditor.html
@@ -1,5 +1,11 @@
 <div>
-  <form name="inputForm">
-    <select ng-class="'colt' + col.uid" ui-grid-edit-dropdown ng-model="MODEL_COL_FIELD" ng-options="field[editDropdownIdLabel] as field[editDropdownValueLabel] CUSTOM_FILTERS for field in editDropdownOptionsArray"></select>
+  <form
+    name="inputForm">
+    <select
+      ng-class="'colt' + col.uid"
+      ui-grid-edit-dropdown
+      ng-model="MODEL_COL_FIELD"
+      ng-options="field[editDropdownIdLabel] as field[editDropdownValueLabel] CUSTOM_FILTERS for field in editDropdownOptionsArray">
+    </select>
   </form>
 </div>
diff --git a/src/features/edit/templates/fileChooserEditor.html b/src/features/edit/templates/fileChooserEditor.html
index c719529fbb..30da7b7ad7 100644
--- a/src/features/edit/templates/fileChooserEditor.html
+++ b/src/features/edit/templates/fileChooserEditor.html
@@ -1,5 +1,12 @@
 <div>
-  <form name="inputForm">
-    <input ng-class="'colt' + col.uid" ui-grid-edit-file-chooser type="file" id="files" name="files[]" ng-model="MODEL_COL_FIELD"/>
+  <form
+    name="inputForm">
+    <input
+      ng-class="'colt' + col.uid"
+      ui-grid-edit-file-chooser
+      type="file"
+      id="files"
+      name="files[]"
+      ng-model="MODEL_COL_FIELD"/>
   </form>
 </div>
diff --git a/src/features/expandable/templates/expandableRow.html b/src/features/expandable/templates/expandableRow.html
index 63b303b9b0..827f057d1e 100644
--- a/src/features/expandable/templates/expandableRow.html
+++ b/src/features/expandable/templates/expandableRow.html
@@ -1,4 +1,7 @@
-<div ui-grid-expandable-row ng-if="expandableRow.shouldRenderExpand()" class="expandableRow"
-     style="float:left; margin-top: 1px; margin-bottom: 1px"
-     ng-style="{width: (grid.renderContainers.body.getCanvasWidth()) + 'px'
-     , height: grid.options.expandableRowHeight + 'px'}"></div>
\ No newline at end of file
+<div
+  ui-grid-expandable-row
+  ng-if="expandableRow.shouldRenderExpand()"
+  class="expandableRow"
+  style="float:left; margin-top: 1px; margin-bottom: 1px"
+  ng-style="{width: (grid.renderContainers.body.getCanvasWidth()) + 'px', height: grid.options.expandableRowHeight + 'px'}">
+</div>
diff --git a/src/features/expandable/templates/expandableRowHeader.html b/src/features/expandable/templates/expandableRowHeader.html
index d9e37e7777..f5d294fdc7 100644
--- a/src/features/expandable/templates/expandableRowHeader.html
+++ b/src/features/expandable/templates/expandableRowHeader.html
@@ -1,6 +1,10 @@
-<div class="ui-grid-row-header-cell ui-grid-expandable-buttons-cell">
-    <div class="ui-grid-cell-contents">
-        <i ng-class="{ 'ui-grid-icon-plus-squared' : !row.isExpanded, 'ui-grid-icon-minus-squared' : row.isExpanded }"
-           ng-click="grid.api.expandable.toggleRowExpansion(row.entity)"></i>
-    </div>
-</div>
\ No newline at end of file
+<div
+  class="ui-grid-row-header-cell ui-grid-expandable-buttons-cell">
+  <div
+    class="ui-grid-cell-contents">
+    <i
+      ng-class="{ 'ui-grid-icon-plus-squared' : !row.isExpanded, 'ui-grid-icon-minus-squared' : row.isExpanded }"
+      ng-click="grid.api.expandable.toggleRowExpansion(row.entity)">
+    </i>
+  </div>
+</div>
diff --git a/src/features/expandable/templates/expandableScrollFiller.html b/src/features/expandable/templates/expandableScrollFiller.html
index e9cf544c7b..3fbd65a634 100644
--- a/src/features/expandable/templates/expandableScrollFiller.html
+++ b/src/features/expandable/templates/expandableScrollFiller.html
@@ -1,9 +1,9 @@
-<div ng-if="expandableRow.shouldRenderFiller()"
-     ng-class="{scrollFiller:true, scrollFillerClass:(colContainer.name === 'body')}"
-     ng-style="{ width: (grid.getViewportWidth()) + 'px',
-              height: grid.options.expandableRowHeight + 2 + 'px', 'margin-left': grid.options.rowHeader.rowHeaderWidth + 'px' }"
-     >
-    <i class="ui-grid-icon-spin5 ui-grid-animate-spin" ng-style=
-            "{ 'margin-top': ( grid.options.expandableRowHeight/2 - 5) + 'px',
-            'margin-left' : ((grid.getViewportWidth() - grid.options.rowHeader.rowHeaderWidth)/2 - 5) + 'px' }">
-     </i></div>
\ No newline at end of file
+<div
+  ng-if="expandableRow.shouldRenderFiller()"
+  ng-class="{scrollFiller:true, scrollFillerClass:(colContainer.name === 'body')}"
+  ng-style="{ width: (grid.getViewportWidth()) + 'px', height: grid.options.expandableRowHeight + 2 + 'px', 'margin-left': grid.options.rowHeader.rowHeaderWidth + 'px' }">
+  <i
+    class="ui-grid-icon-spin5 ui-grid-animate-spin"
+    ng-style="{'margin-top': ( grid.options.expandableRowHeight/2 - 5) + 'px', 'margin-left' : ((grid.getViewportWidth() - grid.options.rowHeader.rowHeaderWidth)/2 - 5) + 'px'}">
+  </i>
+</div>
diff --git a/src/features/expandable/templates/expandableTopRowHeader.html b/src/features/expandable/templates/expandableTopRowHeader.html
index 0a7e14230b..ec63fe78db 100644
--- a/src/features/expandable/templates/expandableTopRowHeader.html
+++ b/src/features/expandable/templates/expandableTopRowHeader.html
@@ -1,6 +1,10 @@
-<div class="ui-grid-row-header-cell ui-grid-expandable-buttons-cell">
-    <div class="ui-grid-cell-contents">
-        <i ng-class="{ 'ui-grid-icon-plus-squared' : !grid.expandable.expandedAll, 'ui-grid-icon-minus-squared' : grid.expandable.expandedAll }"
-           ng-click="grid.api.expandable.toggleAllRows()"></i>
-    </div>
-</div>
\ No newline at end of file
+<div
+  class="ui-grid-row-header-cell ui-grid-expandable-buttons-cell">
+  <div
+    class="ui-grid-cell-contents">
+    <i
+      ng-class="{ 'ui-grid-icon-plus-squared' : !grid.expandable.expandedAll, 'ui-grid-icon-minus-squared' : grid.expandable.expandedAll }"
+      ng-click="grid.api.expandable.toggleAllRows()">
+    </i>
+  </div>
+</div>
diff --git a/src/features/exporter/templates/csvLink.html b/src/features/exporter/templates/csvLink.html
index 5eeba5cdf4..86c91346e0 100644
--- a/src/features/exporter/templates/csvLink.html
+++ b/src/features/exporter/templates/csvLink.html
@@ -1,5 +1,8 @@
-<span class="ui-grid-exporter-csv-link-span">
-    <a href="data:text/csv;charset=UTF-8,CSV_CONTENT" download="FILE_NAME">
-      LINK_LABEL
-    </a>
+<span
+  class="ui-grid-exporter-csv-link-span">
+  <a
+    href="data:text/csv;charset=UTF-8,CSV_CONTENT"
+    download="FILE_NAME">
+    LINK_LABEL
+  </a>
 </span>
diff --git a/src/features/importer/templates/importerMenuItem.html b/src/features/importer/templates/importerMenuItem.html
index 292bbe653a..19509a7872 100644
--- a/src/features/importer/templates/importerMenuItem.html
+++ b/src/features/importer/templates/importerMenuItem.html
@@ -1 +1,10 @@
-<li class="ui-grid-menu-item"><form><input class="ui-grid-importer-file-chooser" type="file" id="files" name="files[]" /></form></li>
+<li
+  class="ui-grid-menu-item">
+  <form>
+    <input
+      class="ui-grid-importer-file-chooser"
+      type="file"
+      id="files"
+      name="files[]"/>
+  </form>
+</li>
diff --git a/src/features/pagination/templates/pagination.html b/src/features/pagination/templates/pagination.html
index 675f6ac030..7064c274ed 100644
--- a/src/features/pagination/templates/pagination.html
+++ b/src/features/pagination/templates/pagination.html
@@ -17,8 +17,11 @@
         ui-grid-one-bind-aria-label="aria.pageToFirst"
         ng-click="pageFirstPageClick()"
         ng-disabled="cantPageBackward()">
-        <div class="first-triangle">
-          <div class="first-bar"></div>
+        <div
+          class="first-triangle">
+          <div
+            class="first-bar">
+          </div>
         </div>
       </button>
       <button
@@ -43,7 +46,11 @@
       <span
         class="ui-grid-pager-max-pages-number"
         ng-show="paginationApi.getTotalPages() > 0">
-        <abbr ui-grid-one-bind-title="paginationOf">/</abbr> {{ paginationApi.getTotalPages() }}
+        <abbr
+          ui-grid-one-bind-title="paginationOf">
+          /
+        </abbr>
+        {{ paginationApi.getTotalPages() }}
       </span>
       <button
         type="button"
@@ -88,11 +95,19 @@
       {{grid.options.paginationPageSize}}&nbsp;{{sizesLabel}}
     </span>
   </div>
-  <div class="ui-grid-pager-count-container">
-    <div class="ui-grid-pager-count">
-        <span ng-show="grid.options.totalItems > 0">
-            {{showingLow}} <abbr ui-grid-one-bind-title="paginationThrough">-</abbr> {{showingHigh}} {{paginationOf}} {{grid.options.totalItems}} {{totalItemsLabel}}
-        </span>
+  <div
+    class="ui-grid-pager-count-container">
+    <div
+      class="ui-grid-pager-count">
+      <span
+        ng-show="grid.options.totalItems > 0">
+        {{showingLow}}
+        <abbr
+          ui-grid-one-bind-title="paginationThrough">
+          -
+        </abbr>
+        {{showingHigh}} {{paginationOf}} {{grid.options.totalItems}} {{totalItemsLabel}}
+      </span>
     </div>
   </div>
 </div>
diff --git a/src/features/selection/templates/gridFooterSelectedItems.html b/src/features/selection/templates/gridFooterSelectedItems.html
index 22a49544ec..cba43a7553 100644
--- a/src/features/selection/templates/gridFooterSelectedItems.html
+++ b/src/features/selection/templates/gridFooterSelectedItems.html
@@ -1 +1,4 @@
-<span ng-if="grid.selection.selectedCount !== 0 && grid.options.enableFooterTotalSelected">({{"search.selectedItems" | t}} {{grid.selection.selectedCount}})</span>
\ No newline at end of file
+<span
+  ng-if="grid.selection.selectedCount !== 0 && grid.options.enableFooterTotalSelected">
+  ({{"search.selectedItems" | t}} {{grid.selection.selectedCount}})
+</span>
diff --git a/src/features/selection/templates/selectionHeaderCell.html b/src/features/selection/templates/selectionHeaderCell.html
index dde1783ae0..730154d4ef 100644
--- a/src/features/selection/templates/selectionHeaderCell.html
+++ b/src/features/selection/templates/selectionHeaderCell.html
@@ -1,6 +1,10 @@
 <div>
   <!-- <div class="ui-grid-vertical-bar">&nbsp;</div> -->
-  <div class="ui-grid-cell-contents" col-index="renderIndex">
-    <ui-grid-selection-select-all-buttons ng-if="grid.options.enableSelectAll"></ui-grid-selection-select-all-buttons>
+  <div
+    class="ui-grid-cell-contents"
+    col-index="renderIndex">
+    <ui-grid-selection-select-all-buttons
+      ng-if="grid.options.enableSelectAll">
+    </ui-grid-selection-select-all-buttons>
   </div>
 </div>
diff --git a/src/features/selection/templates/selectionRowHeader.html b/src/features/selection/templates/selectionRowHeader.html
index 4e49e4744d..d5ccbf04a6 100644
--- a/src/features/selection/templates/selectionRowHeader.html
+++ b/src/features/selection/templates/selectionRowHeader.html
@@ -1,5 +1,8 @@
-<div class="ui-grid-disable-selection">
-  <div class="ui-grid-cell-contents">
-    <ui-grid-selection-row-header-buttons></ui-grid-selection-row-header-buttons>
+<div
+  class="ui-grid-disable-selection">
+  <div
+    class="ui-grid-cell-contents">
+    <ui-grid-selection-row-header-buttons>
+    </ui-grid-selection-row-header-buttons>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/features/selection/templates/selectionRowHeaderButtons.html b/src/features/selection/templates/selectionRowHeaderButtons.html
index 2d9df4ca0c..ed1f8d5885 100644
--- a/src/features/selection/templates/selectionRowHeaderButtons.html
+++ b/src/features/selection/templates/selectionRowHeaderButtons.html
@@ -1,3 +1,6 @@
-<div class="ui-grid-selection-row-header-buttons ui-grid-icon-ok" ng-class="{'ui-grid-row-selected': row.isSelected}" ng-click="selectButtonClick(row, $event)">
+<div
+  class="ui-grid-selection-row-header-buttons ui-grid-icon-ok"
+  ng-class="{'ui-grid-row-selected': row.isSelected}"
+  ng-click="selectButtonClick(row, $event)">
   &nbsp;
-</div>
\ No newline at end of file
+</div>
diff --git a/src/features/selection/templates/selectionSelectAllButtons.html b/src/features/selection/templates/selectionSelectAllButtons.html
index 7d57ef78cc..b4fab6566d 100644
--- a/src/features/selection/templates/selectionSelectAllButtons.html
+++ b/src/features/selection/templates/selectionSelectAllButtons.html
@@ -1,2 +1,5 @@
-<div class="ui-grid-selection-row-header-buttons ui-grid-icon-ok" ng-class="{'ui-grid-all-selected': grid.selection.selectAll}" ng-click="headerButtonClick($event)">
-</div>
\ No newline at end of file
+<div
+  class="ui-grid-selection-row-header-buttons ui-grid-icon-ok"
+  ng-class="{'ui-grid-all-selected': grid.selection.selectAll}"
+  ng-click="headerButtonClick($event)">
+</div>
diff --git a/src/features/tree-base/templates/treeBaseExpandAllButtons.html b/src/features/tree-base/templates/treeBaseExpandAllButtons.html
index 14e9efbc2c..b43348beb6 100644
--- a/src/features/tree-base/templates/treeBaseExpandAllButtons.html
+++ b/src/features/tree-base/templates/treeBaseExpandAllButtons.html
@@ -1,2 +1,5 @@
-<div class="ui-grid-tree-base-row-header-buttons" ng-class="{'ui-grid-icon-minus-squared': grid.treeBase.numberLevels > 0 && grid.treeBase.expandAll, 'ui-grid-icon-plus-squared': grid.treeBase.numberLevels > 0 && !grid.treeBase.expandAll}" ng-click="headerButtonClick($event)">
-</div>
\ No newline at end of file
+<div
+  class="ui-grid-tree-base-row-header-buttons"
+  ng-class="{'ui-grid-icon-minus-squared': grid.treeBase.numberLevels > 0 && grid.treeBase.expandAll, 'ui-grid-icon-plus-squared': grid.treeBase.numberLevels > 0 && !grid.treeBase.expandAll}"
+  ng-click="headerButtonClick($event)">
+</div>
diff --git a/src/features/tree-base/templates/treeBaseHeaderCell.html b/src/features/tree-base/templates/treeBaseHeaderCell.html
index 374bb7be06..4d564d3483 100644
--- a/src/features/tree-base/templates/treeBaseHeaderCell.html
+++ b/src/features/tree-base/templates/treeBaseHeaderCell.html
@@ -1,5 +1,8 @@
 <div>
-  <div class="ui-grid-cell-contents" col-index="renderIndex">
-    <ui-grid-tree-base-expand-all-buttons ></ui-grid-tree-base-expand-all-buttons>
+  <div
+    class="ui-grid-cell-contents"
+    col-index="renderIndex">
+    <ui-grid-tree-base-expand-all-buttons>
+    </ui-grid-tree-base-expand-all-buttons>
   </div>
 </div>
diff --git a/src/features/tree-base/templates/treeBaseRowHeader.html b/src/features/tree-base/templates/treeBaseRowHeader.html
index d6bc931047..6fda8bd760 100644
--- a/src/features/tree-base/templates/treeBaseRowHeader.html
+++ b/src/features/tree-base/templates/treeBaseRowHeader.html
@@ -1,3 +1,5 @@
-<div class="ui-grid-cell-contents">
-  <ui-grid-tree-base-row-header-buttons></ui-grid-tree-base-row-header-buttons>
+<div
+  class="ui-grid-cell-contents">
+  <ui-grid-tree-base-row-header-buttons>
+  </ui-grid-tree-base-row-header-buttons>
 </div>
diff --git a/src/features/tree-base/templates/treeBaseRowHeaderButtons.html b/src/features/tree-base/templates/treeBaseRowHeaderButtons.html
index 8db33c5ed7..0185a60953 100644
--- a/src/features/tree-base/templates/treeBaseRowHeaderButtons.html
+++ b/src/features/tree-base/templates/treeBaseRowHeaderButtons.html
@@ -1,4 +1,10 @@
-<div class="ui-grid-tree-base-row-header-buttons" ng-class="{'ui-grid-tree-base-header': row.treeLevel > -1 }" ng-click="treeButtonClick(row, $event)">
-  <i ng-class="{'ui-grid-icon-minus-squared': ( ( grid.options.showTreeExpandNoChildren && row.treeLevel > -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'expanded', 'ui-grid-icon-plus-squared': ( ( grid.options.showTreeExpandNoChildren && row.treeLevel > -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'collapsed'}" ng-style="{'padding-left': grid.options.treeIndent * row.treeLevel + 'px'}"></i>
+<div
+  class="ui-grid-tree-base-row-header-buttons"
+  ng-class="{'ui-grid-tree-base-header': row.treeLevel > -1 }"
+  ng-click="treeButtonClick(row, $event)">
+  <i
+    ng-class="{'ui-grid-icon-minus-squared': ( ( grid.options.showTreeExpandNoChildren && row.treeLevel > -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'expanded', 'ui-grid-icon-plus-squared': ( ( grid.options.showTreeExpandNoChildren && row.treeLevel > -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'collapsed'}"
+    ng-style="{'padding-left': grid.options.treeIndent * row.treeLevel + 'px'}">
+  </i>
   &nbsp;
-</div>
\ No newline at end of file
+</div>
diff --git a/src/templates/ui-grid/ui-grid-filter.html b/src/templates/ui-grid/ui-grid-filter.html
index 05f5ecbb22..13ab9dadb5 100644
--- a/src/templates/ui-grid/ui-grid-filter.html
+++ b/src/templates/ui-grid/ui-grid-filter.html
@@ -2,7 +2,8 @@
   class="ui-grid-filter-container"
   ng-repeat="colFilter in col.filters"
   ng-class="{'ui-grid-filter-cancel-button-hidden' : colFilter.disableCancelFilterButton === true }">
-  <div ng-if="colFilter.type !== 'select'">
+  <div
+    ng-if="colFilter.type !== 'select'">
     <input
       type="text"
       class="ui-grid-filter-input ui-grid-filter-input-{{$index}}"
@@ -25,7 +26,8 @@
     </div>
   </div>
 
-  <div ng-if="colFilter.type === 'select'">
+  <div
+    ng-if="colFilter.type === 'select'">
     <select
       class="ui-grid-filter-select ui-grid-filter-input-{{$index}}"
       ng-model="colFilter.term"
diff --git a/src/templates/ui-grid/ui-grid-footer.html b/src/templates/ui-grid/ui-grid-footer.html
index d245b7bc23..e4c966602d 100644
--- a/src/templates/ui-grid/ui-grid-footer.html
+++ b/src/templates/ui-grid/ui-grid-footer.html
@@ -1,9 +1,23 @@
-<div class="ui-grid-footer-panel ui-grid-footer-aggregates-row"> <!-- tfooter -->
-  <div class="ui-grid-footer ui-grid-footer-viewport">
-    <div class="ui-grid-footer-canvas">
-      <div class="ui-grid-footer-cell-wrapper" ng-style="colContainer.headerCellWrapperStyle()">
-        <div role="row" class="ui-grid-footer-cell-row">
-          <div role="gridcell" ng-repeat="col in colContainer.renderedColumns track by col.uid" ui-grid-footer-cell col="col" render-index="$index" class="ui-grid-footer-cell ui-grid-clearfix"></div>
+<div
+  class="ui-grid-footer-panel ui-grid-footer-aggregates-row"> <!-- tfooter -->
+  <div
+    class="ui-grid-footer ui-grid-footer-viewport">
+    <div
+      class="ui-grid-footer-canvas">
+      <div
+        class="ui-grid-footer-cell-wrapper"
+        ng-style="colContainer.headerCellWrapperStyle()">
+        <div
+          role="row"
+          class="ui-grid-footer-cell-row">
+          <div
+            ui-grid-footer-cell
+            role="gridcell"
+            ng-repeat="col in colContainer.renderedColumns track by col.uid"
+            col="col"
+            render-index="$index"
+            class="ui-grid-footer-cell ui-grid-clearfix">
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/templates/ui-grid/ui-grid-grid-footer.html b/src/templates/ui-grid/ui-grid-grid-footer.html
index 7c83550097..572d989c05 100644
--- a/src/templates/ui-grid/ui-grid-grid-footer.html
+++ b/src/templates/ui-grid/ui-grid-grid-footer.html
@@ -1,6 +1,8 @@
 <div class="ui-grid-footer-info ui-grid-grid-footer">
-        <span>{{'search.totalItems' | t}} {{grid.rows.length}}</span>
-        <span ng-if="grid.renderContainers.body.visibleRowCache.length !== grid.rows.length"
-              class="ngLabel">({{"search.showingItems" | t}} {{grid.renderContainers.body.visibleRowCache.length}})
-        </span>
+  <span>{{'search.totalItems' | t}} {{grid.rows.length}}</span>
+  <span
+    ng-if="grid.renderContainers.body.visibleRowCache.length !== grid.rows.length"
+    class="ngLabel">
+    ({{"search.showingItems" | t}} {{grid.renderContainers.body.visibleRowCache.length}})
+  </span>
 </div>
diff --git a/src/templates/ui-grid/ui-grid-header.html b/src/templates/ui-grid/ui-grid-header.html
index 875d318d5c..5507171768 100644
--- a/src/templates/ui-grid/ui-grid-header.html
+++ b/src/templates/ui-grid/ui-grid-header.html
@@ -1,10 +1,25 @@
-<div role="rowgroup" class="ui-grid-header"> <!-- theader -->
-  <div class="ui-grid-top-panel">
-    <div class="ui-grid-header-viewport">
-      <div class="ui-grid-header-canvas">
-        <div class="ui-grid-header-cell-wrapper" ng-style="colContainer.headerCellWrapperStyle()">
-          <div role="row" class="ui-grid-header-cell-row">
-            <div class="ui-grid-header-cell ui-grid-clearfix" ng-repeat="col in colContainer.renderedColumns track by col.uid" ui-grid-header-cell col="col" render-index="$index"></div>
+<div
+  role="rowgroup"
+  class="ui-grid-header"> <!-- theader -->
+  <div
+    class="ui-grid-top-panel">
+    <div
+      class="ui-grid-header-viewport">
+      <div
+        class="ui-grid-header-canvas">
+        <div
+          class="ui-grid-header-cell-wrapper"
+          ng-style="colContainer.headerCellWrapperStyle()">
+          <div
+            role="row"
+            class="ui-grid-header-cell-row">
+            <div
+              class="ui-grid-header-cell ui-grid-clearfix"
+              ng-repeat="col in colContainer.renderedColumns track by col.uid"
+              ui-grid-header-cell
+              col="col"
+              render-index="$index">
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/templates/ui-grid/ui-grid-row.html b/src/templates/ui-grid/ui-grid-row.html
index dde3476757..83fdeb9ff7 100644
--- a/src/templates/ui-grid/ui-grid-row.html
+++ b/src/templates/ui-grid/ui-grid-row.html
@@ -1,7 +1,8 @@
  <div
-   ng-repeat="(colRenderIndex, col) in colContainer.renderedColumns track by col.uid"
-   ui-grid-one-bind-id-grid="rowRenderIndex + '-' + col.uid + '-cell'"
-   class="ui-grid-cell"
-   ng-class="{ 'ui-grid-row-header-cell': col.isRowHeader }"
-   role="{{col.isRowHeader ? 'rowheader' : 'gridcell'}}"
-   ui-grid-cell></div>
+  ng-repeat="(colRenderIndex, col) in colContainer.renderedColumns track by col.uid"
+  ui-grid-one-bind-id-grid="rowRenderIndex + '-' + col.uid + '-cell'"
+  class="ui-grid-cell"
+  ng-class="{ 'ui-grid-row-header-cell': col.isRowHeader }"
+  role="{{col.isRowHeader ? 'rowheader' : 'gridcell'}}"
+  ui-grid-cell>
+</div>
diff --git a/src/templates/ui-grid/uiGridCell.html b/src/templates/ui-grid/uiGridCell.html
index 406c7deddc..100e407e83 100644
--- a/src/templates/ui-grid/uiGridCell.html
+++ b/src/templates/ui-grid/uiGridCell.html
@@ -1 +1,5 @@
-<div class="ui-grid-cell-contents" title="TOOLTIP">{{COL_FIELD CUSTOM_FILTERS}}</div>
\ No newline at end of file
+<div
+  class="ui-grid-cell-contents"
+  title="TOOLTIP">
+  {{COL_FIELD CUSTOM_FILTERS}}
+</div>
diff --git a/src/templates/ui-grid/uiGridFooterCell.html b/src/templates/ui-grid/uiGridFooterCell.html
index f82703d2f4..eb5cf1bf52 100644
--- a/src/templates/ui-grid/uiGridFooterCell.html
+++ b/src/templates/ui-grid/uiGridFooterCell.html
@@ -1,3 +1,7 @@
-<div class="ui-grid-cell-contents" col-index="renderIndex">
-    <div>{{ col.getAggregationText() + ( col.getAggregationValue() CUSTOM_FILTERS ) }}</div>
-</div>
\ No newline at end of file
+<div
+  class="ui-grid-cell-contents"
+  col-index="renderIndex">
+  <div>
+    {{ col.getAggregationText() + ( col.getAggregationValue() CUSTOM_FILTERS ) }}
+  </div>
+</div>
diff --git a/src/templates/ui-grid/uiGridHeaderCell.html b/src/templates/ui-grid/uiGridHeaderCell.html
index 8b72b9cf4d..358d506ce2 100644
--- a/src/templates/ui-grid/uiGridHeaderCell.html
+++ b/src/templates/ui-grid/uiGridHeaderCell.html
@@ -3,14 +3,16 @@
   ng-class="{ 'sortable': sortable }"
   ui-grid-one-bind-aria-labelledby-grid="col.uid + '-header-text ' + col.uid + '-sortdir-text'"
   aria-sort="{{col.sort.direction == asc ? 'ascending' : ( col.sort.direction == desc ? 'descending' : (!col.sort.direction ? 'none' : 'other'))}}">
-  <!-- <div class="ui-grid-vertical-bar">&nbsp;</div> -->
   <div
     role="button"
     tabindex="0"
     class="ui-grid-cell-contents ui-grid-header-cell-primary-focus"
     col-index="renderIndex"
     title="TOOLTIP">
-    <span ui-grid-one-bind-id-grid="col.uid + '-header-text'">{{ col.displayName CUSTOM_FILTERS }}</span>
+    <span
+      ui-grid-one-bind-id-grid="col.uid + '-header-text'">
+      {{ col.displayName CUSTOM_FILTERS }}
+    </span>
 
     <span
       ui-grid-one-bind-id-grid="col.uid + '-sortdir-text'"
@@ -35,7 +37,11 @@
     ng-class="{'ui-grid-column-menu-button-last-col': isLastCol}"
     ui-grid-one-bind-aria-label="i18n.headerCell.aria.columnMenuButtonLabel"
     aria-haspopup="true">
-    <i class="ui-grid-icon-angle-down" aria-hidden="true">&nbsp;</i>
+    <i
+      class="ui-grid-icon-angle-down"
+      aria-hidden="true">
+      &nbsp;
+    </i>
   </div>
 
   <div ui-grid-filter></div>
diff --git a/src/templates/ui-grid/uiGridMenu.html b/src/templates/ui-grid/uiGridMenu.html
index 44ce136c92..b809b1b4f3 100644
--- a/src/templates/ui-grid/uiGridMenu.html
+++ b/src/templates/ui-grid/uiGridMenu.html
@@ -1,6 +1,11 @@
-<div class="ui-grid-menu" ng-if="shown">
-  <div class="ui-grid-menu-mid" ng-show="shownMid">
-    <div class="ui-grid-menu-inner">
+<div
+  class="ui-grid-menu"
+  ng-if="shown">
+  <div
+    class="ui-grid-menu-mid"
+    ng-show="shownMid">
+    <div
+    class="ui-grid-menu-inner">
       <button
         type="button"
         ng-focus="focus=true"
@@ -12,7 +17,9 @@
           ui-grid-one-bind-aria-label="i18n.close">
         </i>
       </button>
-      <ul role="menu" class="ui-grid-menu-items">
+      <ul
+        role="menu"
+        class="ui-grid-menu-items">
         <li
           ng-repeat="item in menuItems"
           role="menuitem"
diff --git a/src/templates/ui-grid/uiGridRenderContainer.html b/src/templates/ui-grid/uiGridRenderContainer.html
index 939c74b54d..fe7d3149d4 100644
--- a/src/templates/ui-grid/uiGridRenderContainer.html
+++ b/src/templates/ui-grid/uiGridRenderContainer.html
@@ -4,8 +4,14 @@
   class="ui-grid-render-container"
   ng-style="{ 'margin-left': colContainer.getMargin('left') + 'px', 'margin-right': colContainer.getMargin('right') + 'px' }">
   <!-- All of these dom elements are replaced in place -->
-  <div ui-grid-header></div>
-  <div ui-grid-viewport></div>
-  <div ng-if="colContainer.needsHScrollbarPlaceholder()" class="ui-grid-scrollbar-placeholder" style="height:{{colContainer.grid.scrollbarHeight}}px"></div>
-  <div ui-grid-footer ng-if="grid.options.showColumnFooter"></div>
+  <ui-grid-header></ui-grid-header>
+  <ui-grid-viewport></ui-grid-viewport>
+  <div
+    ng-if="colContainer.needsHScrollbarPlaceholder()"
+    class="ui-grid-scrollbar-placeholder"
+    style="height:{{colContainer.grid.scrollbarHeight}}px">
+  </div>
+  <ui-grid-footer
+    ng-if="grid.options.showColumnFooter">
+  </ui-grid-footer>
 </div>
diff --git a/src/templates/ui-grid/uiGridViewport.html b/src/templates/ui-grid/uiGridViewport.html
index 450c79d44d..500016bdc5 100644
--- a/src/templates/ui-grid/uiGridViewport.html
+++ b/src/templates/ui-grid/uiGridViewport.html
@@ -1,9 +1,18 @@
-<div role="rowgroup"
-class="ui-grid-viewport"
-ng-style="colContainer.getViewportStyle()"><!-- tbody -->
-  <div class="ui-grid-canvas">
-    <div ng-repeat="(rowRenderIndex, row) in rowContainer.renderedRows track by $index" class="ui-grid-row" ng-style="Viewport.rowStyle(rowRenderIndex)">
-      <div role="row" ui-grid-row="row" row-render-index="rowRenderIndex"></div>
+<div
+  role="rowgroup"
+  class="ui-grid-viewport"
+  ng-style="colContainer.getViewportStyle()"><!-- tbody -->
+  <div
+    class="ui-grid-canvas">
+    <div
+      ng-repeat="(rowRenderIndex, row) in rowContainer.renderedRows track by $index"
+      class="ui-grid-row"
+      ng-style="Viewport.rowStyle(rowRenderIndex)">
+      <div
+        role="row"
+        ui-grid-row="row"
+        row-render-index="rowRenderIndex">
+      </div>
     </div>
   </div>
 </div>