diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php
index c9b983ca8c58..20f4560990d1 100644
--- a/app/controllers/admin/LicensesController.php
+++ b/app/controllers/admin/LicensesController.php
@@ -241,13 +241,13 @@ public function getCheckout($assetId)
 		/**
 	* Check out the asset to a person
 	**/
-	public function postCheckout($assetId)
+	public function postCheckout($seatId)
 	{
 		// Check if the asset exists
-		if (is_null($license = License::find($assetId)))
+		if (is_null($licenseseat = LicenseSeat::find($seatId)))
 		{
 			// Redirect to the asset management page with error
-			return Redirect::to('admin/licenses')->with('error', Lang::get('admin/assets/message.not_found'));
+			return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found'));
 		}
 
 		$assigned_to = e(Input::get('assigned_to'));
@@ -277,15 +277,15 @@ public function postCheckout($assetId)
 
 
 		// Update the asset data
-		$license->assigned_to            		= e(Input::get('assigned_to'));
+		$licenseseat->assigned_to            		= e(Input::get('assigned_to'));
 
 
 		// Was the asset updated?
-		if($license->save())
+		if($licenseseat->save())
 		{
 			$logaction = new Actionlog();
-			$logaction->asset_id = $license->id;
-			$logaction->checkedout_to = $license->assigned_to;
+			$logaction->asset_id = $licenseseat->id;
+			$logaction->checkedout_to = $licenseseat->assigned_to;
 			$logaction->location_id = $assigned_to->location_id;
 			$logaction->asset_type = 'software';
 			$logaction->user_id = Sentry::getUser()->id;
@@ -302,25 +302,25 @@ public function postCheckout($assetId)
 	/**
 	* Check in the item so that it can be checked out again to someone else
 	**/
-	public function postCheckin($assetId)
+	public function postCheckin($seatId)
 	{
 		// Check if the asset exists
-		if (is_null($license = License::find($assetId)))
+		if (is_null($licenseseat = LicenseSeat::find($seatId)))
 		{
 			// Redirect to the asset management page with error
 			return Redirect::to('admin/licenses')->with('error', Lang::get('admin/assets/message.not_found'));
 		}
 
 		$logaction = new Actionlog();
-		$logaction->checkedout_to = $license->assigned_to;
+		$logaction->checkedout_to = $licenseseat->assigned_to;
 
 		// Update the asset data
-		$license->assigned_to            		= '';
+		$licenseseat->assigned_to            		= '';
 
 		// Was the asset updated?
-		if($license->save())
+		if($licenseseat->save())
 		{
-			$logaction->asset_id = $license->id;
+			$logaction->asset_id = $licenseseat->id;
 			$logaction->location_id = NULL;
 			$logaction->asset_type = 'software';
 			$logaction->user_id = Sentry::getUser()->id;
diff --git a/app/models/Actionlog.php b/app/models/Actionlog.php
index d7c44026970c..df38459fca74 100644
--- a/app/models/Actionlog.php
+++ b/app/models/Actionlog.php
@@ -7,7 +7,11 @@ class ActionLog extends Eloquent {
 
 
 	public function assetlog() {
-		return $this->belongsTo('Asset','asset_id')->withTrashed();
+		return $this->belongsTo('Asset','asset_id');
+	}
+
+	public function licenselog() {
+		return $this->belongsTo('License','asset_id');
 	}
 
 	public function adminlog() {
diff --git a/app/models/License.php b/app/models/License.php
index 05e046a6e901..c258fe09ab34 100644
--- a/app/models/License.php
+++ b/app/models/License.php
@@ -38,7 +38,7 @@ public function assetloc()
 	public function assetlog()
 	{
 		return $this->hasMany('Actionlog','asset_id')
-			->where('checkedout_to', '=', '0')
+			->where('asset_type', '=', 'software')
 			->orderBy('added_on', 'desc');
 	}
 
diff --git a/app/views/backend/licenses/view.blade.php b/app/views/backend/licenses/view.blade.php
index 57f6093c62ba..8ebe918996ed 100644
--- a/app/views/backend/licenses/view.blade.php
+++ b/app/views/backend/licenses/view.blade.php
@@ -30,37 +30,53 @@
                             </div>
 				</h3>
 
+                <div class="row-fluid profile">
+                    <!-- bio, new note & orders column -->
+                    <div class="span9 bio">
+                        <div class="profile-box">
+                            <br>
+                            <!-- checked out assets table -->
 
-						<div class="span6 bio">
-							<div class="profile-box">
-							<br>
-								@if ($license->serial)
-								<p>Serial: {{ $license->serial }} <br>
-								@endif
-								@if ($license->license_name)
-								License Name: {{ $license->license_name }} <br>
-								@endif
-								@if ($license->license_email)
-								License Email: {{ $license->license_email }} <br>
-								@endif
-								@if ($license->purchase_date)
-								Purchase Date: {{ $license->purchase_date }} <br>
-								@endif
-								</p>
-							</div>
-                        </div>
+							<h6>License Seats</h6>
+                            <table class="table table-hover">
+                                <thead>
+                                    <tr>
 
 
+                                         <th class="span6">User</th>
+                                         <th class="span2"><span class="line"></span> </th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                	@if ($license->licenseseats)
+										@foreach ($license->licenseseats as $licensedto)
 
+										<tr>
 
+											<td>
+											@if ($licensedto->assigned_to)
+												<a href="{{ route('view/user', $licensedto->id) }}">
+											{{ $licensedto->user->fullName() }}
+											</a>
+											@endif
+											</td>
+											<td>
+											@if ($licensedto->assigned_to)
+												<a href="{{ route('checkin/license', $licensedto->id) }}" class="btn-flat info"> Checkin </a>
+											@else
+												<a href="{{ route('checkout/license', $licensedto->id) }}" class="btn-flat success">Checkout</a>
+											@endif
+											</td>
 
+										</tr>
+										@endforeach
+										@endif
 
-                <div class="row-fluid profile">
-                    <!-- bio, new note & orders column -->
-                    <div class="span9 bio">
-                        <div class="profile-box">
-                            <br>
-                            <!-- checked out assets table -->
+
+                                </tbody>
+                            </table>
+							<br>
+							<h6>Checkout History</h6>
 
                             <table class="table table-hover">
                                 <thead>
@@ -90,11 +106,13 @@
 										<td>{{ $log->action_type }}</td>
 
 										<td>
-											@if (isset($log->checkedout_to->id))
+											@if (isset($log->checkedout_to))
 											<a href="{{ route('view/user', $log->checkedout_to) }}">
 											{{ $log->userlog->fullName() }}
+
 											</a>
 											@endif
+
 										</td>
 									</tr>
 									@endforeach
@@ -122,48 +140,21 @@
 
                     <!-- side address column -->
                     <div class="span3 address pull-right">
-
-
-
-						@if ((isset($license->assigned_to ) && ($license->assigned_to > 0)))
-                       		<h6><br>Checked Out To:</h6>
+                    <h6><br>License Info:</h6>
                        		<ul>
-
-								<li><img src="{{ $license->assigneduser->gravatar() }}" class="img-circle" style="width: 100px; margin-right: 20px;" /><br /><br /></li>
-								<li><a href="{{ route('view/user', $license->assigned_to) }}">{{ $license->assigneduser->fullName() }}</a></li>
-
-
-								@if (isset($license->assetloc->address))
-									<li>{{ $license->assetloc->address }}
-									@if (isset($license->assetloc->address2))
-										{{ $license->assetloc->address2 }}
-									@endif
-									</li>
-									@if (isset($license->assetloc->city))
-										<li>{{ $license->assetloc->city }}, {{ $license->assetloc->state }} {{ $license->assetloc->zip }}</li>
-									@endif
-
+								@if ($license->serial)
+								<li>Serial: {{ $license->serial }} </li>
 								@endif
-
-
-
-								@if (isset($license->assigneduser->email))
-									<li><br /><i class="icon-envelope-alt"></i> <a href="mailto:{{ $license->assigneduser->email }}">{{ $license->assigneduser->email }}</a></li>
+								@if ($license->license_name)
+								<li>License Name: {{ $license->license_name }} </li>
 								@endif
-
-								@if (isset($license->assigneduser->phone))
-									<li><i class="icon-phone"></i> {{ $license->assigneduser->phone }}</li>
+								@if ($license->license_email)
+								<li>License Email: {{ $license->license_email }} </li>
+								@endif
+								@if ($license->purchase_date)
+								<li>Purchase Date: {{ $license->purchase_date }} </li>
 								@endif
-
-								<li><br /><a href="{{ route('checkin/license', $license->id) }}" class="btn-flat large info ">Checkin Asset</a></li>
-								</ul>
-
-						@else
-							<ul>
-								<li><br><br />This asset is not currently assigned to anyone. You may check it into inventory
-								using the button below, or mark it as lost/stolen using the menu above.</li>
-								<li><br><br /><a href="{{ route('checkout/license', $license->id) }}" class="btn-flat large success">Checkout Asset</a></li>
 							</ul>
-                        @endif
+
                     </div>
 @stop
\ No newline at end of file