diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2-Fluid.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2-Fluid.cshtml
new file mode 100644
index 0000000000..f3241071a6
--- /dev/null
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2-Fluid.cshtml
@@ -0,0 +1,80 @@
+@inherits UmbracoViewPage<dynamic>
+@using Umbraco.Web.Templates
+@using Newtonsoft.Json.Linq
+
+@if (Model != null && Model.sections != null)
+{
+    var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
+    
+    <div class="umb-grid">
+        @if (oneColumn)
+        {
+            foreach (var section in Model.sections) {
+                <div class="grid-section">
+                    @foreach (var row in section.rows) {
+                        @renderRow(row, true);
+                    }
+                </div>
+            }   
+        }else { 
+            <div class="container-fluid">
+                <div class="row-fluid clearfix">
+                    @foreach (var s in Model.sections) {
+                        <div class="grid-section">
+                            <div class="@("span" + s.grid) column">
+                                @foreach (var row in s.rows) {
+                                    @renderRow(row, false);
+                                }
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>   
+        }
+    </div>
+}
+
+@helper renderRow(dynamic row, bool singleColumn){
+    <div @RenderElementAttributes(row)>
+        @Umbraco.If(singleColumn, "<div class='container-fluid'>")
+        <div class="row-fluid clearfix">
+            @foreach ( var area in row.areas ) {
+            <div class="@("span" + area.grid) column">
+                <div @RenderElementAttributes(area)>
+                    @foreach (var control in area.controls) {
+                        if (control !=null && control.editor != null && control.editor.view != null ) {
+                            <text>@Html.Partial("grid/editors/base", (object)control)</text>
+                        }
+                    }
+                </div>
+            </div>}
+        </div>
+        @Umbraco.If(singleColumn, "</div>")
+    </div>
+}
+
+@functions {
+    public static MvcHtmlString RenderElementAttributes(dynamic contentItem)
+    {
+        var attrs = new List<string>();
+        JObject cfg = contentItem.config;
+
+        if(cfg != null)
+            foreach (JProperty property in cfg.Properties()) {
+                attrs.Add(property.Name + "='" + property.Value.ToString() + "'");
+            }
+                
+        JObject style = contentItem.styles;
+
+        if (style != null) { 
+        var cssVals = new List<string>();
+        foreach (JProperty property in style.Properties())
+            cssVals.Add(property.Name + ":" + property.Value.ToString() + ";");
+
+        if (cssVals.Any())
+            attrs.Add("style='" + string.Join(" ", cssVals) + "'");
+        }
+            
+        return new MvcHtmlString(string.Join(" ", attrs));
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml
index f3241071a6..8b189ae1a0 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml
@@ -17,8 +17,8 @@
                 </div>
             }   
         }else { 
-            <div class="container-fluid">
-                <div class="row-fluid clearfix">
+            <div class="container">
+                <div class="row clearfix">
                     @foreach (var s in Model.sections) {
                         <div class="grid-section">
                             <div class="@("span" + s.grid) column">
@@ -36,8 +36,8 @@
 
 @helper renderRow(dynamic row, bool singleColumn){
     <div @RenderElementAttributes(row)>
-        @Umbraco.If(singleColumn, "<div class='container-fluid'>")
-        <div class="row-fluid clearfix">
+        @Umbraco.If(singleColumn, "<div class='container'>")
+        <div class="row clearfix">
             @foreach ( var area in row.areas ) {
             <div class="@("span" + area.grid) column">
                 <div @RenderElementAttributes(area)>
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml
new file mode 100644
index 0000000000..ca196661e2
--- /dev/null
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml
@@ -0,0 +1,76 @@
+@inherits UmbracoViewPage<dynamic>
+@using Umbraco.Web.Templates
+@using Newtonsoft.Json.Linq
+
+@if (Model != null && Model.sections != null)
+{
+    var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
+    
+    <div class="umb-grid">
+        @if (oneColumn)
+        {
+            foreach (var section in Model.sections) {
+                <div class="grid-section">
+                    @foreach (var row in section.rows) {
+                        @renderRow(row);
+                    }
+                </div>
+            }   
+        }else { 
+            <div class="row clearfix">
+                @foreach (var s in Model.sections) {
+                    <div class="grid-section">
+                        <div class="col-md-@s.grid column">
+                            @foreach (var row in s.rows) {
+                                @renderRow(row);
+                            }
+                        </div>
+                    </div>
+                }
+            </div>
+        }
+    </div>
+}
+
+@helper renderRow(dynamic row){
+    <div @RenderElementAttributes(row)>
+        <div class="row clearfix">
+            @foreach ( var area in row.areas ) {
+            <div class="col-md-@area.grid column">
+                <div @RenderElementAttributes(area)>
+                    @foreach (var control in area.controls) {
+                        if (control !=null && control.editor != null && control.editor.view != null ) {
+                            <text>@Html.Partial("grid/editors/base", (object)control)</text>
+                        }
+                    }
+                </div>
+            </div>}
+        </div>
+    </div>
+}
+
+@functions {
+    public static MvcHtmlString RenderElementAttributes(dynamic contentItem)
+    {
+        var attrs = new List<string>();
+        JObject cfg = contentItem.config;
+
+        if(cfg != null)
+            foreach (JProperty property in cfg.Properties()) {
+                attrs.Add(property.Name + "='" + property.Value.ToString() + "'");
+            }
+                
+        JObject style = contentItem.styles;
+
+        if (style != null) { 
+        var cssVals = new List<string>();
+        foreach (JProperty property in style.Properties())
+            cssVals.Add(property.Name + ":" + property.Value.ToString() + ";");
+
+        if (cssVals.Any())
+            attrs.Add("style='" + string.Join(" ", cssVals) + "'");
+        }
+            
+        return new MvcHtmlString(string.Join(" ", attrs));
+    }
+}
\ No newline at end of file