diff --git a/src/AssetManager.Web/Views/Categories/Create.cshtml b/src/AssetManager.Web/Views/Categories/Create.cshtml
index 6ee79f6..c0faad1 100644
--- a/src/AssetManager.Web/Views/Categories/Create.cshtml
+++ b/src/AssetManager.Web/Views/Categories/Create.cshtml
@@ -4,7 +4,18 @@
     ViewData["Title"] = "Create";
 }
 
-<h2>Create Category</h2>
+
+<div class="header-content">
+    <div class="row">
+        <div class="col-md-6 col-sm-6 col-xs-8">
+            <p class="header-content-title">Create</p>
+            <p class="header-content-subtitle">Category</p>
+        </div>
+        <div class="col-md-6 col-sm-6 col-xs-4">
+            <a class="pull-right btn btn-primary btn-create-new" asp-action="Index"><i class="fa fa-arrow-left icon-white"></i> Back</a>
+        </div>
+    </div>
+</div>
 
 <hr />
 <div class="row">
@@ -74,12 +85,14 @@
                         </div>
                     </div>
 
-                    <div class="box-footer text-right">
-                        <a class="btn btn-link text-left" asp-action="Index">Cancel</a>
-                        <button type="submit" class="btn btn-success">
-                            <i class="fa fa-check icon-white"></i>
-                            Submit
-                        </button>
+                    <div class="col-md-offset-3 col-md-7 no-padding">
+                        <div class="box-footer text-right">
+                            <a class="btn btn-link text-left" asp-action="Index">Cancel</a>
+                            <button type="submit" class="btn btn-success">
+                                <i class="fa fa-check icon-white"></i>
+                                Submit
+                            </button>
+                        </div>
                     </div>
 
                 </div>
diff --git a/src/AssetManager.Web/Views/Categories/Details.cshtml b/src/AssetManager.Web/Views/Categories/Details.cshtml
index 4cc1ba3..22cee91 100644
--- a/src/AssetManager.Web/Views/Categories/Details.cshtml
+++ b/src/AssetManager.Web/Views/Categories/Details.cshtml
@@ -4,57 +4,72 @@
     ViewData["Title"] = "Details";
 }
 
-<h2>Details</h2>
-
-<div>
-    <h4>Category</h4>
-    <hr />
-    <dl class="dl-horizontal">
-        <dt>
-            @Html.DisplayNameFor(model => model.Name)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Name)
-        </dd>
-        <dt>
-            @Html.DisplayNameFor(model => model.EulaText)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.EulaText)
-        </dd>
-        <dt>
-            @Html.DisplayNameFor(model => model.DefaultEula)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.DefaultEula)
-        </dd>
-        <dt>
-            @Html.DisplayNameFor(model => model.Type)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Type)
-        </dd>
-        <dt>
-            @Html.DisplayNameFor(model => model.CheckInEmail)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.CheckInEmail)
-        </dd>
-        <dt>
-            @Html.DisplayNameFor(model => model.Image)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Image)
-        </dd>
-        <dt>
-            @Html.DisplayNameFor(model => model.Id)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Id)
-        </dd>
-    </dl>
+<div class="header-content">
+    <div class="row">
+        <div class="col-md-6 col-sm-6 col-xs-8">
+            <p class="header-content-title">Details Category</p>
+        </div>
+        <div class="col-md-6 col-sm-6 col-xs-4">
+            <a class="pull-right btn btn-primary btn-create-new" asp-action="Index"><i class="fa fa-arrow-left icon-white"></i> Back</a>
+        </div>
+    </div>
 </div>
+
 <div>
-    @Html.ActionLink("Edit", "Edit", new { /* id = Model.PrimaryKey */ }) |
-    <a asp-action="Index">Back to List</a>
-</div>
+    <div class="col-md-8 col-md-offset-2">
+        <div class="box box-info">
+            <div class="box-header with-border">
+                <dl class="dl-horizontal">
+                    <dt>
+                        @Html.DisplayNameFor(model => model.Name)
+                    </dt>
+                    <dd>
+                        @Html.DisplayFor(model => model.Name)
+                    </dd>
+                    <dt>
+                        @Html.DisplayNameFor(model => model.EulaText)
+                    </dt>
+                    <dd>
+                        @Html.DisplayFor(model => model.EulaText)
+                    </dd>
+                    <dt>
+                        @Html.DisplayNameFor(model => model.DefaultEula)
+                    </dt>
+                    <dd>
+                        @Html.DisplayFor(model => model.DefaultEula)
+                    </dd>
+                    <dt>
+                        @Html.DisplayNameFor(model => model.Type)
+                    </dt>
+                    <dd>
+                        @Html.DisplayFor(model => model.Type)
+                    </dd>
+                    <dt>
+                        @Html.DisplayNameFor(model => model.CheckInEmail)
+                    </dt>
+                    <dd>
+                        @Html.DisplayFor(model => model.CheckInEmail)
+                    </dd>
+                    <dt>
+                        @Html.DisplayNameFor(model => model.Image)
+                    </dt>
+                    <dd>
+                        @Html.DisplayFor(model => model.Image)
+                    </dd>
+                    <dt>
+                        @Html.DisplayNameFor(model => model.Id)
+                    </dt>
+                    <dd>
+                        @Html.DisplayFor(model => model.Id)
+                    </dd>
+                </dl>
+            </div>
+
+            <div class="box-footer">
+                @Html.ActionLink("Edit", "Edit", new { id = Model.Id }) |
+                <a asp-action="Index">Back to List</a>
+            </div>
+
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/AssetManager.Web/Views/Categories/Edit.cshtml b/src/AssetManager.Web/Views/Categories/Edit.cshtml
index 7dc0a96..4510c81 100644
--- a/src/AssetManager.Web/Views/Categories/Edit.cshtml
+++ b/src/AssetManager.Web/Views/Categories/Edit.cshtml
@@ -4,7 +4,16 @@
     ViewData["Title"] = "Edit";
 }
 
-<h2>Edit Category</h2>
+<div class="header-content">
+    <div class="row">
+        <div class="col-md-6 col-sm-6 col-xs-8">
+            <p class="header-content-title">Edit Category</p>
+        </div>
+        <div class="col-md-6 col-sm-6 col-xs-4">
+            <a class="pull-right btn btn-primary btn-create-new" asp-action="Index"><i class="fa fa-arrow-left icon-white"></i> Back</a>
+        </div>
+    </div>
+</div>
 
 <hr />
 <div class="row">
@@ -70,12 +79,16 @@
                         </div>
                     </div>
 
-                    <div class="form-group">
-                        <div class="col-sm-5"></div>
-                        <div class="col-sm-5">
-                            <button type="submit" class="btn btn-primary">Submit</button>
+                    <div class="col-md-offset-3 col-md-7 no-padding">
+                        <div class="box-footer text-right">
+                            <a class="btn btn-link text-left" asp-action="Index">Cancel</a>
+                            <button type="submit" class="btn btn-success">
+                                <i class="fa fa-check icon-white"></i>
+                                Submit
+                            </button>
                         </div>
                     </div>
+
                 </div>
 
             </form>
diff --git a/src/AssetManager.Web/Views/Categories/Index.cshtml b/src/AssetManager.Web/Views/Categories/Index.cshtml
index 5003098..c9d93af 100644
--- a/src/AssetManager.Web/Views/Categories/Index.cshtml
+++ b/src/AssetManager.Web/Views/Categories/Index.cshtml
@@ -4,11 +4,18 @@
     ViewData["Title"] = "Index";
 }
 
-<h2>Index</h2>
+<div class="header-content">
+    <div class="row">
+        <div class="col-md-6 col-sm-6 col-xs-8">
+            <p class="header-content-title">Category</p>
+        </div>
+        <div class="col-md-6 col-sm-6 col-xs-4">
+            <a asp-action="Create" class="pull-right btn btn-primary btn-create-new">Create New</a>
+        </div>
+    </div>
+</div>
+
 
-<p>
-    <a asp-action="Create">Create New</a>
-</p>
 <div class="row">
     <div class="col-md-12">
 
diff --git a/src/AssetManager.Web/Views/StatusLabels/Create.cshtml b/src/AssetManager.Web/Views/StatusLabels/Create.cshtml
index f460610..ab0cd7f 100644
--- a/src/AssetManager.Web/Views/StatusLabels/Create.cshtml
+++ b/src/AssetManager.Web/Views/StatusLabels/Create.cshtml
@@ -66,12 +66,14 @@
                         </div>
                     </div>
 
-                    <div class="box-footer text-right">
-                        <a class="btn btn-link text-left" asp-action="Index">Cancel</a>
-                        <button type="submit" class="btn btn-success">
-                            <i class="fa fa-check icon-white"></i>
-                            Submit
-                        </button>
+                    <div class="col-md-offset-3 col-md-7 no-padding">
+                        <div class="box-footer text-right">
+                            <a class="btn btn-link text-left" asp-action="Index">Cancel</a>
+                            <button type="submit" class="btn btn-success">
+                                <i class="fa fa-check icon-white"></i>
+                                Submit
+                            </button>
+                        </div>
                     </div>
 
                 </div>
diff --git a/src/AssetManager.Web/Views/StatusLabels/Details.cshtml b/src/AssetManager.Web/Views/StatusLabels/Details.cshtml
index 0f54bf9..b06fdf6 100644
--- a/src/AssetManager.Web/Views/StatusLabels/Details.cshtml
+++ b/src/AssetManager.Web/Views/StatusLabels/Details.cshtml
@@ -11,7 +11,7 @@
             <p class="header-content-title">Details Status Label</p>
         </div>
         <div class="col-md-6 col-sm-6 col-xs-4">
-            <a asp-action="Index" class="pull-right btn btn-primary btn-create-new">Back</a>
+            <a class="pull-right btn btn-primary btn-create-new" asp-action="Index"><i class="fa fa-arrow-left icon-white"></i> Back</a>
         </div>
     </div>
 </div>
diff --git a/src/AssetManager.Web/Views/StatusLabels/Edit.cshtml b/src/AssetManager.Web/Views/StatusLabels/Edit.cshtml
index 60411cd..3daf12b 100644
--- a/src/AssetManager.Web/Views/StatusLabels/Edit.cshtml
+++ b/src/AssetManager.Web/Views/StatusLabels/Edit.cshtml
@@ -11,7 +11,7 @@
             <p class="header-content-title">Edit Status Label</p>
         </div>
         <div class="col-md-6 col-sm-6 col-xs-4">
-            <a asp-action="Index" class="pull-right btn btn-primary btn-create-new">Back</a>
+            <a class="pull-right btn btn-primary btn-create-new" asp-action="Index"><i class="fa fa-arrow-left icon-white"></i> Back</a>
         </div>
     </div>
 </div>
@@ -62,12 +62,14 @@
                         </div>
                     </div>
 
-                    <div class="box-footer text-right">
-                        <a class="btn btn-link text-left" asp-action="Index">Cancel</a>
-                        <button type="submit" class="btn btn-success">
-                            <i class="fa fa-check icon-white"></i>
-                            Submit
-                        </button>
+                    <div class="col-md-offset-3 col-md-7 no-padding">
+                        <div class="box-footer text-right">
+                            <a class="btn btn-link text-left" asp-action="Index">Cancel</a>
+                            <button type="submit" class="btn btn-success">
+                                <i class="fa fa-check icon-white"></i>
+                                Submit
+                            </button>
+                        </div>
                     </div>