From 4142629665ed1c235b7d8ceb74d4ea52d57824c4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 28 Nov 2013 19:22:39 -0500
Subject: [PATCH] Layout tweaks for mobile - related to #54

---
 app/routes.php                                |  1 +
 app/views/backend/hardware/checkin.blade.php  |  5 +--
 app/views/backend/hardware/checkout.blade.php | 13 ++++---
 app/views/backend/hardware/clone.blade.php    |  5 +--
 app/views/backend/hardware/edit.blade.php     | 20 +++++-----
 app/views/backend/hardware/index.blade.php    | 14 +++----
 app/views/backend/hardware/view.blade.php     | 37 ++++++++++---------
 app/views/backend/licenses/checkin.blade.php  | 10 ++---
 app/views/backend/licenses/checkout.blade.php |  9 +++--
 app/views/backend/licenses/edit.blade.php     | 17 +++++----
 app/views/backend/licenses/index.blade.php    | 10 ++---
 app/views/backend/licenses/view.blade.php     | 35 +++++++++---------
 app/views/backend/locations/edit.blade.php    |  9 +++--
 app/views/backend/locations/index.blade.php   | 11 +++---
 .../backend/manufacturers/edit.blade.php      |  8 ++--
 .../backend/manufacturers/index.blade.php     | 11 +++---
 app/views/backend/models/edit.blade.php       |  8 ++--
 app/views/backend/models/index.blade.php      |  7 ++--
 app/views/backend/models/view.blade.php       | 22 +++++------
 app/views/backend/reports/index.blade.php     |  6 +--
 app/views/backend/settings/edit.blade.php     |  6 +--
 app/views/backend/settings/index.blade.php    | 12 +++---
 app/views/backend/statuslabels/edit.blade.php |  9 ++---
 .../backend/statuslabels/index.blade.php      |  6 +--
 app/views/backend/users/create.blade.php      |  9 +++--
 app/views/backend/users/edit.blade.php        |  4 +-
 app/views/backend/users/index.blade.php       |  9 +++--
 27 files changed, 159 insertions(+), 154 deletions(-)

diff --git a/app/routes.php b/app/routes.php
index 59db888558d7..71cebb330795 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -18,6 +18,7 @@
 {
 
 	Route::get('/', array('as' => '', 'uses' => 'Controllers\Admin\AssetsController@getIndex'));
+	Route::get('/', array('as' => 'hardware', 'uses' => 'Controllers\Admin\AssetsController@getIndex'));
 	Route::get('create', array('as' => 'create/hardware', 'uses' => 'Controllers\Admin\AssetsController@getCreate'));
 	Route::post('create', 'Controllers\Admin\AssetsController@postCreate');
 	Route::get('{assetId}/edit', array('as' => 'update/hardware', 'uses' => 'Controllers\Admin\AssetsController@getEdit'));
diff --git a/app/views/backend/hardware/checkin.blade.php b/app/views/backend/hardware/checkin.blade.php
index 3eee74af63c7..0985b49ca62d 100644
--- a/app/views/backend/hardware/checkin.blade.php
+++ b/app/views/backend/hardware/checkin.blade.php
@@ -13,13 +13,10 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>
-	Checkin Asset
-
 		<div class="pull-right">
 			<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
-	</h3>
+		<h3> Checkin Asset </h3>
 </div>
 
 <form class="form-horizontal" method="post" action="" autocomplete="off">
diff --git a/app/views/backend/hardware/checkout.blade.php b/app/views/backend/hardware/checkout.blade.php
index d8e4e5ff4e2e..bd7b64bbe01b 100644
--- a/app/views/backend/hardware/checkout.blade.php
+++ b/app/views/backend/hardware/checkout.blade.php
@@ -13,16 +13,17 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
+
+	<div class="pull-right">
+		<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+	</div>
+
 	<h3>
 	@if ($asset->id)
-	Checkout Asset to User
+		Checkout Asset to User
 	@else
-	Create Asset
+		Create Asset
 	@endif
-
-		<div class="pull-right">
-			<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
 	</h3>
 </div>
 
diff --git a/app/views/backend/hardware/clone.blade.php b/app/views/backend/hardware/clone.blade.php
index e56eef5bf4d6..ca51051fe353 100644
--- a/app/views/backend/hardware/clone.blade.php
+++ b/app/views/backend/hardware/clone.blade.php
@@ -9,13 +9,12 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>
-	Clone Asset
 
 		<div class="pull-right">
 			<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
-	</h3>
+
+		<h3>Clone Asset</h3>
 </div>
 
 
diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php
index 0c08bf063dfc..a7bfa51b3324 100755
--- a/app/views/backend/hardware/edit.blade.php
+++ b/app/views/backend/hardware/edit.blade.php
@@ -13,21 +13,23 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
+
+	<div class="pull-right">
+		@if ($asset->id)
+			<a href="{{ route('view/hardware',$asset->id) }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		@else
+			<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		@endif
+	</div>
+
 	<h3>
 	@if ($asset->id)
-	Asset Update
+		Asset Update
 	@else
-	Create Asset
+		Create Asset
 	@endif
 
-		<div class="pull-right">
-			@if ($asset->id)
-			<a href="{{ route('view/hardware',$asset->id) }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-			@else
-			<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-			@endif
 
-		</div>
 	</h3>
 </div>
 
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
index bfbf0a4ce6b3..be6551636f2c 100755
--- a/app/views/backend/hardware/index.blade.php
+++ b/app/views/backend/hardware/index.blade.php
@@ -23,7 +23,11 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>
+		<div class="pull-right">
+			<a href="{{ route('create/hardware') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
+		</div>
+
+		<h3>
 		@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD')  || Input::get('Deployed'))
 			@if (Input::get('Pending'))
 				Pending
@@ -37,14 +41,8 @@
 		@else
 			All
 		@endif
-
 				Assets
-
-		<div class="pull-right">
-			<a href="{{ route('create/hardware') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
-
-		</div>
-	</h3>
+		</h3>
 
 </div>
 
diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php
index 9e21b09c65e0..4d0835086a21 100644
--- a/app/views/backend/hardware/view.blade.php
+++ b/app/views/backend/hardware/view.blade.php
@@ -10,26 +10,29 @@
 @section('content')
 <div id="pad-wrapper" class="user-profile">
                 <!-- header -->
+
+				<div class="btn-group pull-right">
+					<button class="btn glow">Actions</button>
+					<button class="btn glow dropdown-toggle" data-toggle="dropdown">
+						<span class="caret"></span>
+					</button>
+					<ul class="dropdown-menu">
+
+						@if ($asset->status_id == 1)
+							@if ($asset->assigned_to != 0)
+								<li><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat info">Checkin</a></li>
+							@endif
+						@elseif ($asset->status_id == 0)
+								<li><a href="{{ route('checkout/hardware', $asset->id) }}" class="btn-flat success">Checkout</a></li>
+						@endif
+						<li><a href="{{ route('update/hardware', $asset->id) }}">Edit Asset</a></li>
+						<li><a href="{{ route('clone/hardware', $asset->id) }}">Clone Asset</a></li>
+					</ul>
+				</div>
+
 				<h3 class="name">History for {{ $asset->asset_tag }} ({{ $asset->name }})
 
-							<div class="btn-group pull-right">
-                                <button class="btn glow">Actions</button>
-                                <button class="btn glow dropdown-toggle" data-toggle="dropdown">
-                                    <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
 
-									@if ($asset->status_id == 1)
-										@if ($asset->assigned_to != 0)
-											<li><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat info">Checkin</a></li>
-										@endif
-									@elseif ($asset->status_id == 0)
-											<li><a href="{{ route('checkout/hardware', $asset->id) }}" class="btn-flat success">Checkout</a></li>
-									@endif
-                                   	<li><a href="{{ route('update/hardware', $asset->id) }}">Edit Asset</a></li>
-                                    <li><a href="{{ route('clone/hardware', $asset->id) }}">Clone Asset</a></li>
-                                </ul>
-                            </div>
 				</h3>
                 <div class="row-fluid profile">
                     <!-- bio, new note & orders column -->
diff --git a/app/views/backend/licenses/checkin.blade.php b/app/views/backend/licenses/checkin.blade.php
index c60b2d60fab1..d6781b9af121 100644
--- a/app/views/backend/licenses/checkin.blade.php
+++ b/app/views/backend/licenses/checkin.blade.php
@@ -9,12 +9,12 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>Checkin License</h3>
 
-		<div class="pull-right">
-			<a href="{{ route('assets') }}"  class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
-	</h3>
+	<div class="pull-right">
+		<a href="{{ route('licenses') }}"  class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+	</div>
+
+	<h3>Checkin License</h3>
 </div>
 
 
diff --git a/app/views/backend/licenses/checkout.blade.php b/app/views/backend/licenses/checkout.blade.php
index 4422b57633a2..880baffbe430 100644
--- a/app/views/backend/licenses/checkout.blade.php
+++ b/app/views/backend/licenses/checkout.blade.php
@@ -9,12 +9,13 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
+
+	<div class="pull-right">
+		<a href="{{ route('licenses') }}"  class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+	</div>
+
 	<h3>Checkout License to User</h3>
 
-		<div class="pull-right">
-			<a href="{{ route('assets') }}"  class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
-	</h3>
 </div>
 
 <form class="form-horizontal" method="post" action="" autocomplete="off">
diff --git a/app/views/backend/licenses/edit.blade.php b/app/views/backend/licenses/edit.blade.php
index e9f6568d6b6e..17c6c569d202 100755
--- a/app/views/backend/licenses/edit.blade.php
+++ b/app/views/backend/licenses/edit.blade.php
@@ -13,6 +13,15 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
+
+	<div class="pull-right">
+		@if ($license->id)
+			<a href="{{ route('view/license',$license->id) }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		@else
+			<a href="{{ route('licenses') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		@endif
+	</div>
+
 	<h3>
 		@if ($license->id)
 		Update License
@@ -20,13 +29,7 @@
 		Create License
 		@endif
 
-		<div class="pull-right">
-			@if ($license->id)
-			<a href="{{ route('view/license',$license->id) }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-			@else
-			<a href="{{ route('licenses') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-			@endif
-		</div>
+
 	</h3>
 </div>
 
diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php
index e7cd60e56239..1c4a09536218 100755
--- a/app/views/backend/licenses/index.blade.php
+++ b/app/views/backend/licenses/index.blade.php
@@ -8,13 +8,11 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>
-		Software Licenses
+	<div class="pull-right">
+		<a href="{{ route('create/licenses') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
+	</div>
 
-		<div class="pull-right">
-			<a href="{{ route('create/licenses') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
-		</div>
-	</h3>
+	<h3>Software Licenses</h3>
 </div>
 
 <table id="example">
diff --git a/app/views/backend/licenses/view.blade.php b/app/views/backend/licenses/view.blade.php
index 4ee6abf83e31..bd6f0fdfa103 100644
--- a/app/views/backend/licenses/view.blade.php
+++ b/app/views/backend/licenses/view.blade.php
@@ -10,25 +10,24 @@
 @section('content')
 <div id="pad-wrapper" class="user-profile">
                 <!-- header -->
-				<h3 class="name">History for ({{ $license->name }})
 
-
-							<div class="btn-group pull-right">
-                                <button class="btn glow">Actions</button>
-                                <button class="btn glow dropdown-toggle" data-toggle="dropdown">
-                                    <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
-
-                                	@if ($license->assigned_to != 0)
-										<li><a href="{{ route('checkin/license', $license->id) }}" class="btn-flat info">Checkin</a></li>
-									@else
-										<li><a href="{{ route('checkout/license', $license->id) }}" class="btn-flat success">Checkout</a></li>
-									@endif
-                                    <li><a href="{{ route('update/license', $license->id) }}">Edit License</a></li>
-                                </ul>
-                            </div>
-				</h3>
+                <div class="btn-group pull-right">
+					<button class="btn glow">Actions</button>
+					<button class="btn glow dropdown-toggle" data-toggle="dropdown">
+						<span class="caret"></span>
+					</button>
+					<ul class="dropdown-menu">
+
+						@if ($license->assigned_to != 0)
+							<li><a href="{{ route('checkin/license', $license->id) }}" class="btn-flat info">Checkin</a></li>
+						@else
+							<li><a href="{{ route('checkout/license', $license->id) }}" class="btn-flat success">Checkout</a></li>
+						@endif
+						<li><a href="{{ route('update/license', $license->id) }}">Edit License</a></li>
+					</ul>
+				</div>
+
+				<h3 class="name">History for ({{ $license->name }})</h3>
 
                 <div class="row-fluid profile">
                     <!-- bio, new note & orders column -->
diff --git a/app/views/backend/locations/edit.blade.php b/app/views/backend/locations/edit.blade.php
index d7f1c39c8fdc..f43a0923a6c7 100755
--- a/app/views/backend/locations/edit.blade.php
+++ b/app/views/backend/locations/edit.blade.php
@@ -15,6 +15,11 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
+
+	<div class="pull-right">
+		<a href="{{ route('locations') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+	</div>
+
 	<h3>
 		@if ($location->id)
 			Update Location
@@ -22,9 +27,7 @@
 			Create Location
 		@endif
 
-		<div class="pull-right">
-			<a href="{{ route('locations') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
+
 	</h3>
 </div>
 
diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php
index 3032c9420760..9afaf8c75bfe 100755
--- a/app/views/backend/locations/index.blade.php
+++ b/app/views/backend/locations/index.blade.php
@@ -9,13 +9,12 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>
-		Locations
 
-		<div class="pull-right">
-			<a href="{{ route('create/location') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
-		</div>
-	</h3>
+	<div class="pull-right">
+		<a href="{{ route('create/location') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
+	</div>
+
+	<h3>Locations</h3>
 </div>
 
 <div class="row-fluid table">
diff --git a/app/views/backend/manufacturers/edit.blade.php b/app/views/backend/manufacturers/edit.blade.php
index 5753efc84b66..5a1f29cc69a0 100755
--- a/app/views/backend/manufacturers/edit.blade.php
+++ b/app/views/backend/manufacturers/edit.blade.php
@@ -13,6 +13,11 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
+
+	<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>
 		@if ($manufacturer->id)
 		Update Manufacturer
@@ -20,9 +25,6 @@
 			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>
 
diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php
index 80b76d169bca..45ad2d4e45ef 100755
--- a/app/views/backend/manufacturers/index.blade.php
+++ b/app/views/backend/manufacturers/index.blade.php
@@ -9,13 +9,12 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>
-		Asset Manufacturers
 
-		<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>
-	</h3>
+	<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>
+
+	<h3>Asset Manufacturers</h3>
 </div>
 
 
diff --git a/app/views/backend/models/edit.blade.php b/app/views/backend/models/edit.blade.php
index e5456361de39..d679f63e227f 100755
--- a/app/views/backend/models/edit.blade.php
+++ b/app/views/backend/models/edit.blade.php
@@ -13,16 +13,16 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
+	<div class="pull-right">
+		<a href="{{ route('models') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+	</div>
+
 	<h3>
 		@if ($model->id)
 		Update Model
 		@else
 			Create New Model
 		@endif
-
-		<div class="pull-right">
-			<a href="{{ route('models') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
 	</h3>
 </div>
 
diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php
index 2c4e7164d280..1efaef40c227 100755
--- a/app/views/backend/models/index.blade.php
+++ b/app/views/backend/models/index.blade.php
@@ -9,13 +9,12 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>
-		Asset Models
 
-		<div class="pull-right">
+	<div class="pull-right">
 			<a href="{{ route('create/model') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
 		</div>
-	</h3>
+
+	<h3>Asset Models</h3>
 </div>
 
 <table id="example">
diff --git a/app/views/backend/models/view.blade.php b/app/views/backend/models/view.blade.php
index a3e03abf11c9..8492fd7359d3 100644
--- a/app/views/backend/models/view.blade.php
+++ b/app/views/backend/models/view.blade.php
@@ -10,17 +10,17 @@
 @section('content')
 <div id="pad-wrapper" class="user-profile">
                 <!-- header -->
-				<h3 class="name">History for {{ $model->name }}
-					<div class="btn-group pull-right">
-						<button class="btn glow">Actions</button>
-						<button class="btn glow dropdown-toggle" data-toggle="dropdown">
-							<span class="caret"></span>
-						</button>
-						<ul class="dropdown-menu">
-							<li><a href="{{ route('update/model', $model->id) }}">Edit Asset</a></li>
-						</ul>
-					</div>
-				</h3>
+                <div class="btn-group pull-right">
+					<button class="btn glow">Actions</button>
+					<button class="btn glow dropdown-toggle" data-toggle="dropdown">
+						<span class="caret"></span>
+					</button>
+					<ul class="dropdown-menu">
+						<li><a href="{{ route('update/model', $model->id) }}">Edit Asset</a></li>
+					</ul>
+				</div>
+
+				<h3 class="name">History for {{ $model->name }} </h3>
 
 
                 <div class="row-fluid profile">
diff --git a/app/views/backend/reports/index.blade.php b/app/views/backend/reports/index.blade.php
index abd73c30b022..f7cf766deac6 100644
--- a/app/views/backend/reports/index.blade.php
+++ b/app/views/backend/reports/index.blade.php
@@ -11,10 +11,8 @@
 
 
 <div class="page-header">
-	<h3>
-		Depreciation Report
 
-		<div class="pull-right">
+	<div class="pull-right">
 			<div class="btn-group settings">
 				<button class="btn glow"><i class="icon-download-alt"></i></button>
 				<button class="btn glow dropdown-toggle" data-toggle="dropdown">
@@ -27,7 +25,7 @@
 			</div>
 		</div>
 
-	</h3>
+	<h3>Depreciation Report</h3>
 </div>
 
 
diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php
index 253ae89197ec..69609105726a 100755
--- a/app/views/backend/settings/edit.blade.php
+++ b/app/views/backend/settings/edit.blade.php
@@ -10,12 +10,12 @@
 @section('content')
 <div id="pad-wrapper" class="user-profile">
                 <!-- header -->
-				<h3 class="name">Update Settings
-				<div class="pull-right">
+
+                <div class="pull-right">
 					<a href="{{ route('app') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 				</div>
 
-				</h3>
+				<h3 class="name">Update Settings</h3>
 
 
                 <div class="row-fluid profile">
diff --git a/app/views/backend/settings/index.blade.php b/app/views/backend/settings/index.blade.php
index 7c8cb8cef9e0..83b05b651e9c 100755
--- a/app/views/backend/settings/index.blade.php
+++ b/app/views/backend/settings/index.blade.php
@@ -10,11 +10,13 @@
 @section('content')
 <div id="pad-wrapper" class="user-profile">
                 <!-- header -->
-				<h3 class="name">Settings
-						<div class="pull-right">
-							 <a href="{{ route('edit/settings') }}" class="btn-flat white"> @lang('button.edit') Settings</a>
-						</div>
-		</h3>
+
+                <div class="pull-right">
+					 <a href="{{ route('edit/settings') }}" class="btn-flat white"> @lang('button.edit') Settings</a>
+				</div>
+
+
+				<h3 class="name">Settings</h3>
 
 
                 <div class="row-fluid profile">
diff --git a/app/views/backend/statuslabels/edit.blade.php b/app/views/backend/statuslabels/edit.blade.php
index 3410ced6d732..8ad60e5634f4 100755
--- a/app/views/backend/statuslabels/edit.blade.php
+++ b/app/views/backend/statuslabels/edit.blade.php
@@ -14,17 +14,16 @@
 @section('content')
 <div id="pad-wrapper" class="user-profile">
                 <!-- header -->
+                <div class="pull-right">
+					<a href="{{ route('statuslabels') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+				</div>
+
 				<h3 class="name">
 					@if ($statuslabel->id)
 						Update Status Label
 					@else
 						Create New Status Label
 					@endif
-
-				<div class="pull-right">
-					<a href="{{ route('statuslabels') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-				</div>
-
 				</h3>
 
 
diff --git a/app/views/backend/statuslabels/index.blade.php b/app/views/backend/statuslabels/index.blade.php
index 9284a0883c45..d50d5f41a833 100755
--- a/app/views/backend/statuslabels/index.blade.php
+++ b/app/views/backend/statuslabels/index.blade.php
@@ -10,11 +10,11 @@
 @section('content')
 <div id="pad-wrapper" class="user-profile">
                 <!-- header -->
-				<h3 class="name">Status Labels
-				<div class="pull-right">
+                <div class="pull-right">
 					<a href="{{ route('create/statuslabel') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i>  Create New</a>
 				</div>
-		</h3>
+
+				<h3 class="name">Status Labels</h3>
 
 
                 <div class="row-fluid profile">
diff --git a/app/views/backend/users/create.blade.php b/app/views/backend/users/create.blade.php
index 3b603d13fe9e..0e8ed78fdf1c 100755
--- a/app/views/backend/users/create.blade.php
+++ b/app/views/backend/users/create.blade.php
@@ -9,12 +9,13 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
+
+	<div class="pull-right">
+		<a href="{{ route('users') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+	</div>
+
 	<h3>
 		Create a New User
-
-		<div class="pull-right">
-			<a href="{{ route('users') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
 	</h3>
 </div>
 
diff --git a/app/views/backend/users/edit.blade.php b/app/views/backend/users/edit.blade.php
index 36f3638d00b4..8d84d7ddf8b4 100755
--- a/app/views/backend/users/edit.blade.php
+++ b/app/views/backend/users/edit.blade.php
@@ -9,12 +9,12 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>
-		Update User {{ $user->fullName() }}
 
 		<div class="pull-right">
 			<a href="{{ route('users') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
+	<h3>
+		Update User {{ $user->fullName() }}
 	</h3>
 </div>
 
diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
index 0ce04d198156..75e9a3ba06c2 100755
--- a/app/views/backend/users/index.blade.php
+++ b/app/views/backend/users/index.blade.php
@@ -9,12 +9,13 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
+
+	<div class="pull-right">
+		<a href="{{ route('create/user') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
+	</div>
+
 	<h3>
 		User Management
-
-		<div class="pull-right">
-			<a href="{{ route('create/user') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
-		</div>
 	</h3>
 </div>