diff --git a/app/views/backend/assets/checkout.blade.php b/app/views/backend/assets/checkout.blade.php
index 4ca71e1790..1460e89fe4 100644
--- a/app/views/backend/assets/checkout.blade.php
+++ b/app/views/backend/assets/checkout.blade.php
@@ -67,7 +67,7 @@
 	<div class="control-group">
 		<div class="controls">
 			<a class="btn btn-link" href="{{ route('assets') }}">@lang('general.cancel')</a>
-			<button type="submit" class="btn btn-success">@lang('general.checkout')</button>
+			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i>@lang('general.checkout')</button>
 		</div>
 	</div>
 </form>
diff --git a/app/views/backend/assets/index.blade.php b/app/views/backend/assets/index.blade.php
index c415ba67e9..8bcf8376a1 100755
--- a/app/views/backend/assets/index.blade.php
+++ b/app/views/backend/assets/index.blade.php
@@ -56,7 +56,7 @@ Assets ::
 			<td>{{ $asset->purchase_date }}</td>
 			<td>${{ number_format($asset->purchase_cost) }}</td>
 			<td>${{ number_format($asset->depreciation()) }}</td>
-			<td>
+			<td nowrap="nowrap">
 				<a href="{{ route('update/asset', $asset->id) }}" class="btn-flat white">@lang('button.edit')</a>
 				<a href="{{ route('delete/asset', $asset->id) }}" class="btn-flat danger">@lang('button.delete')</a>
 
diff --git a/app/views/backend/categories/edit.blade.php b/app/views/backend/categories/edit.blade.php
index 1aa33a49ca..33a9fa13d7 100755
--- a/app/views/backend/categories/edit.blade.php
+++ b/app/views/backend/categories/edit.blade.php
@@ -21,7 +21,7 @@
 		@endif
 
 		<div class="pull-right">
-			<a href="{{ route('categories') }}" class="btn btn-small btn-inverse"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+			<a href="{{ route('categories') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
 	</h3>
 </div>
@@ -47,7 +47,7 @@
 			<div class="control-group {{ $errors->has('parent') ? 'error' : '' }}">
 				<label class="control-label" for="parent">Category Parent</label>
 				<div class="controls">
-					{{ Form::select('parent', $category_options, Input::old('parent', $category->parent)) }}
+					{{ Form::select('parent', $category_options, Input::old('parent', $category->parent), array('class'=>'select2', 'style'=>'width:250px')) }}
 					{{ $errors->first('parent', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
@@ -57,7 +57,7 @@
 	<div class="control-group">
 		<div class="controls">
 			<a class="btn btn-link" href="{{ route('categories') }}">@lang('general.cancel')</a>
-			<button type="submit" class="btn btn-success">@lang('general.save')</button>
+			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 		</div>
 	</div>
 </form>
diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php
index 67bc4f4665..fe7a1e6107 100755
--- a/app/views/backend/categories/index.blade.php
+++ b/app/views/backend/categories/index.blade.php
@@ -13,7 +13,7 @@ Asset Categories ::
 		Asset Categories
 
 		<div class="pull-right">
-			<a href="{{ route('create/category') }}" class="btn btn-small btn-info"><i class="icon-plus-sign icon-white"></i> Create</a>
+			<a href="{{ route('create/category') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i>  Create New</a>
 		</div>
 	</h3>
 </div>
@@ -41,8 +41,8 @@ Asset Categories ::
 
 			</td>
 			<td>
-				<a href="{{ route('update/category', $category->id) }}" class="btn btn-mini">@lang('button.edit')</a>
-				<a href="{{ route('delete/category', $category->id) }}" class="btn btn-mini btn-danger">@lang('button.delete')</a>
+				<a href="{{ route('update/category', $category->id) }}" class="btn-flat white"> @lang('button.edit')</a>
+				<a href="{{ route('delete/category', $category->id) }}" class="btn-flat danger">@lang('button.delete')</a>
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/depreciations/edit.blade.php b/app/views/backend/depreciations/edit.blade.php
index 7916c12e62..b6a026d466 100755
--- a/app/views/backend/depreciations/edit.blade.php
+++ b/app/views/backend/depreciations/edit.blade.php
@@ -23,7 +23,7 @@
 		@endif
 
 		<div class="pull-right">
-			<a href="{{ route('depreciations') }}" class="btn btn-small btn-inverse"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+			<a href="{{ route('depreciations') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
 	</h3>
 </div>
@@ -61,7 +61,7 @@
 	<div class="control-group">
 		<div class="controls">
 			<a class="btn btn-link" href="{{ route('depreciations') }}">@lang('general.cancel')</a>
-			<button type="submit" class="btn btn-success">@lang('general.save')</button>
+			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 		</div>
 	</div>
 </form>
diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php
index c98518625b..9b3685f3a6 100755
--- a/app/views/backend/depreciations/index.blade.php
+++ b/app/views/backend/depreciations/index.blade.php
@@ -13,7 +13,7 @@ Asset Depreciations ::
 		Asset Depreciations
 
 		<div class="pull-right">
-			<a href="{{ route('create/depreciations') }}" class="btn btn-small btn-info"><i class="icon-plus-sign icon-white"></i> Create</a>
+			<a href="{{ route('create/depreciations') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
 		</div>
 	</h3>
 </div>
@@ -36,8 +36,8 @@ Asset Depreciations ::
 			<td>{{ $depreciation->name }}</td>
 			<td>{{ $depreciation->months }} @lang('admin/depreciations/table.months') </td>
 			<td>
-				<a href="{{ route('update/depreciations', $depreciation->id) }}" class="btn btn-mini">@lang('button.edit')</a>
-				<a href="{{ route('delete/depreciations', $depreciation->id) }}" class="btn btn-mini btn-danger">@lang('button.delete')</a>
+				<a href="{{ route('update/depreciations', $depreciation->id) }}" class="btn-flat white">@lang('button.edit')</a>
+				<a href="{{ route('delete/depreciations', $depreciation->id) }}" class="btn-flat danger">@lang('button.delete')</a>
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/groups/edit.blade.php b/app/views/backend/groups/edit.blade.php
index 27c142e908..b7135496b7 100755
--- a/app/views/backend/groups/edit.blade.php
+++ b/app/views/backend/groups/edit.blade.php
@@ -13,7 +13,7 @@ Group Update ::
 		Group Update
 
 		<div class="pull-right">
-			<a href="{{ route('groups') }}" class="btn btn-small btn-inverse"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+			<a href="{{ route('groups') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
 	</h3>
 </div>
@@ -83,10 +83,7 @@ Group Update ::
 	<div class="control-group">
 		<div class="controls">
 			<a class="btn btn-link" href="{{ route('groups') }}">@lang('general.cancel')</a>
-
-			<button type="reset" class="btn">Reset</button>
-
-			<button type="submit" class="btn btn-success">@lang('general.save')</button>
+			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 		</div>
 	</div>
 </form>
diff --git a/app/views/backend/groups/index.blade.php b/app/views/backend/groups/index.blade.php
index 88e4964eb3..63b15ddd37 100755
--- a/app/views/backend/groups/index.blade.php
+++ b/app/views/backend/groups/index.blade.php
@@ -13,7 +13,7 @@ Group Management ::
 		Group Management
 
 		<div class="pull-right">
-			<a href="{{ route('create/group') }}" class="btn btn-small btn-info"><i class="icon-plus-sign icon-white"></i> Create</a>
+			<a href="{{ route('create/group') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
 		</div>
 	</h3>
 </div>
@@ -41,8 +41,8 @@ Group Management ::
 			<td>{{ $group->users()->count() }}</td>
 			<td>{{ $group->created_at->diffForHumans() }}</td>
 			<td>
-				<a href="{{ route('update/group', $group->id) }}" class="btn btn-mini">@lang('button.edit')</a>
-				<a href="{{ route('delete/group', $group->id) }}" class="btn btn-mini btn-danger">@lang('button.delete')</a>
+				<a href="{{ route('update/group', $group->id) }}" class="btn-flat white">@lang('button.edit')</a>
+				<a href="{{ route('delete/group', $group->id) }}" class="btn-flat danger">@lang('button.delete')</a>
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php
index 7360fa3fbd..ff74fcb31e 100755
--- a/app/views/backend/layouts/default.blade.php
+++ b/app/views/backend/layouts/default.blade.php
@@ -50,6 +50,7 @@
 		h3 {
 			padding: 10px;
 		}
+
 		@show
 		</style>
 
@@ -71,7 +72,7 @@
                 <span class="icon-bar"></span>
             </button>
 
-            <a class="brand" href="index.html">Snipe IT Asset Management</a>
+            <a class="brand" href="/">Snipe IT Asset Management</a>
 			</ul>
 
 
@@ -177,7 +178,7 @@
             </li>
 
             <li>
-                <a href="chart-showcase.html">
+                <a href="#">
                     <i class="icon-signal"></i>
                     <span>Charts</span>
                 </a>
diff --git a/app/views/backend/licenses/edit.blade.php b/app/views/backend/licenses/edit.blade.php
index 164294b154..4c2a7c5396 100755
--- a/app/views/backend/licenses/edit.blade.php
+++ b/app/views/backend/licenses/edit.blade.php
@@ -21,7 +21,7 @@
 		@endif
 
 		<div class="pull-right">
-			<a href="{{ route('licenses') }}" class="btn btn-small btn-inverse"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+			<a href="{{ route('licenses') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
 	</h3>
 </div>
@@ -105,7 +105,7 @@
 	<div class="control-group">
 		<div class="controls">
 			<a class="btn btn-link" href="{{ route('licenses') }}">@lang('general.cancel')</a>
-			<button type="submit" class="btn btn-success">@lang('general.save')</button>
+			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 		</div>
 	</div>
 </form>
diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php
index 5b2b895c7a..cfda8744e4 100755
--- a/app/views/backend/licenses/index.blade.php
+++ b/app/views/backend/licenses/index.blade.php
@@ -12,7 +12,7 @@ Licenses ::
 		Software Licenses
 
 		<div class="pull-right">
-			<a href="{{ route('create/licenses') }}" class="btn btn-small btn-info"><i class="icon-plus-sign icon-white"></i> Create</a>
+			<a href="{{ route('create/licenses') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
 		</div>
 	</h3>
 </div>
@@ -28,7 +28,7 @@ Licenses ::
 			<th class="span2">@lang('admin/licenses/table.license_email')</th>
 			<th class="span2">@lang('admin/licenses/table.assigned_to')</th>
 			<th class="span2">@lang('admin/licenses/table.checkout')</th>
-			<th class="span4">@lang('table.actions')</th>
+			<th class="span2">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -47,14 +47,14 @@ Licenses ::
 			</td>
 			<td>
 			@if ($license->assigned_to != 0)
-				<a href="{{ route('checkin/license', $license->id) }}" class="btn btn-mini btn-info">Checkin</a>
+				<a href="{{ route('checkin/license', $license->id) }}" class="btn-flat info">Checkin</a>
 			@else
-				<a href="{{ route('checkout/license', $license->id) }}" class="btn btn-mini btn-success">Checkout</a>
+				<a href="{{ route('checkout/license', $license->id) }}" class="btn-flat success">Checkout</a>
 			@endif
 			</td>
 			<td>
-				<a href="{{ route('update/license', $license->id) }}" class="btn btn-mini"><i class="icon-pencil"></i> @lang('button.edit')</a>
-				<a href="{{ route('delete/license', $license->id) }}" class="btn btn-mini btn-danger"><i class="icon-remove icon-white"></i> @lang('button.delete')</a>
+				<a href="{{ route('update/license', $license->id) }}" class="btn-flat white"> @lang('button.edit')</a>
+				<a href="{{ route('delete/license', $license->id) }}"  class="btn-flat danger"> @lang('button.delete')</a>
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/locations/edit.blade.php b/app/views/backend/locations/edit.blade.php
index 411b634615..e3d9cad6f6 100755
--- a/app/views/backend/locations/edit.blade.php
+++ b/app/views/backend/locations/edit.blade.php
@@ -23,7 +23,7 @@
 		@endif
 
 		<div class="pull-right">
-			<a href="{{ route('locations') }}" class="btn btn-small btn-inverse"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+			<a href="{{ route('locations') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
 	</h3>
 </div>
@@ -75,7 +75,7 @@
 	<div class="control-group">
 		<div class="controls">
 			<a class="btn btn-link" href="{{ route('locations') }}">@lang('general.cancel')</a>
-			<button type="submit" class="btn btn-success">@lang('general.save')</button>
+			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 		</div>
 	</div>
 </form>
diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php
index 87ca063d96..769e789c12 100755
--- a/app/views/backend/locations/index.blade.php
+++ b/app/views/backend/locations/index.blade.php
@@ -13,7 +13,7 @@ Asset Depreciations ::
 		Locations
 
 		<div class="pull-right">
-			<a href="{{ route('create/location') }}" class="btn btn-small btn-info"><i class="icon-plus-sign icon-white"></i> Create</a>
+			<a href="{{ route('create/location') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
 		</div>
 	</h3>
 </div>
@@ -38,8 +38,8 @@ Asset Depreciations ::
 			<td>{{ $location->name }}</td>
 			<td>{{ $location->city }}, {{ $location->state }}  {{ $location->country }}  </td>
 			<td>
-				<a href="{{ route('update/location', $location->id) }}" class="btn btn-mini">@lang('button.edit')</a>
-				<a href="{{ route('delete/location', $location->id) }}" class="btn btn-mini btn-danger">@lang('button.delete')</a>
+				<a href="{{ route('update/location', $location->id) }}" class="btn-flat white"> @lang('button.edit')</a>
+				<a href="{{ route('delete/location', $location->id) }}" class="btn-flat danger">@lang('button.delete')</a>
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/manufacturers/edit.blade.php b/app/views/backend/manufacturers/edit.blade.php
index 7409265078..5753efc84b 100755
--- a/app/views/backend/manufacturers/edit.blade.php
+++ b/app/views/backend/manufacturers/edit.blade.php
@@ -21,7 +21,7 @@
 		@endif
 
 		<div class="pull-right">
-			<a href="{{ route('manufacturers') }}" class="btn btn-small btn-inverse"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+			<a href="{{ route('manufacturers') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
 	</h3>
 </div>
@@ -50,7 +50,7 @@
 	<div class="control-group">
 		<div class="controls">
 			<a class="btn btn-link" href="{{ route('manufacturers') }}">@lang('general.cancel')</a>
-			<button type="submit" class="btn btn-success">@lang('general.save')</button>
+			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 		</div>
 	</div>
 </form>
diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php
index 377c390f9b..d595731553 100755
--- a/app/views/backend/manufacturers/index.blade.php
+++ b/app/views/backend/manufacturers/index.blade.php
@@ -13,7 +13,7 @@ Asset Manufacturers ::
 		Asset Manufacturers
 
 		<div class="pull-right">
-			<a href="{{ route('create/manufacturer') }}" class="btn btn-small btn-info"><i class="icon-plus-sign icon-white"></i> Create</a>
+			<a href="{{ route('create/manufacturer') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
 		</div>
 	</h3>
 </div>
@@ -25,19 +25,17 @@ Asset Manufacturers ::
 <table class="table table-bordered table-striped table-hover">
 	<thead>
 		<tr>
-			<th class="span2">@lang('admin/manufacturers/table.id')</th>
-			<th class="span6">@lang('admin/manufacturers/table.title')</th>
+			<th class="span10">@lang('admin/manufacturers/table.title')</th>
 			<th class="span2">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>
 		@foreach ($manufacturers as $manufacturer)
 		<tr>
-			<td>{{ $manufacturer->id }}</td>
 			<td>{{ $manufacturer->name }}</td>
 			<td>
-				<a href="{{ route('update/manufacturer', $manufacturer->id) }}" class="btn btn-mini">@lang('button.edit')</a>
-				<a href="{{ route('delete/manufacturer', $manufacturer->id) }}" class="btn btn-mini btn-danger">@lang('button.delete')</a>
+				<a href="{{ route('update/manufacturer', $manufacturer->id) }}" class="btn-flat white">@lang('button.edit')</a>
+				<a href="{{ route('delete/manufacturer', $manufacturer->id) }}" class="btn-flat danger">@lang('button.delete')</a>
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php
index c0c9852da0..1826d9c8df 100755
--- a/app/views/backend/models/index.blade.php
+++ b/app/views/backend/models/index.blade.php
@@ -26,7 +26,7 @@ Asset Models ::
 			<th class="span6">@lang('admin/models/table.title')</th>
 			<th class="span4">@lang('admin/models/table.modelnumber')</th>
 			<th class="span1">@lang('admin/models/table.numassets')</th>
-			<th class="span2">@lang('admin/models/table.created_at')</th>
+			<th class="span1">@lang('admin/models/table.created_at')</th>
 			<th class="span2">@lang('table.actions')</th>
 		</tr>
 	</thead>
@@ -41,9 +41,9 @@ Asset Models ::
 			<td>{{ $model->modelno }}</td>
 			<td>{{ ($model->assets->count()) }}</td>
 			<td>{{ $model->created_at->diffForHumans() }}</td>
-			<td>
-				<a href="{{ route('update/model', $model->id) }}" class="btn-flat white">@lang('button.edit')</a>
-				<a href="{{ route('delete/model', $model->id) }}" class="btn-flat danger">@lang('button.delete')</a>
+			<td nowrap="nowrap">
+				<a href="{{ route('update/model', $model->id) }}" class="btn-flat white  btn-sm">@lang('button.edit')</a>
+				<a href="{{ route('delete/model', $model->id) }}" class="btn-flat danger  btn-sm">@lang('button.delete')</a>
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/users/create.blade.php b/app/views/backend/users/create.blade.php
index 5639f60b55..bf9fec2478 100755
--- a/app/views/backend/users/create.blade.php
+++ b/app/views/backend/users/create.blade.php
@@ -13,7 +13,7 @@ Create a User ::
 		Create a New User
 
 		<div class="pull-right">
-			<a href="{{ route('users') }}" class="btn btn-small btn-inverse"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+			<a href="{{ route('users') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
 	</h3>
 </div>
@@ -156,10 +156,7 @@ Create a User ::
 	<div class="control-group">
 		<div class="controls">
 			<a class="btn btn-link" href="{{ route('users') }}">Cancel</a>
-
-			<button type="reset" class="btn">Reset</button>
-
-			<button type="submit" class="btn btn-success">Create User</button>
+			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> Create User</button>
 		</div>
 	</div>
 </form>
diff --git a/app/views/backend/users/edit.blade.php b/app/views/backend/users/edit.blade.php
index ba5662ea5d..ff462f09c6 100755
--- a/app/views/backend/users/edit.blade.php
+++ b/app/views/backend/users/edit.blade.php
@@ -13,7 +13,7 @@ User Update ::
 		User Update
 
 		<div class="pull-right">
-			<a href="{{ route('users') }}" class="btn btn-small btn-inverse"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+			<a href="{{ route('users') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
 	</h3>
 </div>
@@ -159,7 +159,7 @@ User Update ::
 
 			<button type="reset" class="btn">Reset</button>
 
-			<button type="submit" class="btn btn-success">@lang('general.save')</button>
+			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 		</div>
 	</div>
 </form>
diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
index 2ec16c6244..154a0d016c 100755
--- a/app/views/backend/users/index.blade.php
+++ b/app/views/backend/users/index.blade.php
@@ -13,7 +13,7 @@ User Management ::
 		User Management
 
 		<div class="pull-right">
-			<a href="{{ route('create/user') }}" class="btn btn-small btn-info"><i class="icon-plus-sign icon-white"></i> Create</a>
+			<a href="{{ route('create/user') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
 		</div>
 	</h3>
 </div>