diff --git a/app/views/backend/categories/edit.blade.php b/app/views/backend/categories/edit.blade.php
index 18311ca731..b0ee3146f8 100755
--- a/app/views/backend/categories/edit.blade.php
+++ b/app/views/backend/categories/edit.blade.php
@@ -12,48 +12,46 @@
 
 {{-- Page content --}}
 @section('content')
-<div id="pad-wrapper" class="user-profile">
-                <!-- header -->
-				<h3 class="name">Asset Categories
-				<div class="pull-right">
-					<a href="{{ route('categories') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-				</div>
-		</h3>
 
 
-                <div class="row-fluid profile">
-                    <!-- bio, new note & orders column -->
-                    <div class="span9 bio">
-                        <div class="profile-box">
-                            <br>
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('categories') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<h3>Asset Categories</h3>
+	</div>
+</div>
+
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
+
                         <form class="form-horizontal" method="post" action="" autocomplete="off">
 						<!-- CSRF Token -->
 						<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
-						<!-- Category Title -->
-						<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
-							<label class="control-label" for="name">Category Name</label>
-							<div class="controls">
-								<input type="text" name="name" id="name" value="{{ Input::old('name', $category->name) }}" />
-								{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
-							</div>
+						<!-- Name -->
+						<div class="form-group {{ $errors->has('asset_tag') ? ' has-error' : '' }}">
+							<label for="name" class="col-md-2 control-label">Category Name</label>
+								<div class="col-md-7">
+									<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $category->name) }}" />
+									{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+								</div>
 						</div>
 
 						<!-- Form actions -->
 						<div class="form-group">
-							<div class="controls">
+						<label class="col-md-2 control-label"></label>
+							<div class="col-md-7">
 								<a class="btn btn-link" href="{{ route('categories') }}">@lang('general.cancel')</a>
-								<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
+								<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 							</div>
 						</div>
 					</form>
-
-
-                        </div>
-                    </div>
+					<br><br><br><br><br>
+					</div>
 
                     <!-- side address column -->
-                    <div class="span3 address pull-right">
+                    <div class="col-md-3 col-xs-12 address pull-right">
 						<br /><br />
 						<h6>About Asset Categories</h6>
 						<p>Asset categories help you organize your assets. Some
@@ -61,4 +59,6 @@
 						and so on, but you can use asset categories any way that makes sense for you.  </p>
 
                     </div>
+</div>
+</div>
 @stop
diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php
index 14309aef10..06ed0cd66d 100755
--- a/app/views/backend/categories/index.blade.php
+++ b/app/views/backend/categories/index.blade.php
@@ -8,53 +8,53 @@ Asset Categories ::
 
 {{-- Page content --}}
 @section('content')
-<div id="pad-wrapper" class="user-profile">
-                <!-- header -->
-				<h3 class="name">Asset Categories
-				<div class="pull-right">
-					<a href="{{ route('create/category') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i>  Create New</a>
-				</div>
-		</h3>
+
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('create/category') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> Create New</a>
+		<h3>Asset Categories</h3>
+	</div>
+</div>
+
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
+
+		<table id="example">
+		<thead>
+			<tr role="row">
+				<th class="col-md-7">@lang('admin/categories/table.title')</th>
+				<th class="col-md-2">@lang('table.actions')</th>
+			</tr>
+		</thead>
+		<tbody>
+			@foreach ($categories as $category)
+			<tr>
+				<td>{{ $category->name }}</td>
+				<td>
+				<a href="{{ route('update/category', $category->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
+<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/category', $category->id) }}" data-content="Are you sure you wish to delete this category?" data-title="Delete {{ htmlspecialchars($category->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
 
 
-                <div class="row-fluid profile">
-                    <!-- bio, new note & orders column -->
-                    <div class="col-md-9 bio">
-                        <div class="profile-box">
-                            <br>
-                            <!-- checked out assets table -->
-
-                        <table id="example">
-						<thead>
-							<tr role="row">
-								<th class="col-md-6">@lang('admin/categories/table.title')</th>
-								<th class="col-md-3">@lang('table.actions')</th>
-							</tr>
-						</thead>
-						<tbody>
-							@foreach ($categories as $category)
-							<tr>
-								<td>{{ $category->name }}</td>
-								<td>
-									<a href="{{ route('update/category', $category->id) }}" class="btn-flat white"> @lang('button.edit')</a>
-									<a data-html="false" class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/category', $category->id) }}" data-content="Are you sure you wish to delete this category?" data-title="Delete the  {{ htmlspecialchars($category->name) }} category?" onClick="return false;">@lang('button.delete')</a>
-								</td>
-							</tr>
-							@endforeach
-						</tbody>
-						</table>
+				</td>
+			</tr>
+			@endforeach
+		</tbody>
+		</table>
 
 
-                        </div>
-                    </div>
+	</div>
 
-                    <!-- side address column -->
-                    <div class="col-md-3 address pull-right">
-						<br /><br />
-						<h6>About Asset Categories</h6>
-						<p>Asset categories help you organize your assets. Some
-						example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;,
-						and so on, but you can use asset categories any way that makes sense for you.  </p>
 
-                    </div>
+<!-- side address column -->
+<div class="col-md-3 col-xs-12 address pull-right">
+	<br /><br />
+	<h6>About Asset Categories</h6>
+	<p>Asset categories help you organize your assets. Some
+	example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;,
+	and so on, but you can use asset categories any way that makes sense for you.  </p>
+
+</div>
+</div>
+</div>
 @stop
\ No newline at end of file
diff --git a/app/views/backend/manufacturers/edit.blade.php b/app/views/backend/manufacturers/edit.blade.php
index b5601338cb..2ea00f0277 100755
--- a/app/views/backend/manufacturers/edit.blade.php
+++ b/app/views/backend/manufacturers/edit.blade.php
@@ -12,48 +12,70 @@
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
-	<h3>
+
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('manufacturers') }}" class="btn-flat gray pull-right"><i class="icon-plus-sign icon-white"></i> Back</a>
+		<h3>
 		@if ($manufacturer->id)
 		Update Manufacturer
 		@else
 			Create manufacturer
 		@endif
-
-		<div class="pull-right">
-			<a href="{{ route('manufacturers') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
 	</h3>
+	</div>
 </div>
 
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
+
+
+
 
 <form class="form-horizontal" method="post" action="" autocomplete="off">
 	<!-- CSRF Token -->
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
-	<!-- Tabs Content -->
-	<div class="tab-content">
-
-		<div class="tab-pane active" id="tab-general">
-			<!-- Category Title -->
-			<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
-				<label class="control-label" for="name">Manufacturer Name</label>
-				<div class="controls">
-					<input type="text" name="name" id="name" value="{{ Input::old('name', $manufacturer->name) }}" />
-					{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
-				</div>
+			<!-- Name -->
+			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
+				<label for="name" class="col-md-2 control-label">Manufacturer Name</label>
+					<div class="col-md-7">
+						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $manufacturer->name) }}" />
+						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
 
+
+		<!-- Form actions -->
+		<div class="form-group">
+		<label class="col-md-2 control-label"></label>
+			<div class="col-md-7">
+				@if ($manufacturer->id)
+				<a class="btn btn-link" href="{{ route('view/manufacturer', $manufacturer->id) }}">@lang('general.cancel')</a>
+				@else
+				<a class="btn btn-link" href="{{ route('manufacturers') }}">@lang('general.cancel')</a>
+				@endif
+				<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
+			</div>
 		</div>
 
-	<!-- Form actions -->
-	<div class="form-group">
-		<div class="controls">
-			<a class="btn btn-link" href="{{ route('manufacturers') }}">@lang('general.cancel')</a>
-			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
-		</div>
-	</div>
 </form>
+<br><br><br><br>
 
+</div>
+
+	<!-- side address column -->
+   <div class="col-md-3 col-xs-12 address pull-right">
+		<br /><br />
+		<h6>Have Some Haiku</h6>
+		<p>Serious error.<br>
+		All shortcuts have disappeared.<br>
+		Screen. Mind. Both are blank.</p>
+
+
+	</div>
+
+</div>
 
 @stop
diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php
index 252b90dbd2..72bf06aebe 100755
--- a/app/views/backend/manufacturers/index.blade.php
+++ b/app/views/backend/manufacturers/index.blade.php
@@ -8,22 +8,24 @@ Asset Manufacturers ::
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
 
-	<div class="pull-right">
-		<a href="{{ route('create/manufacturer') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('create/manufacturer') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> Create New</a>
+		<h3>Asset Manufacturers</h3>
 	</div>
-
-	<h3>Asset Manufacturers</h3>
 </div>
 
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
+
 
-<div class="row-fluid table">
 <table id="example">
 	<thead>
 		<tr role="row">
-			<th class="col-md-6">@lang('admin/manufacturers/table.title')</th>
-			<th class="col-md-3">@lang('table.actions')</th>
+			<th class="col-md-7">@lang('admin/manufacturers/table.title')</th>
+			<th class="col-md-2">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -31,8 +33,11 @@ Asset Manufacturers ::
 		<tr>
 			<td>{{ $manufacturer->name }}</td>
 			<td>
-				<a href="{{ route('update/manufacturer', $manufacturer->id) }}" class="btn-flat white">@lang('button.edit')</a>
-				<a data-html="false" class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/manufacturer', $manufacturer->id) }}" data-content="Are you sure you wish to delete this manufacturer?" data-title="Delete {{ htmlspecialchars($manufacturer->name) }}?" onClick="return false;">@lang('button.delete')</a>
+
+				<a href="{{ route('update/manufacturer', $manufacturer->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
+				<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/manufacturer', $manufacturer->id) }}" data-content="Are you sure you wish to delete this manufacturer?" data-title="Delete {{ htmlspecialchars($manufacturer->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
+
+
 			</td>
 		</tr>
 		@endforeach
@@ -40,4 +45,23 @@ Asset Manufacturers ::
 </table>
 </div>
 
+	<!-- side address column -->
+   <div class="col-md-3 col-xs-12 address pull-right">
+		<br /><br />
+		<h6>Have Some Haiku</h6>
+		<p>The Staples truck came.<br>
+		Left thirteen cardboard boxes.<br>
+		Honey stained maple.</p>
+
+		<p>----------</p>
+
+		<p>I'm sorry, there's – um -<br>
+		insufficient – what's-it-called?<br>
+		The term eludes me...</p>
+
+	</div>
+
+</div>
+
+
 @stop