diff --git a/app/views/backend/categories/edit.blade.php b/app/views/backend/categories/edit.blade.php
index 8a8ab51615..f9a44db43c 100755
--- a/app/views/backend/categories/edit.blade.php
+++ b/app/views/backend/categories/edit.blade.php
@@ -39,7 +39,7 @@
 						<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
 							<label for="name" class="col-md-2 control-label">@lang('admin/categories/general.category_name')</label>
 								<div class="col-md-7">
-									<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $category->name) }}" />
+									<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>
diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php
index e720c5cca2..fdcc58b95c 100755
--- a/app/views/backend/categories/index.blade.php
+++ b/app/views/backend/categories/index.blade.php
@@ -30,12 +30,12 @@
 		<tbody>
 			@foreach ($categories as $category)
 			<tr>
-				<td>{{ $category->name }}</td>
+				<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="@lang('admin/categories/message.delete.confirm')"
 data-title="@lang('general.delete')
-{{ htmlspecialchars($category->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
+{{{ htmlspecialchars($category->name) }}}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
 
 				</td>
 			</tr>
diff --git a/app/views/backend/depreciations/edit.blade.php b/app/views/backend/depreciations/edit.blade.php
index 0cef364a1a..3edfa05d71 100755
--- a/app/views/backend/depreciations/edit.blade.php
+++ b/app/views/backend/depreciations/edit.blade.php
@@ -37,7 +37,7 @@
 			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
 				<label for="name" class="col-md-4 control-label">@lang('admin/depreciations/general.depreciation_name')</label>
 					<div class="col-md-6">
-						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $depreciation->name) }}" />
+						<input class="form-control" type="text" name="name" id="name" value="{{{ Input::old('name', $depreciation->name) }}}" />
 						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
 			</div>
@@ -46,7 +46,7 @@
 			<div class="form-group {{ $errors->has('months') ? ' has-error' : '' }}">
 				<label for="months" class="col-md-4 control-label">@lang('admin/depreciations/general.number_of_months')</label>
 					<div class="col-md-1">
-						<input class="form-control" type="text" name="months" id="months" value="{{ Input::old('name', $depreciation->months) }}" />
+						<input class="form-control" type="text" name="months" id="months" value="{{{ Input::old('name', $depreciation->months) }}}" />
 						{{ $errors->first('months', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
 			</div>
diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php
index 84b1436956..acde7ea32c 100755
--- a/app/views/backend/depreciations/index.blade.php
+++ b/app/views/backend/depreciations/index.blade.php
@@ -37,7 +37,7 @@ Asset Depreciations ::
 								<a href="{{ route('update/depreciations', $depreciation->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/depreciations', $depreciation->id) }}" data-content="@lang('admin/depreciations/message.delete.confirm')"
 data-title="@lang('general.delete')
- {{ htmlspecialchars($depreciation->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
+ {{{ htmlspecialchars($depreciation->name) }}}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
 
 
 								</td>
diff --git a/app/views/backend/groups/create.blade.php b/app/views/backend/groups/create.blade.php
index 0263939467..a6e2056097 100755
--- a/app/views/backend/groups/create.blade.php
+++ b/app/views/backend/groups/create.blade.php
@@ -28,7 +28,7 @@
 			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
 				<label for="name" class="col-md-2 control-label">@lang('admin/groups/titles.group_name')</label>
 					<div class="col-md-6">
-						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name') }}" />
+						<input class="form-control" type="text" name="name" id="name" value="{{{ Input::old('name') }}}" />
 						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
 			</div>
@@ -43,14 +43,14 @@
 						@foreach ($permissions as $permission)
 
 						<div class="field-box">
-                            <label for="name" class="col-md-2 control-label">{{ $permission['label'] }}</label>
+                            <label for="name" class="col-md-2 control-label">{{{ $permission['label'] }}}</label>
                             <div class="col-md-8">
                                 <label class="radio-inline">
-                                    <input type="radio" value="1" id="{{ $permission['permission'] }}_allow" name="permissions[{{ $permission['permission'] }}]"{{ (array_get($selectedPermissions, $permission['permission']) === 1 ? ' checked="checked"' : '') }}> @lang('admin/groups/titles.allow')
+                                    <input type="radio" value="1" id="{{{ $permission['permission'] }}}_allow" name="permissions[{{{ $permission['permission'] }}}]"{{ (array_get($selectedPermissions, $permission['permission']) === 1 ? ' checked="checked"' : '') }}> @lang('admin/groups/titles.allow')
                                 </label>
 
                                 <label class="radio-inline">
-                                    <input type="radio" value="0" id="{{ $permission['permission'] }}_deny" name="permissions[{{ $permission['permission'] }}]"{{ ( ! array_get($selectedPermissions, $permission['permission']) ? ' checked="checked"' : '') }}> @lang('admin/groups/titles.deny')
+                                    <input type="radio" value="0" id="{{{ $permission['permission'] }}}_deny" name="permissions[{{{ $permission['permission'] }}}]"{{ ( ! array_get($selectedPermissions, $permission['permission']) ? ' checked="checked"' : '') }}> @lang('admin/groups/titles.deny')
                                 </label>
                             </div>
                         </div>
diff --git a/app/views/backend/groups/edit.blade.php b/app/views/backend/groups/edit.blade.php
index e373d76a03..4a7d097917 100755
--- a/app/views/backend/groups/edit.blade.php
+++ b/app/views/backend/groups/edit.blade.php
@@ -28,7 +28,7 @@
 			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
 				<label for="name" class="col-md-2 control-label">@lang('admin/groups/titles.group_name')</label>
 					<div class="col-md-6">
-						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $group->name) }}" />
+						<input class="form-control" type="text" name="name" id="name" value="{{{ Input::old('name', $group->name) }}}" />
 						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
 			</div>
@@ -40,14 +40,14 @@
 
 						@foreach ($permissions as $permission)
 						<div class="field-box">
-                            <label for="name" class="col-md-2 control-label">{{ $permission['label'] }}</label>
+                            <label for="name" class="col-md-2 control-label">{{{ $permission['label'] }}}</label>
                             <div class="col-md-8">
                                 <label class="radio-inline">
-                                    <input type="radio" value="1" id="{{ $permission['permission'] }}_allow" name="permissions[{{ $permission['permission'] }}]"{{ (array_get($groupPermissions, $permission['permission']) === 1 ? ' checked="checked"' : '') }}> @lang('admin/groups/titles.allow')
+                                    <input type="radio" value="1" id="{{{ $permission['permission'] }}}_allow" name="permissions[{{{ $permission['permission'] }}}]"{{ (array_get($groupPermissions, $permission['permission']) === 1 ? ' checked="checked"' : '') }}> @lang('admin/groups/titles.allow')
                                 </label>
 
                                 <label class="radio-inline">
-                                    <input type="radio" value="0" id="{{ $permission['permission'] }}_deny" name="permissions[{{ $permission['permission'] }}]"{{ ( ! array_get($groupPermissions, $permission['permission']) ? ' checked="checked"' : '') }}> @lang('admin/groups/titles.deny')
+                                    <input type="radio" value="0" id="{{{ $permission['permission'] }}}_deny" name="permissions[{{{ $permission['permission'] }}}]"{{ ( ! array_get($groupPermissions, $permission['permission']) ? ' checked="checked"' : '') }}> @lang('admin/groups/titles.deny')
                                 </label>
                             </div>
                         </div>
diff --git a/app/views/backend/hardware/checkin.blade.php b/app/views/backend/hardware/checkin.blade.php
index 49bd8d2fbe..771dbb9ada 100644
--- a/app/views/backend/hardware/checkin.blade.php
+++ b/app/views/backend/hardware/checkin.blade.php
@@ -28,7 +28,7 @@
 			<div class="form-group">
 			<label class="col-sm-2 control-label">@lang('admin/hardware/form.tag')</label>
 				<div class="col-md-6">
-				  <p class="form-control-static">{{ $asset->asset_tag }}</p>
+				  <p class="form-control-static">{{{ $asset->asset_tag }}}</p>
 				</div>
 		  	</div>
 
@@ -36,14 +36,14 @@
 		  	<div class="form-group">
 			<label class="col-sm-2 control-label">@lang('admin/hardware/form.name')</label>
 				<div class="col-md-6">
-				  <p class="form-control-static">{{ $asset->name }}</p>
+				  <p class="form-control-static">{{{ $asset->name }}}</p>
 				</div>
 		  	</div>
 			<!-- Note -->
 			<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
 				<label for="note" class="col-md-2 control-label">@lang('admin/hardware/form.notes')</label>
 				<div class="col-md-7">
-					<input class="col-md-6 form-control" type="text" name="note" id="note" value="{{ Input::old('note', $asset->note) }}" />
+					<input class="col-md-6 form-control" type="text" name="note" id="note" value="{{{ Input::old('note', $asset->note) }}}" />
 					{{ $errors->first('note', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
diff --git a/app/views/backend/hardware/checkout.blade.php b/app/views/backend/hardware/checkout.blade.php
index 44dc59c6a6..0b41d73cae 100644
--- a/app/views/backend/hardware/checkout.blade.php
+++ b/app/views/backend/hardware/checkout.blade.php
@@ -29,7 +29,7 @@
 			<div class="form-group">
 			<label class="col-sm-2 control-label">@lang('admin/hardware/form.tag')</label>
 				<div class="col-md-6">
-				  <p class="form-control-static">{{ $asset->asset_tag }}</p>
+				  <p class="form-control-static">{{{ $asset->asset_tag }}}</p>
 				</div>
 		  	</div>
 
@@ -37,7 +37,7 @@
 		  	<div class="form-group">
 			<label class="col-sm-2 control-label">@lang('admin/hardware/form.name')</label>
 				<div class="col-md-6">
-				  <p class="form-control-static">{{ $asset->name }}</p>
+				  <p class="form-control-static">{{{ $asset->name }}}</p>
 				</div>
 		  	</div>
 			<!-- User -->
@@ -54,7 +54,7 @@
 			<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
 				<label for="note" class="col-md-2 control-label">@lang('admin/hardware/form.notes')</label>
 				<div class="col-md-7">
-					<input class="col-md-6 form-control" type="text" name="note" id="note" value="{{ Input::old('note', $asset->note) }}" />
+					<input class="col-md-6 form-control" type="text" name="note" id="note" value="{{{ Input::old('note', $asset->note) }}}" />
 					{{ $errors->first('note', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
diff --git a/app/views/backend/hardware/clone.blade.php b/app/views/backend/hardware/clone.blade.php
index 4cac405d89..9da76e20ba 100644
--- a/app/views/backend/hardware/clone.blade.php
+++ b/app/views/backend/hardware/clone.blade.php
@@ -26,7 +26,7 @@
 			<div class="form-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
 				<label class="control-label" for="asset_tag">@lang('admin/hardware/form.tag')</label>
 				<div class="controls">
-					<input class="col-md-4" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag') }}" />
+					<input class="col-md-4" type="text" name="asset_tag" id="asset_tag" value="{{{ Input::old('asset_tag') }}}" />
 					{{ $errors->first('asset_tag', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
@@ -34,7 +34,7 @@
 			<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
 				<label class="control-label" for="name">@lang('admin/hardware/form.name')</label>
 				<div class="controls">
-					<input class="col-md-4" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
+					<input class="col-md-4" type="text" name="name" id="name" value="{{{ Input::old('name', $asset->name) }}}" />
 					{{ $errors->first('name', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
@@ -44,7 +44,7 @@
 			<div class="form-group {{ $errors->has('serial') ? 'error' : '' }}">
 				<label class="control-label" for="serial">@lang('admin/hardware/form.serial')</label>
 				<div class="controls">
-					<input class="col-md-4" type="text" name="serial" id="serial" value="{{ Input::old('serial', $asset->serial) }}" />
+					<input class="col-md-4" type="text" name="serial" id="serial" value="{{{ Input::old('serial', $asset->serial) }}}" />
 					{{ $errors->first('serial', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
@@ -53,7 +53,7 @@
 			<div class="form-group {{ $errors->has('order_number') ? 'error' : '' }}">
 				<label class="control-label" for="order_number">@lang('admin/hardware/form.order')</label>
 				<div class="controls">
-					<input class="col-md-4" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $asset->order_number) }}" />
+					<input class="col-md-4" type="text" name="order_number" id="order_number" value="{{{ Input::old('order_number', $asset->order_number) }}}" />
 					{{ $errors->first('order_number', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
@@ -71,7 +71,7 @@
 			<div class="form-group input-append {{ $errors->has('purchase_date') ? 'error' : '' }}" >
 				<label class="control-label" for="purchase_date">@lang('admin/hardware/form.date')</label>
 				<div class="controls">
-				<input type="text" class="datepicker span2" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', $asset->purchase_date) }}">
+				<input type="text" class="datepicker span2" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{{ Input::old('purchase_date', $asset->purchase_date) }}}">
 				{{ $errors->first('purchase_date', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 
 				</div>
@@ -83,7 +83,7 @@
 				<div class="controls">
 				<div class="input-prepend">
 					<span class="add-on">$</span>
-					<input class="col-md-2" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', $asset->purchase_cost) }}" />
+					<input class="col-md-2" type="text" name="purchase_cost" id="purchase_cost" value="{{{ Input::old('purchase_cost', $asset->purchase_cost) }}}" />
 					{{ $errors->first('purchase_cost', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 				 </div>
@@ -93,7 +93,7 @@
 			<div class="form-group {{ $errors->has('warranty_months') ? 'error' : '' }}">
 				<label class="control-label" for="serial">@lang('admin/hardware/form.warranty')</label>
 				<div class="controls">
-					<input class="col-md-1" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months', $asset->warranty_months) }}" />
+					<input class="col-md-1" type="text" name="warranty_months" id="warranty_months" value="{{{ Input::old('warranty_months', $asset->warranty_months) }}}" />
 					@lang('admin/hardware/form.months')
 					{{ $errors->first('warranty_months', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
@@ -126,7 +126,7 @@
 			<div class="form-group {{ $errors->has('notes') ? 'error' : '' }}">
 				<label class="control-label" for="notes">@lang('admin/hardware/form.notes')</label>
 				<div class="controls">
-					<input class="col-md-6" type="text" name="notes" id="notes" value="{{ Input::old('notes', $asset->notes) }}" />
+					<input class="col-md-6" type="text" name="notes" id="notes" value="{{{ Input::old('notes', $asset->notes) }}}" />
 					{{ $errors->first('notes', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php
index e034b3dcbe..2820aeca13 100755
--- a/app/views/backend/hardware/edit.blade.php
+++ b/app/views/backend/hardware/edit.blade.php
@@ -39,7 +39,7 @@
 			<div class="form-group {{ $errors->has('asset_tag') ? ' has-error' : '' }}">
 				<label for="asset_tag" class="col-md-2 control-label">@lang('admin/hardware/form.tag')</label>
 					<div class="col-md-7">
-						<input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', $asset->asset_tag) }}" />
+						<input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{{ Input::old('asset_tag', $asset->asset_tag) }}}" />
 						{{ $errors->first('asset_tag', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
 			</div>
@@ -48,7 +48,7 @@
 			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
 				<label for="name" class="col-md-2 control-label">@lang('admin/hardware/form.name')</label>
 					<div class="col-md-7">
-						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
+						<input class="form-control" type="text" name="name" id="name" value="{{{ Input::old('name', $asset->name) }}}" />
 						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
 			</div>
@@ -56,7 +56,7 @@
 			<div class="form-group {{ $errors->has('serial') ? ' has-error' : '' }}">
 				<label for="serial" class="col-md-2 control-label">@lang('admin/hardware/form.serial')</label>
 				<div class="col-md-7">
-					<input class="form-control" type="text" name="serial" id="serial" value="{{ Input::old('serial', $asset->serial) }}" />
+					<input class="form-control" type="text" name="serial" id="serial" value="{{{ Input::old('serial', $asset->serial) }}}" />
 					{{ $errors->first('serial', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
@@ -65,7 +65,7 @@
 			<div class="form-group {{ $errors->has('order_number') ? ' has-error' : '' }}">
 				<label for="order_number" class="col-md-2 control-label">@lang('admin/hardware/form.order')</label>
 				<div class="col-md-7">
-					<input class="form-control" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $asset->order_number) }}" />
+					<input class="form-control" type="text" name="order_number" id="order_number" value="{{{ Input::old('order_number', $asset->order_number) }}}" />
 					{{ $errors->first('order_number', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
@@ -82,8 +82,8 @@
 			<!-- Purchase Date -->
 			<div class="form-group {{ $errors->has('purchase_date') ? ' has-error' : '' }}">
 				<label for="purchase_date" class="col-md-2 control-label">@lang('admin/hardware/form.date')</label>
-				<div class="input-group col-md-2">
-					<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', $asset->purchase_date) }}">
+				<div class="input-group col-md-3">
+					<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{{ Input::old('purchase_date', $asset->purchase_date) }}}">
 					<span class="input-group-addon"><i class="icon-calendar"></i></span>
 				{{ $errors->first('purchase_date', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
@@ -95,7 +95,7 @@
 				<div class="col-md-2">
 					<div class="input-group">
 						<span class="input-group-addon">@lang('general.currency')</span>
-						<input class="col-md-2 form-control" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', $asset->purchase_cost) }}" />
+						<input class="col-md-2 form-control" type="text" name="purchase_cost" id="purchase_cost" value="{{{ Input::old('purchase_cost', $asset->purchase_cost) }}}" />
 						{{ $errors->first('purchase_cost', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					 </div>
 				 </div>
@@ -106,7 +106,7 @@
 				<label for="warranty_months" class="col-md-2 control-label">@lang('admin/hardware/form.warranty')</label>
 				<div class="col-md-2">
 					<div class="input-group">
-					<input class="col-md-2 form-control" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months', $asset->warranty_months) }}" />   <span class="input-group-addon">@lang('admin/hardware/form.months')</span>
+					<input class="col-md-2 form-control" type="text" name="warranty_months" id="warranty_months" value="{{{ Input::old('warranty_months', $asset->warranty_months) }}}" />   <span class="input-group-addon">@lang('admin/hardware/form.months')</span>
 					{{ $errors->first('warranty_months', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
 				</div>
@@ -125,7 +125,7 @@
 			<div class="form-group {{ $errors->has('notes') ? ' has-error' : '' }}">
 				<label for="notes" class="col-md-2 control-label">@lang('admin/hardware/form.notes')</label>
 				<div class="col-md-7">
-					<input class="col-md-6 form-control" type="text" name="notes" id="notes" value="{{ Input::old('notes', $asset->notes) }}" />
+					<input class="col-md-6 form-control" type="text" name="notes" id="notes" value="{{{ Input::old('notes', $asset->notes) }}}" />
 					{{ $errors->first('notes', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
index 9c24f4ec49..b464dd7a24 100755
--- a/app/views/backend/hardware/index.blade.php
+++ b/app/views/backend/hardware/index.blade.php
@@ -77,7 +77,7 @@
 						@lang('general.ready_to_deploy')
 					@elseif (Input::get('Undeployable'))
 						@if ($asset->assetstatus)
-						{{ $asset->assetstatus->name }}
+						{{{ $asset->assetstatus->name }}}
 						@endif
                     @endif
 				</td>
@@ -85,16 +85,16 @@
 				<td>
 				@if ($asset->assigneduser)
 					<a href="{{ route('view/user', $asset->assigned_to) }}">
-					{{ $asset->assigneduser->fullName() }}
+					{{{ $asset->assigneduser->fullName() }}}
 					</a>
 				@endif
 				</td>
 				<td>
 				@if ($asset->assigneduser && $asset->assetloc)
-						{{ $asset->assetloc->name }}
+						{{{ $asset->assetloc->name }}}
 				@else
 					@if ($asset->assetstatus)
-						{{ $asset->assetstatus->name }}
+						{{{ $asset->assetstatus->name }}}
 					@endif
 				@endif
 				</td>
@@ -103,7 +103,7 @@
 
 			<td>
 			@if ($asset->model->eol)
-				{{ $asset->eol_date() }}
+				{{{ $asset->eol_date() }}}
 			@endif
 			</td>
 
diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php
index 599889c327..d407bb6f9e 100644
--- a/app/views/backend/hardware/view.blade.php
+++ b/app/views/backend/hardware/view.blade.php
@@ -31,11 +31,10 @@
 		</div>
 		<h3>
 		<h3 class="name">
-		@lang('admin/hardware/general.view') {{ $asset->asset_tag }}
-
-		{{ $asset->asset_tag }}
+		@lang('admin/hardware/general.view')
+		{{{ $asset->asset_tag }}}
 		@if ($asset->name)
-		({{ $asset->name }})
+		({{{ $asset->name }}})
 		@endif
 	</h3>
 	</div>
@@ -49,49 +48,49 @@
 
 		@if ($asset->model->manufacturer)
 			<div class="col-md-6"><strong>@lang('admin/hardware/form.manufacturer'): </strong>
-			{{ $asset->model->manufacturer->name }} </div>
+			{{{ $asset->model->manufacturer->name }}} </div>
 			<div class="col-md-6"><strong>@lang('admin/hardware/form.model'):</strong>
-			{{ $asset->model->name }} / {{ $asset->model->modelno }}</div>
+			{{{ $asset->model->name }}} / {{{ $asset->model->modelno }}}</div>
 		@endif
 
 		@if ($asset->purchase_date)
 			<div class="col-md-6"><strong>@lang('admin/hardware/form.date'): </strong>
-			{{ $asset->purchase_date }} </div>
+			{{{ $asset->purchase_date }}} </div>
 		@endif
 
 		@if ($asset->purchase_cost)
 			<div class="col-md-6"><strong>@lang('admin/hardware/form.cost'):</strong>
 			@lang('general.currency')
-			{{ number_format($asset->purchase_cost,2) }} </div>
+			{{{ number_format($asset->purchase_cost,2) }}} </div>
 		@endif
 
 		@if ($asset->order_number)
 			<div class="col-md-6"><strong>@lang('admin/hardware/form.order'):</strong>
-			{{ $asset->order_number }} </div>
+			{{{ $asset->order_number }}} </div>
 		@endif
 
 		@if ($asset->warranty_months)
 			<div class="col-md-6"><strong>@lang('admin/hardware/form.warranty'):</strong>
-			{{ $asset->warranty_months }}
+			{{{ $asset->warranty_months }}}
 			@lang('admin/hardware/form.months')
 			</div>
 			<div class="col-md-6"><strong>@lang('admin/hardware/form.expires'):</strong>
-			{{ $asset->warrantee_expires() }}</div>
+			{{{ $asset->warrantee_expires() }}}</div>
 		@endif
 
 		@if ($asset->depreciation)
 			<div class="col-md-6"><strong>@lang('admin/hardware/form.depreciation'): </strong>
 			{{ $asset->depreciation->name }}
-				({{ $asset->depreciation->months }}
+				({{{ $asset->depreciation->months }}}
 				@lang('admin/hardware/form.months')
 				)</div>
 			<div class="col-md-6"><strong>@lang('admin/hardware/form.depreciates_on'): </strong>
-			{{ $asset->depreciated_date() }} </div>
+			{{{ $asset->depreciated_date() }}} </div>
 			<div class="col-md-6"><strong>@lang('admin/hardware/form.fully_depreciated'): </strong>
-			{{ $asset->months_until_depreciated()->m }}
+			{{{ $asset->months_until_depreciated()->m }}}
 			@lang('admin/hardware/form.months')
 			 @if ($asset->months_until_depreciated()->y > 0)
-				, {{ $asset->months_until_depreciated()->y }}
+				, {{{ $asset->months_until_depreciated()->y }}}
 				@lang('admin/hardware/form.years')
 			 @endif
 			 </div>
@@ -99,18 +98,18 @@
 
 		@if ($asset->model->eol)
 			<div class="col-md-6"><strong>@lang('admin/hardware/form.eol_rate'): </strong>
-			{{ $asset->model->eol }}
+			{{{ $asset->model->eol }}}
 			@lang('admin/hardware/form.months') </div>
 			<div class="col-md-6"><strong>@lang('admin/hardware/form.eol_date'): </strong>
-			{{ $asset->eol_date() }}
+			{{{ $asset->eol_date() }}}
 			@if ($asset->months_until_eol())
 				 (
 				 @if ($asset->months_until_eol()->y > 0)
-				 {{ $asset->months_until_eol()->y }}
+				 {{{ $asset->months_until_eol()->y }}}
 				  @lang('general.years'),
 				 @endif
 
-				{{ $asset->months_until_eol()->m }}
+				{{{ $asset->months_until_eol()->m }}}
 				@lang('general.months')
 				)
 			@endif
@@ -142,23 +141,23 @@
 					<i class="icon-star"></i>
 					@endif
 					</td>
-					<td>{{ $log->added_on }}</td>
+					<td>{{{ $log->added_on }}}</td>
 					<td>
 						@if (isset($log->user_id))
-						{{ $log->adminlog->fullName() }}
+						{{{ $log->adminlog->fullName() }}}
 						@endif
 					</td>
 					<td>{{ $log->action_type }}</td>
 					<td>
 						@if (isset($log->checkedout_to))
 						<a href="{{ route('view/user', $log->checkedout_to) }}">
-						{{ $log->userlog->fullName() }}
+						{{{ $log->userlog->fullName() }}}
 						</a>
 						@endif
 					</td>
 					<td>
 						@if ($log->note)
-						{{ $log->note }}
+						{{{ $log->note }}}
 						@endif
 					</td>
 				</tr>
@@ -169,7 +168,7 @@
 					<td>{{ $asset->created_at }}</td>
 					<td>
 					@if ($asset->adminuser->id)
-					{{ $asset->adminuser->fullName() }}
+					{{{ $asset->adminuser->fullName() }}}
 					@else
 					@lang('general.unknown_admin')
 					@endif
@@ -190,7 +189,7 @@
 			@if ($qr_code->display)
 			<h6>@lang('admin/hardware/form.qr')</h6>
 			<p>
-				<img src="{{ $qr_code->url }}" />
+				<img src="{{{ $qr_code->url }}}" />
 			</p>
 			@endif
 
@@ -198,28 +197,28 @@
 				<h6><br>@lang('admin/hardware/form.checkedout_to')</h6>
 				<ul>
 
-					<li><img src="{{ $asset->assigneduser->gravatar() }}" class="img-circle" style="width: 100px; margin-right: 20px;" /><br /><br /></li>
+					<li><img src="{{{ $asset->assigneduser->gravatar() }}}" class="img-circle" style="width: 100px; margin-right: 20px;" /><br /><br /></li>
 					<li><a href="{{ route('view/user', $asset->assigned_to) }}">{{ $asset->assigneduser->fullName() }}</a></li>
 
 
 					@if (isset($asset->assetloc->address))
-						<li>{{ $asset->assetloc->address }}
+						<li>{{{ $asset->assetloc->address }}}
 						@if (isset($asset->assetloc->address2))
-							{{ $asset->assetloc->address2 }}
+							{{{ $asset->assetloc->address2 }}}
 						@endif
 						</li>
 						@if (isset($asset->assetloc->city))
-							<li>{{ $asset->assetloc->city }}, {{ $asset->assetloc->state }} {{ $asset->assetloc->zip }}</li>
+							<li>{{{ $asset->assetloc->city }}}, {{{ $asset->assetloc->state }}} {{{ $asset->assetloc->zip }}}</li>
 						@endif
 
 					@endif
 
 					@if (isset($asset->assigneduser->email))
-						<li><br /><i class="icon-envelope-alt"></i> <a href="mailto:{{ $asset->assigneduser->email }}">{{ $asset->assigneduser->email }}</a></li>
+						<li><br /><i class="icon-envelope-alt"></i> <a href="mailto:{{{ $asset->assigneduser->email }}}">{{{ $asset->assigneduser->email }}}</a></li>
 					@endif
 
-					@if (isset($asset->assigneduser->phone))
-						<li><i class="icon-phone"></i> {{ $asset->assigneduser->phone }}</li>
+					@if ((isset($asset->assigneduser->phone)) && ($asset->assigneduser->phone!=''))
+						<li><i class="icon-phone"></i> {{{ $asset->assigneduser->phone }}}</li>
 					@endif
 
 					<li><br /><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat large info ">@lang('admin/hardware/general.checkin')</a></li>
@@ -228,7 +227,7 @@
 			@elseif (($asset->status_id ) && ($asset->status_id > 1))
 
 				@if ($asset->assetstatus)
-					<h6><br>{{ $asset->assetstatus->name }}
+					<h6><br>{{{ $asset->assetstatus->name }}}
 					@lang('admin/hardware/general.asset')</h6>
 
 					<div class="col-md-12">
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php
index 91b6931fb0..0734588759 100755
--- a/app/views/backend/layouts/default.blade.php
+++ b/app/views/backend/layouts/default.blade.php
@@ -6,7 +6,7 @@
 		<meta charset="utf-8" />
 		<title>
 			@section('title')
-			 {{ Setting::getSettings()->site_name }}
+			 {{{ Setting::getSettings()->site_name }}}
 			@show
 		</title>
 
@@ -79,7 +79,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="/">{{ Setting::getSettings()->site_name }}</a>
+            <a class="navbar-brand" href="/">{{{ Setting::getSettings()->site_name }}}</a>
         </div>
 
         <ul class="nav navbar-nav pull-right hidden-xs">
@@ -92,17 +92,17 @@
                         <b class="caret"></b>
                     </a>
                     <ul class="dropdown-menu">
-                       <li {{ (Request::is('hardware/create') ? 'class="active"' : '') }}>
+                       <li {{{ (Request::is('hardware/create') ? 'class="active"' : '') }}}>
                        		<a href="{{ route('create/hardware') }}">
                        			<i class="icon-plus"></i>
                        			@lang('general.asset')</a>
                        	</li>
-						<li {{ (Request::is('admin/licenses/create') ? 'class="active"' : '') }}>
+						<li {{{ (Request::is('admin/licenses/create') ? 'class="active"' : '') }}}>
 							<a href="{{ route('create/licenses') }}">
 								<i class="icon-plus"></i>
 								@lang('general.license')</a>
 						</li>
-						<li {{ (Request::is('admin/users/create') ? 'class="active"' : '') }}>
+						<li {{{ (Request::is('admin/users/create') ? 'class="active"' : '') }}}>
 							<a href="{{ route('create/user') }}">
 							<i class="icon-plus"></i>
 							@lang('general.user')</a>
@@ -112,11 +112,11 @@
 				@endif
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle hidden-xs hidden-sm" data-toggle="dropdown">
-                        {{ Lang::get('general.welcome', array('name' => Sentry::getUser()->first_name)) }}
+                        {{{ Lang::get('general.welcome', array('name' => Sentry::getUser()->first_name)) }}}
                         <b class="caret"></b>
                     </a>
                     <ul class="dropdown-menu">
-						<li{{ (Request::is('account/profile') ? ' class="active"' : '') }}>
+						<li{{{ (Request::is('account/profile') ? ' class="active"' : '') }}}>
 							<a href="{{ route('profile') }}">
 								<i class="icon-user"></i> @lang('general.profile')
 							</a>
@@ -131,7 +131,7 @@
                     </ul>
                 </li>
                 @if(Sentry::getUser()->hasAccess('admin'))
-                <li class="dropdown{{ (Request::is('admin/users*|admin/groups*') ? ' active' : '') }}  hidden-phone">
+                <li class="dropdown{{ (Request::is('admin/users*|admin/groups*') ? ' active' : '') }}}  hidden-phone">
 					<a class="dropdown-toggle" data-toggle="dropdown" href="{{ URL::to('admin/users') }}">
 						<i class="icon-wrench icon-white"></i> @lang('general.admin') <span class="caret"></span>
 					</a>
@@ -176,7 +176,7 @@
 				@endif
 
 			@else
-					<li {{ (Request::is('auth/signin') ? 'class="active"' : '') }}><a href="{{ route('signin') }}">@lang('general.sign_in')</a></li>
+					<li {{{ (Request::is('auth/signin') ? 'class="active"' : '') }}}><a href="{{ route('signin') }}">@lang('general.sign_in')</a></li>
             @endif
             </ul>
         </div>
@@ -197,12 +197,12 @@
                 </a>
 
                 <ul class="submenu{{ (Request::is('hardware*') ? ' active' : '') }}">
-                    <li><a href="{{ URL::to('hardware?Deployed=true') }}" {{ (Request::query('Deployed') ? ' class="active"' : '') }} >@lang('general.deployed')</a></li>
-                    <li><a href="{{ URL::to('hardware?RTD=true') }}" {{ (Request::query('RTD') ? ' class="active"' : '') }} >@lang('general.ready_to_deploy')</a></li>
-                    <li><a href="{{ URL::to('hardware?Pending=true') }}" {{ (Request::query('Pending') ? ' class="active"' : '') }} >@lang('general.pending')</a></li>
-                    <li><a href="{{ URL::to('hardware?Undeployable=true') }}" {{ (Request::query('Undeployable') ? ' class="active"' : '') }} >@lang('general.undeployable')</a></li>
+                    <li><a href="{{ URL::to('hardware?Deployed=true') }}" {{{ (Request::query('Deployed') ? ' class="active"' : '') }}} >@lang('general.deployed')</a></li>
+                    <li><a href="{{ URL::to('hardware?RTD=true') }}" {{{ (Request::query('RTD') ? ' class="active"' : '') }}} >@lang('general.ready_to_deploy')</a></li>
+                    <li><a href="{{ URL::to('hardware?Pending=true') }}" {{{ (Request::query('Pending') ? ' class="active"' : '') }}} >@lang('general.pending')</a></li>
+                    <li><a href="{{ URL::to('hardware?Undeployable=true') }}" {{{ (Request::query('Undeployable') ? ' class="active"' : '') }}} >@lang('general.undeployable')</a></li>
                     <li><a href="{{ URL::to('hardware') }}">@lang('general.list_all')</a></li>
-                    <li><a href="{{ URL::to('hardware/models') }}" {{ (Request::is('hardware/models*') ? ' class="active"' : '') }} >@lang('general.asset_models')</a></li>
+                    <li><a href="{{ URL::to('hardware/models') }}" {{{ (Request::is('hardware/models*') ? ' class="active"' : '') }}} >@lang('general.asset_models')</a></li>
 
                 </ul>
             </li>
@@ -329,8 +329,8 @@
 
             $('#example').dataTable({
                 "sPaginationType": "full_numbers",
-                "iDisplayLength": {{ Setting::getSettings()->per_page }},
-                "aLengthMenu": [[{{ Setting::getSettings()->per_page }}, -1], [{{ Setting::getSettings()->per_page }}, "All"]],
+                "iDisplayLength": {{{ Setting::getSettings()->per_page }}},
+                "aLengthMenu": [[{{{ Setting::getSettings()->per_page }}}, -1], [{{{ Setting::getSettings()->per_page }}}, "All"]],
                 "aoColumnDefs": [{ 'bSortable': false, 'aTargets': [ 'actions' ] }]
             });
 
@@ -343,8 +343,8 @@
 				{ "bSortable": false },
 				{ "bSortable": false }
 				],
-				"iDisplayLength": {{ Setting::getSettings()->per_page }},
-    			"aLengthMenu": [[{{ Setting::getSettings()->per_page }}, -1], [{{ Setting::getSettings()->per_page }}, "All"]]
+				"iDisplayLength": {{{ Setting::getSettings()->per_page }}},
+    			"aLengthMenu": [[{{{ Setting::getSettings()->per_page }}}, -1], [{{{ Setting::getSettings()->per_page }}}, "All"]]
             });
 
 
diff --git a/app/views/backend/licenses/checkin.blade.php b/app/views/backend/licenses/checkin.blade.php
index de4987ae45..5fd97b2838 100644
--- a/app/views/backend/licenses/checkin.blade.php
+++ b/app/views/backend/licenses/checkin.blade.php
@@ -30,7 +30,7 @@
 		  	<div class="form-group">
 			<label class="col-sm-2 control-label">@lang('admin/hardware/form.name')</label>
 				<div class="col-md-6">
-				  <p class="form-control-static">{{ $licenseseat->license->name }}</p>
+				  <p class="form-control-static">{{{ $licenseseat->license->name }}}</p>
 				</div>
 		  	</div>
 
@@ -38,7 +38,7 @@
 		  	<div class="form-group">
 			<label class="col-sm-2 control-label">@lang('admin/hardware/form.serial')</label>
 				<div class="col-md-6">
-				  <p class="form-control-static">{{ $licenseseat->license->serial }}</p>
+				  <p class="form-control-static">{{{ $licenseseat->license->serial }}}</p>
 				</div>
 		  	</div>
 
diff --git a/app/views/backend/locations/edit.blade.php b/app/views/backend/locations/edit.blade.php
index 92fc7193fb..5fade315bc 100755
--- a/app/views/backend/locations/edit.blade.php
+++ b/app/views/backend/locations/edit.blade.php
@@ -39,7 +39,7 @@
 				<label for="name" class="col-md-2 control-label">@lang('admin/locations/table.name')</label>
 					<div class="col-md-12">
 						<div class="col-xs-8">
-						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $location->name) }}" />
+						<input class="form-control" type="text" name="name" id="name" value="{{{ Input::old('name', $location->name) }}}" />
 					</div>
 					{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
@@ -50,7 +50,7 @@
 				<label for="address" class="col-md-2 control-label">@lang('admin/locations/table.address')</label>
 					<div class="col-md-12">
 						<div class="col-xs-8">
-						<input class="form-control" type="text" name="address" id="address" value="{{ Input::old('address', $location->address) }}" />
+						<input class="form-control" type="text" name="address" id="address" value="{{{ Input::old('address', $location->address) }}}" />
 					</div>
 					{{ $errors->first('address', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
@@ -61,7 +61,7 @@
 				<label for="address2" class="col-md-2 control-label"></label>
 					<div class="col-md-12">
 						<div class="col-xs-8">
-						<input class="form-control" type="text" name="address2" id="address2" value="{{ Input::old('address2', $location->address2) }}" />
+						<input class="form-control" type="text" name="address2" id="address2" value="{{{ Input::old('address2', $location->address2) }}}" />
 					</div>
 					{{ $errors->first('address2', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
@@ -72,7 +72,7 @@
 				<label for="city" class="col-md-2 control-label">@lang('admin/locations/table.city')</label>
 					<div class="col-md-12">
 						<div class="col-xs-8">
-						<input class="form-control" type="text" name="city" id="city" value="{{ Input::old('city', $location->city) }}" />
+						<input class="form-control" type="text" name="city" id="city" value="{{{ Input::old('city', $location->city) }}}" />
 					</div>
 					{{ $errors->first('city', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
@@ -83,7 +83,7 @@
 				<label for="state" class="col-md-2 control-label">@lang('admin/locations/table.state')</label>
 					<div class="col-md-12">
 						<div class="col-xs-2">
-						<input class="form-control" type="text" name="state" id="state" value="{{ Input::old('state', $location->state) }}" />
+						<input class="form-control" type="text" name="state" id="state" value="{{{ Input::old('state', $location->state) }}}" />
 					</div>
 					{{ $errors->first('state', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
@@ -94,7 +94,7 @@
 				<label for="zip" class="col-md-2 control-label">@lang('admin/locations/table.zip')</label>
 					<div class="col-md-12">
 						<div class="col-xs-3">
-						<input class="form-control" type="text" name="zip" id="zip" value="{{ Input::old('zip', $location->zip) }}" />
+						<input class="form-control" type="text" name="zip" id="zip" value="{{{ Input::old('zip', $location->zip) }}}" />
 					</div>
 					{{ $errors->first('zip', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
@@ -105,7 +105,7 @@
 				<label for="country" class="col-md-2 control-label">@lang('admin/locations/table.country')</label>
 					<div class="col-md-12">
 						<div class="col-xs-2">
-						<input class="form-control" type="text" name="country" id="country" value="{{ Input::old('country', $location->country) }}" />
+						<input class="form-control" type="text" name="country" id="country" value="{{{ Input::old('country', $location->country) }}}" />
 						</div>
 						{{ $errors->first('country', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php
index 0a538cef5f..c6ec7ac6e1 100755
--- a/app/views/backend/locations/index.blade.php
+++ b/app/views/backend/locations/index.blade.php
@@ -32,9 +32,9 @@ Locations ::
 	<tbody>
 		@foreach ($locations as $location)
 		<tr>
-			<td>{{ $location->name }}</td>
-			<td>{{ $location->address }}, {{ $location->address2 }}  </td>
-			<td>{{ $location->city }}, {{ $location->state }}  {{ $location->country }}  </td>
+			<td>{{{ $location->name }}}</td>
+			<td>{{{ $location->address }}}, {{{ $location->address2 }}}  </td>
+			<td>{{{ $location->city }}}, {{{ $location->state }}}  {{{ $location->country }}}  </td>
 			<td>
 				<a href="{{ route('update/location', $location->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/location', $location->id) }}" data-content="@lang('admin/locations/message.delete.confirm')"
diff --git a/app/views/backend/manufacturers/edit.blade.php b/app/views/backend/manufacturers/edit.blade.php
index 1f6b1460f5..12f4c0fcde 100755
--- a/app/views/backend/manufacturers/edit.blade.php
+++ b/app/views/backend/manufacturers/edit.blade.php
@@ -41,7 +41,7 @@
 			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
 				<label for="name" class="col-md-3 control-label">@lang('admin/manufacturers/table.name')</label>
 					<div class="col-md-6">
-						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $manufacturer->name) }}" />
+						<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>
diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php
index bc6225515c..9cebfa6053 100755
--- a/app/views/backend/manufacturers/index.blade.php
+++ b/app/views/backend/manufacturers/index.blade.php
@@ -31,7 +31,7 @@
 	<tbody>
 		@foreach ($manufacturers as $manufacturer)
 		<tr>
-			<td>{{ $manufacturer->name }}</td>
+			<td>{{{ $manufacturer->name }}}</td>
 			<td>
 
 				<a href="{{ route('update/manufacturer', $manufacturer->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
diff --git a/app/views/backend/models/edit.blade.php b/app/views/backend/models/edit.blade.php
index 233f5953f1..ca2ebfac95 100755
--- a/app/views/backend/models/edit.blade.php
+++ b/app/views/backend/models/edit.blade.php
@@ -38,7 +38,7 @@
 			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
 				<label for="name" class="col-md-2 control-label">@lang('admin/models/table.name')</label>
 					<div class="col-md-7">
-						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $model->name) }}" />
+						<input class="form-control" type="text" name="name" id="name" value="{{{ Input::old('name', $model->name) }}}" />
 						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
 			</div>
@@ -47,7 +47,7 @@
 			<div class="form-group {{ $errors->has('modelno') ? ' has-error' : '' }}">
 				<label for="modelno" class="col-md-2 control-label">@lang('general.model_no')</label>
 					<div class="col-md-7">
-						<input class="form-control" type="text" name="modelno" id="modelno" value="{{ Input::old('modelno', $model->modelno) }}" />
+						<input class="form-control" type="text" name="modelno" id="modelno" value="{{{ Input::old('modelno', $model->modelno) }}}" />
 						{{ $errors->first('modelno', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
 			</div>
@@ -83,7 +83,7 @@
 				<label for="eol" class="col-md-2 control-label">@lang('general.eol')</label>
 				<div class="col-md-2">
 					<div class="input-group">
-					<input class="col-md-1 form-control" type="text" name="eol" id="eol" value="{{ Input::old('eol', $model->eol) }}" />   <span class="input-group-addon">
+					<input class="col-md-1 form-control" type="text" name="eol" id="eol" value="{{{ Input::old('eol', $model->eol) }}}" />   <span class="input-group-addon">
 					@lang('general.months')
 					</span>
 					{{ $errors->first('eol', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php
index 0467cbedff..8c5143768d 100755
--- a/app/views/backend/models/index.blade.php
+++ b/app/views/backend/models/index.blade.php
@@ -33,13 +33,15 @@
 		@foreach ($models as $model)
 		<tr>
 			<td><a href="{{ route('view/model', $model->id) }}">{{{ $model->name }}}</a></td>
-			<td>{{ $model->modelno }}</td>
+			<td>{{{ $model->modelno }}}</td>
 			<td><a href="{{ route('view/model', $model->id) }}">{{ ($model->assets->count()) }}</a></td>
 			<td>
 
 			@if (($model->depreciation) && ($model->depreciation->id > 0))
-				{{ $model->depreciation->name }}
-			 	({{ $model->depreciation->months }} months)
+				{{{ $model->depreciation->name }}}
+			 	({{{ $model->depreciation->months }}}
+			 	@lang('general.months')
+			 	)
 			@else
 			 @lang('general.no_depreciation')
 			@endif
@@ -47,14 +49,14 @@
 			</td>
 			<td>
 			@if ($model->category)
-			{{ $model->category->name }}
+				{{{ $model->category->name }}}
 			@endif
 			</td>
 
 			<td>
 
 			@if ($model->eol)
-			 	{{ $model->eol }}
+			 	{{{ $model->eol }}}
 			 	@lang('general.months')
 			@else
 			 --
diff --git a/app/views/backend/models/view.blade.php b/app/views/backend/models/view.blade.php
index b6b6d71263..8f9b4b8e1d 100644
--- a/app/views/backend/models/view.blade.php
+++ b/app/views/backend/models/view.blade.php
@@ -3,7 +3,7 @@
 {{-- Page title --}}
 @section('title')
 @lang('admin/models/table.view')
-{{ $model->model_tag }} ::
+{{{ $model->model_tag }}} ::
 @parent
 @stop
 
@@ -14,7 +14,8 @@
     <div class="col-md-12">
     	<a href="{{ route('update/model', $model->id) }}" class="btn-flat white pull-right">
     	@lang('admin/models/table.update')</a>
-		<h3 class="name">@lang('general.history_for') {{ $model->name }} </h3>
+		<h3 class="name">@lang('general.history_for')
+		{{{ $model->name }}} </h3>
 	</div>
 </div>
 
@@ -38,12 +39,12 @@
 
 									@foreach ($model->assets as $modelassets)
 									<tr>
-										<td><a href="{{ route('view/hardware', $modelassets->id) }}">{{ $modelassets->name }}</a></td>
-										<td><a href="{{ route('view/hardware', $modelassets->id) }}">{{ $modelassets->asset_tag }}</a></td>
+										<td><a href="{{ route('view/hardware', $modelassets->id) }}">{{{ $modelassets->name }}}</a></td>
+										<td><a href="{{ route('view/hardware', $modelassets->id) }}">{{{ $modelassets->asset_tag }}}</a></td>
 										<td>
 										@if ($modelassets->assigneduser)
 										<a href="{{ route('view/user', $modelassets->assigned_to) }}">
-										{{ $modelassets->assigneduser->fullName() }}
+										{{{ $modelassets->assigneduser->fullName() }}}
 										</a>
 										@endif
 										</td>
diff --git a/app/views/backend/reports/index.blade.php b/app/views/backend/reports/index.blade.php
index 7d34ce5cd0..6f28bd23a8 100644
--- a/app/views/backend/reports/index.blade.php
+++ b/app/views/backend/reports/index.blade.php
@@ -44,41 +44,41 @@
 
 		@foreach ($assets as $asset)
 		<tr>
-			<td>{{ $asset->asset_tag }}</td>
-			<td>{{ $asset->model->name }}</td>
+			<td>{{{ $asset->asset_tag }}}</td>
+			<td>{{{ $asset->model->name }}}</td>
 			@if (Setting::getSettings()->display_asset_name)
-				<td>{{ $asset->name }}</td>
+				<td>{{{ $asset->name }}}</td>
 			@endif
 			<td>{{ $asset->serial }}</td>
 			<td>
 			@if ($asset->assigned_to != 0)
 				<a href="{{ route('view/user', $asset->assigned_to) }}">
-				{{ $asset->assigneduser->fullName() }}
+				{{{ $asset->assigneduser->fullName() }}}
 				</a>
 			@endif
 			</td>
 			<td>
 			@if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0))
-					{{ Location::find($asset->assigneduser->location_id)->city }}
+					{{{ Location::find($asset->assigneduser->location_id)->city }}}
 					,
-					{{ Location::find($asset->assigneduser->location_id)->state }}
+					{{{ Location::find($asset->assigneduser->location_id)->state }}}
 			@endif
 			</td>
-			<td>{{ $asset->purchase_date }}</td>
+			<td>{{{ $asset->purchase_date }}}</td>
 
 			<td>
 			@if ($asset->model->eol)
-				{{ $asset->eol_date() }}
+				{{{ $asset->eol_date() }}}
 			@endif
 			</td>
 
 			@if ($asset->purchase_cost > 0)
 			<td class="align-right">@lang('general.currency')
-			{{ number_format($asset->purchase_cost) }}</td>
+			{{{ number_format($asset->purchase_cost) }}}</td>
 			<td class="align-right">@lang('general.currency')
-			{{ number_format($asset->depreciate()) }}</td>
+			{{{ number_format($asset->depreciate()) }}}</td>
 			<td class="align-right">@lang('general.currency')
-			-{{ number_format(($asset->purchase_cost - $asset->depreciate())) }}</td>
+			-{{{ number_format(($asset->purchase_cost - $asset->depreciate())) }}}</td>
 			@else
 			<td></td>
 			<td></td>
diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php
index 318598407c..80964ab064 100755
--- a/app/views/backend/settings/edit.blade.php
+++ b/app/views/backend/settings/edit.blade.php
@@ -35,7 +35,7 @@
 									<div class="form-group {{ $errors->has('site_name') ? 'error' : '' }}">
 										<label class="control-label" for="site_name">Site Name</label>
 										<div class="controls">
-											<input class="col-md-9" type="text" name="site_name" id="site_name" value="{{ Input::old('site_name', $setting->site_name) }}" />
+											<input class="col-md-9" type="text" name="site_name" id="site_name" value="{{{ Input::old('site_name', $setting->site_name) }}}" />
 											{{ $errors->first('site_name', '<span class="help-inline">:message</span>') }}
 										</div>
 									</div>
@@ -46,7 +46,7 @@
 										</label>
 										<div class="controls">
 
-											<input class="col-md-1" type="checkbox" name="display_asset_name" id="display_asset_name" value="1" {{ $setting->display_asset_name === '1' ? 'checked' : '' }} />
+											<input class="col-md-1" type="checkbox" name="display_asset_name" id="display_asset_name" value="1" {{{ $setting->display_asset_name === '1' ? 'checked' : '' }}} />
 
 											{{ $errors->first('display_asset_name', '<span class="help-inline">:message</span>') }}
 											</div>
@@ -57,7 +57,7 @@
 									<div class="form-group {{ $errors->has('per_page') ? 'error' : '' }}">
 										<label class="control-label" for="per_page">Results Per Page</label>
 										<div class="controls">
-											<input class="col-md-1" type="text" name="per_page" id="per_page" value="{{ Input::old('per_page', $setting->per_page) }}" />
+											<input class="col-md-1" type="text" name="per_page" id="per_page" value="{{{ Input::old('per_page', $setting->per_page) }}}" />
 											{{ $errors->first('per_page', '<span class="help-inline">:message</span>') }}
 										</div>
 									</div>
@@ -84,7 +84,7 @@
 										<label class="control-label" for="qr_text"> @lang('admin/settings/general.qr_text')</label>
 										<div class="controls">
 									@if ($setting->qr_code === '1')
-											<input class="col-md-9" type="text" name="qr_text" id="qr_text" value="{{ Input::old('qr_text', $setting->qr_text) }}" />
+											<input class="col-md-9" type="text" name="qr_text" id="qr_text" value="{{{ Input::old('qr_text', $setting->qr_text) }}}" />
 									@else
 											<span class="help-inline">
 												@lang('admin/settings/general.qr_help')
diff --git a/app/views/backend/settings/index.blade.php b/app/views/backend/settings/index.blade.php
index a05821144f..c974aa7e81 100755
--- a/app/views/backend/settings/index.blade.php
+++ b/app/views/backend/settings/index.blade.php
@@ -37,34 +37,34 @@ Settings ::
 								@foreach ($settings as $setting)
 								<tr>
 									<td>Site Name</td>
-									<td>{{ $setting->site_name }}  </td>
+									<td>{{{ $setting->site_name }}} </td>
 								</tr>
 								<tr>
 									<td>@lang('admin/settings/general.display_asset_name')</td>
 
 
-@if ($setting->display_asset_name === '1')
-								<td>Yes</td>
-@else
-								<td>No</td>
-@endif
+									@if ($setting->display_asset_name === '1')
+										<td>Yes</td>
+									@else
+										<td>No</td>
+									@endif
 								</tr>
 
 								<tr>
 									<td>Per Page</td>
-									<td>{{ $setting->per_page }}  </td>
+									<td>{{{ $setting->per_page }}}  </td>
 								</tr>
 								<tr>
 									<td>Display QR Codes</td>
-@if ($setting->qr_code === '1')
-								<td>Yes</td>
-@else
-								<td>No</td>
-@endif
+										@if ($setting->qr_code === '1')
+											<td>Yes</td>
+										@else
+											<td>No</td>
+										@endif
 								</tr>
-<tr>
+								<tr>
 									<td>QR Code Text</td>
-									<td>{{ $setting->qr_text }}</td>
+									<td>{{{ $setting->qr_text }}}</td>
 								</tr>
 								@endforeach
 							</tbody>
diff --git a/app/views/backend/statuslabels/edit.blade.php b/app/views/backend/statuslabels/edit.blade.php
index 002234ffae..0d90949279 100755
--- a/app/views/backend/statuslabels/edit.blade.php
+++ b/app/views/backend/statuslabels/edit.blade.php
@@ -43,7 +43,7 @@
 			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
 				<label for="name" class="col-md-3 control-label">Status Label Name</label>
 					<div class="col-md-6">
-						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $statuslabel->name) }}" />
+						<input class="form-control" type="text" name="name" id="name" value="{{{ Input::old('name', $statuslabel->name) }}}" />
 						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
 			</div>
diff --git a/app/views/backend/statuslabels/index.blade.php b/app/views/backend/statuslabels/index.blade.php
index 88b7ca7fef..2e1272dc3b 100755
--- a/app/views/backend/statuslabels/index.blade.php
+++ b/app/views/backend/statuslabels/index.blade.php
@@ -34,7 +34,7 @@
 			<tbody>
 				@foreach ($statuslabels as $statuslabel)
 				<tr>
-					<td>{{ $statuslabel->name }}</td>
+					<td>{{{ $statuslabel->name }}}</td>
 					<td>
 						<a href="{{ route('update/statuslabel', $statuslabel->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/statuslabel', $statuslabel->id) }}" data-content="@lang('admin/statuslabels/message.delete.confirm')"
diff --git a/app/views/backend/users/create.blade.php b/app/views/backend/users/create.blade.php
index a89a7de10a..a4043495de 100755
--- a/app/views/backend/users/create.blade.php
+++ b/app/views/backend/users/create.blade.php
@@ -37,7 +37,7 @@ Create a User ::
 			<div class="form-group {{ $errors->has('first_name') ? 'error' : '' }}">
 				<label class="control-label" for="first_name">First Name</label>
 				<div class="controls">
-					<input type="text" name="first_name" id="first_name" value="{{ Input::old('first_name') }}" />
+					<input type="text" name="first_name" id="first_name" value="{{{ Input::old('first_name') }}}" />
 					{{ $errors->first('first_name', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
@@ -46,7 +46,7 @@ Create a User ::
 			<div class="form-group {{ $errors->has('last_name') ? 'error' : '' }}">
 				<label class="control-label" for="last_name">Last Name</label>
 				<div class="controls">
-					<input type="text" name="last_name" id="last_name" value="{{ Input::old('last_name') }}" />
+					<input type="text" name="last_name" id="last_name" value="{{{ Input::old('last_name') }}}" />
 					{{ $errors->first('last_name', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
@@ -57,7 +57,7 @@ Create a User ::
 			<div class="form-group {{ $errors->has('jobtitle') ? 'error' : '' }}">
 				<label class="control-label" for="jobtitle">Job Title</label>
 				<div class="controls">
-					<input type="text" name="jobtitle" id="jobtitle" value="{{ Input::old('jobtitle') }}" />
+					<input type="text" name="jobtitle" id="jobtitle" value="{{{ Input::old('jobtitle') }}}" />
 					{{ $errors->first('jobtitle', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
@@ -88,7 +88,7 @@ Create a User ::
 			<div class="form-group {{ $errors->has('phone') ? 'error' : '' }}">
 				<label class="control-label" for="jobtitle">Phone</label>
 				<div class="controls">
-					<input type="text" name="phone" id="phone" value="{{ Input::old('phone') }}" />
+					<input type="text" name="phone" id="phone" value="{{{ Input::old('phone') }}}" />
 					{{ $errors->first('phone', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
@@ -97,7 +97,7 @@ Create a User ::
 			<div class="form-group {{ $errors->has('email') ? 'error' : '' }}">
 				<label class="control-label" for="email">Email</label>
 				<div class="controls">
-					<input type="email" name="email" id="email" value="{{ Input::old('email') }}" />
+					<input type="email" name="email" id="email" value="{{{ Input::old('email') }}}" />
 					{{ $errors->first('email', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
@@ -163,15 +163,15 @@ Create a User ::
 							<label class="form-group">{{ $permission['label'] }}</label>
 
 							<div class="radio inline">
-								<label for="{{ $permission['permission'] }}_allow" onclick="">
-									<input type="radio" value="1" id="{{ $permission['permission'] }}_allow" name="permissions[{{ $permission['permission'] }}]"{{ (array_get($selectedPermissions, $permission['permission']) === 1 ? ' checked="checked"' : '') }}>
+								<label for="{{{ $permission['permission'] }}}_allow" onclick="">
+									<input type="radio" value="1" id="{{ $permission['permission'] }}_allow" name="permissions[{{{ $permission['permission'] }}}]"{{ (array_get($selectedPermissions, $permission['permission']) === 1 ? ' checked="checked"' : '') }}>
 									Allow
 								</label>
 							</div>
 
 							<div class="radio inline">
 								<label for="{{ $permission['permission'] }}_deny" onclick="">
-									<input type="radio" value="-1" id="{{ $permission['permission'] }}_deny" name="permissions[{{ $permission['permission'] }}]"{{ (array_get($selectedPermissions, $permission['permission']) === -1 ? ' checked="checked"' : '') }}>
+									<input type="radio" value="-1" id="{{{ $permission['permission'] }}}_deny" name="permissions[{{{ $permission['permission'] }}}]"{{ (array_get($selectedPermissions, $permission['permission']) === -1 ? ' checked="checked"' : '') }}>
 									Deny
 								</label>
 							</div>
@@ -179,7 +179,7 @@ Create a User ::
 							@if ($permission['can_inherit'])
 							<div class="radio inline">
 								<label for="{{ $permission['permission'] }}_inherit" onclick="">
-									<input type="radio" value="0" id="{{ $permission['permission'] }}_inherit" name="permissions[{{ $permission['permission'] }}]"{{ ( ! array_get($selectedPermissions, $permission['permission']) ? ' checked="checked"' : '') }}>
+									<input type="radio" value="0" id="{{{ $permission['permission'] }}}_inherit" name="permissions[{{{ $permission['permission'] }}}]"{{ ( ! array_get($selectedPermissions, $permission['permission']) ? ' checked="checked"' : '') }}>
 									Inherit
 								</label>
 							</div>
diff --git a/app/views/backend/users/edit.blade.php b/app/views/backend/users/edit.blade.php
index f60e95985c..9b7ee05b04 100755
--- a/app/views/backend/users/edit.blade.php
+++ b/app/views/backend/users/edit.blade.php
@@ -14,7 +14,7 @@ Update User {{ $user->fullName() }} ::
 			<a href="{{ URL::previous() }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i>  @lang('general.back')</a>
 		</div>
 	<h3>
-		Update User {{ $user->fullName() }}
+		Update User {{{ $user->fullName() }}}
 	</h3>
 </div>
 
@@ -36,7 +36,7 @@ Update User {{ $user->fullName() }} ::
 			<div class="form-group {{ $errors->has('first_name') ? 'error' : '' }}">
 				<label class="control-label" for="first_name">First Name</label>
 				<div class="controls">
-					<input type="text" name="first_name" id="first_name" value="{{ Input::old('first_name', $user->first_name) }}" />
+					<input type="text" name="first_name" id="first_name" value="{{{ Input::old('first_name', $user->first_name) }}}" />
 					{{ $errors->first('first_name', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
@@ -45,7 +45,7 @@ Update User {{ $user->fullName() }} ::
 			<div class="form-group {{ $errors->has('last_name') ? 'error' : '' }}">
 				<label class="control-label" for="last_name">Last Name</label>
 				<div class="controls">
-					<input type="text" name="last_name" id="last_name" value="{{ Input::old('last_name', $user->last_name) }}" />
+					<input type="text" name="last_name" id="last_name" value="{{{ Input::old('last_name', $user->last_name) }}}" />
 					{{ $errors->first('last_name', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
@@ -54,7 +54,7 @@ Update User {{ $user->fullName() }} ::
 			<div class="form-group {{ $errors->has('jobtitle') ? 'error' : '' }}">
 				<label class="control-label" for="jobtitle">Job Title</label>
 				<div class="controls">
-					<input type="text" name="jobtitle" id="jobtitle" value="{{ Input::old('jobtitle', $user->jobtitle) }}" />
+					<input type="text" name="jobtitle" id="jobtitle" value="{{{ Input::old('jobtitle', $user->jobtitle) }}}" />
 					{{ $errors->first('jobtitle', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
@@ -85,7 +85,7 @@ Update User {{ $user->fullName() }} ::
 			<div class="form-group {{ $errors->has('phone') ? 'error' : '' }}">
 				<label class="control-label" for="jobtitle">Phone</label>
 				<div class="controls">
-					<input type="text" name="phone" id="phone" value="{{ Input::old('phone', $user->phone) }}" />
+					<input type="text" name="phone" id="phone" value="{{{ Input::old('phone', $user->phone) }}}" />
 					{{ $errors->first('phone', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
@@ -95,7 +95,7 @@ Update User {{ $user->fullName() }} ::
 			<div class="form-group {{ $errors->has('email') ? 'error' : '' }}">
 				<label class="control-label" for="email">Email</label>
 				<div class="controls">
-					<input type="email" name="email" id="email" value="{{ Input::old('email', $user->email) }}" />
+					<input type="email" name="email" id="email" value="{{{ Input::old('email', $user->email) }}}" />
 					{{ $errors->first('email', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
@@ -123,8 +123,8 @@ Update User {{ $user->fullName() }} ::
 				<label class="control-label" for="activated">User Activated</label>
 				<div class="controls">
 					<select{{ ($user->id === Sentry::getId() ? ' disabled="disabled"' : '') }} name="activated" id="activated">
-						<option value="1"{{ ($user->isActivated() ? ' selected="selected"' : '') }}>@lang('general.yes')</option>
-						<option value="0"{{ ( ! $user->isActivated() ? ' selected="selected"' : '') }}>@lang('general.no')</option>
+						<option value="1"{{{ ($user->isActivated() ? ' selected="selected"' : '') }}}>@lang('general.yes')</option>
+						<option value="0"{{{ ( ! $user->isActivated() ? ' selected="selected"' : '') }}}>@lang('general.no')</option>
 					</select>
 					{{ $errors->first('activated', '<span class="help-inline">:message</span>') }}
 				</div>
@@ -136,7 +136,7 @@ Update User {{ $user->fullName() }} ::
 				<div class="controls">
 					<select name="groups[]" id="groups[]" multiple>
 						@foreach ($groups as $group)
-						<option value="{{ $group->id }}"{{ (array_key_exists($group->id, $userGroups) ? ' selected="selected"' : '') }}>{{ $group->name }}</option>
+						<option value="{{ $group->id }}"{{ (array_key_exists($group->id, $userGroups) ? ' selected="selected"' : '') }}>{{{ $group->name }}}</option>
 						@endforeach
 					</select>
 
@@ -161,23 +161,23 @@ Update User {{ $user->fullName() }} ::
 							<label class="form-group">{{ $permission['label'] }}</label>
 
 							<div class="radio inline">
-								<label for="{{ $permission['permission'] }}_allow" onclick="">
-									<input type="radio" value="1" id="{{ $permission['permission'] }}_allow" name="permissions[{{ $permission['permission'] }}]"{{ (array_get($userPermissions, $permission['permission']) === 1 ? ' checked="checked"' : '') }}>
+								<label for="{{{ $permission['permission'] }}}_allow" onclick="">
+									<input type="radio" value="1" id="{{{ $permission['permission'] }}}_allow" name="permissions[{{{ $permission['permission'] }}}]"{{ (array_get($userPermissions, $permission['permission']) === 1 ? ' checked="checked"' : '') }}>
 									Allow
 								</label>
 							</div>
 
 							<div class="radio inline">
-								<label for="{{ $permission['permission'] }}_deny" onclick="">
-									<input type="radio" value="-1" id="{{ $permission['permission'] }}_deny" name="permissions[{{ $permission['permission'] }}]"{{ (array_get($userPermissions, $permission['permission']) === -1 ? ' checked="checked"' : '') }}>
+								<label for="{{{ $permission['permission'] }}}_deny" onclick="">
+									<input type="radio" value="-1" id="{{{ $permission['permission'] }}}_deny" name="permissions[{{{ $permission['permission'] }}}]"{{ (array_get($userPermissions, $permission['permission']) === -1 ? ' checked="checked"' : '') }}>
 									Deny
 								</label>
 							</div>
 
 							@if ($permission['can_inherit'])
 							<div class="radio inline">
-								<label for="{{ $permission['permission'] }}_inherit" onclick="">
-									<input type="radio" value="0" id="{{ $permission['permission'] }}_inherit" name="permissions[{{ $permission['permission'] }}]"{{ ( ! array_get($userPermissions, $permission['permission']) ? ' checked="checked"' : '') }}>
+								<label for="{{{ $permission['permission'] }}}_inherit" onclick="">
+									<input type="radio" value="0" id="{{{ $permission['permission'] }}}_inherit" name="permissions[{{{ $permission['permission'] }}}]"{{ ( ! array_get($userPermissions, $permission['permission']) ? ' checked="checked"' : '') }}>
 									Inherit
 								</label>
 							</div>
diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
index 72a0093aee..7990a245e6 100755
--- a/app/views/backend/users/index.blade.php
+++ b/app/views/backend/users/index.blade.php
@@ -54,14 +54,14 @@
 			<a href="{{ route('view/user', $user->id) }}" class="name">{{ $user->fullName() }}</a>
 
 			</td>
-			<td>{{ $user->email }}</td>
+			<td>{{{ $user->email }}}</td>
 			<td>
 			@if ($user->manager)
-				{{ $user->manager->fullName() }}
+				{{{ $user->manager->fullName() }}}
 			@endif
 			</td>
-			<td>{{ $user->assets->count() }}</td>
-			<td>{{ $user->licenses->count() }}</td>
+			<td>{{{ $user->assets->count() }}}</td>
+			<td>{{{ $user->licenses->count() }}}</td>
 			<td>{{ $user->isActivated() ? '<i class="icon-ok"></i>' : ''}}</td>
 			<td>
 
diff --git a/app/views/backend/users/view.blade.php b/app/views/backend/users/view.blade.php
index 5036c7d208..755444683a 100644
--- a/app/views/backend/users/view.blade.php
+++ b/app/views/backend/users/view.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-View User {{ $user->fullName() }} ::
+View User {{{ $user->fullName() }}} ::
 @parent
 @stop
 
@@ -13,9 +13,9 @@ View User {{ $user->fullName() }} ::
             <!-- header -->
             <div class="row header">
                 <div class="col-md-8">
-                    <img src="{{ $user->gravatar() }}" class="avatar img-circle">
-                    <h3 class="name">{{ $user->fullName() }}</h3>
-                    <span class="area">{{ $user->jobtitle }}</span>
+                    <img src="{{{ $user->gravatar() }}}" class="avatar img-circle">
+                    <h3 class="name">{{{ $user->fullName() }}}</h3>
+                    <span class="area">{{{ $user->jobtitle }}}</span>
                 </div>
                 @if ($user->deleted_at != NULL)
                 		    <a href="{{ route('restore/user', $user->id) }}" class="btn btn-warning pull-right edit"><i class="icon-pencil"></i> Restore This User</a>
@@ -62,11 +62,11 @@ View User {{ $user->fullName() }} ::
 									<tr>
 										<td>
 										@if ($asset->physical=='1')
-										{{ $asset->model->name }}
+										{{{ $asset->model->name }}}
 										@endif
 										</td>
-										<td><a href="{{ route('view/hardware', $asset->id) }}">{{ $asset->asset_tag }}</a></td>
-										<td><a href="{{ route('view/hardware', $asset->id) }}">{{ $asset->name }}</a></td>
+										<td><a href="{{ route('view/hardware', $asset->id) }}">{{{ $asset->asset_tag }}}</a></td>
+										<td><a href="{{ route('view/hardware', $asset->id) }}">{{{ $asset->name }}}</a></td>
 
 										<td> <a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat info">Checkin</a></td>
 									</tr>
@@ -98,8 +98,8 @@ View User {{ $user->fullName() }} ::
                                 <tbody>
 									@foreach ($user->licenses as $license)
 									<tr>
-										<td><a href="{{ route('view/license', $license->id) }}">{{ $license->name }}</a></td>
-										<td><a href="{{ route('view/license', $license->id) }}">{{ $license->serial }}</a></td>
+										<td><a href="{{ route('view/license', $license->id) }}">{{{ $license->name }}}</a></td>
+										<td><a href="{{ route('view/license', $license->id) }}">{{{ $license->serial }}}</a></td>
 										<td> <a href="{{ route('checkin/license', $license->pivot->id) }}" class="btn-flat info">Checkin</a>
 										</td>
 									</tr>
@@ -138,12 +138,12 @@ View User {{ $user->fullName() }} ::
 										<td>{{ $log->action_type }}</td>
 										<td>
 										@if ((isset($log->assetlog->name)) && ($log->assetlog->deleted_at==''))
-											<a href="{{ route('view/hardware', $log->asset_id) }}">{{ $log->assetlog->asset_tag }}</a>
+											<a href="{{ route('view/hardware', $log->asset_id) }}">{{{ $log->assetlog->asset_tag }}}</a>
 										@elseif ((isset($log->assetlog->name)) && ($log->assetlog->deleted_at!=''))
-											<del>{{ $log->assetlog->name }}</del> (deleted)
+											<del>{{{ $log->assetlog->name }}}</del> (deleted)
 										@endif
 										</td>
-										<td>{{ $log->adminlog->fullName() }}</td>
+										<td>{{{ $log->adminlog->fullName() }}}</td>
 									</tr>
 									@endforeach
                                 </tbody>
@@ -174,17 +174,17 @@ View User {{ $user->fullName() }} ::
 						@endif
 						<ul>
 						@if ($user->manager)
-							<strong>Manager:</strong> {{ $user->manager->fullName() }}
+							<strong>Manager:</strong> {{{ $user->manager->fullName() }}}
 						@endif
 
 						@if ($user->location_id)
-							<li>{{ $user->userloc->address }} {{ $user->userloc->address2 }}</li>
-							<li>{{ $user->userloc->city }}, {{ $user->userloc->state }} {{ $user->userloc->zip }}<br /><br /></li>
+							<li>{{{ $user->userloc->address }}} {{{ $user->userloc->address2 }}}</li>
+							<li>{{{ $user->userloc->city }}}, {{{ $user->userloc->state }}} {{{ $user->userloc->zip }}}<br /><br /></li>
 						@endif
                         @if ($user->phone)
-                        	<li><i class="icon-phone"></i>{{ $user->phone }}</li>
+                        	<li><i class="icon-phone"></i>{{{ $user->phone }}}</li>
                         @endif
-	                    	<li><i class="icon-envelope-alt"></i><a href="mailto:{{ $user->email }}">{{ $user->email }}</a></li>
+	                    	<li><i class="icon-envelope-alt"></i><a href="mailto:{{{ $user->email }}}">{{{ $user->email }}}</a></li>
                         </ul>
 
                         @if ($user->last_login!='')