diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php
index b1a64d214882..c9b983ca8c58 100644
--- a/app/controllers/admin/LicensesController.php
+++ b/app/controllers/admin/LicensesController.php
@@ -287,6 +287,7 @@ public function postCheckout($assetId)
 			$logaction->asset_id = $license->id;
 			$logaction->checkedout_to = $license->assigned_to;
 			$logaction->location_id = $assigned_to->location_id;
+			$logaction->asset_type = 'software';
 			$logaction->user_id = Sentry::getUser()->id;
 			$log = $logaction->logaction('checkout');
 
@@ -320,8 +321,8 @@ public function postCheckin($assetId)
 		if($license->save())
 		{
 			$logaction->asset_id = $license->id;
-
 			$logaction->location_id = NULL;
+			$logaction->asset_type = 'software';
 			$logaction->user_id = Sentry::getUser()->id;
 			$log = $logaction->logaction('checkin from');
 
@@ -341,13 +342,13 @@ public function postCheckin($assetId)
 	**/
 	public function getView($licenseId = null)
 	{
-		$license = Asset::find($licenseId);
+		$license = License::find($licenseId);
 
 		if (isset($license->id)) {
 				return View::make('backend/licenses/view', compact('license'));
 		} else {
 			// Prepare the error message
-			$error = Lang::get('admin/licenses/message.does_not_exist', compact('id' ));
+			$error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
 
 			// Redirect to the user management page
 			return Redirect::route('licenses')->with('error', $error);
diff --git a/app/models/License.php b/app/models/License.php
index 0a57414a8b49..05e046a6e901 100644
--- a/app/models/License.php
+++ b/app/models/License.php
@@ -29,7 +29,7 @@ public function assignedusers()
 	**/
   	public function assetloc()
   	{
-  		return $this->assigneduser->hasOne('Location');
+  		return $this->assignedusers->hasOne('Location');
   	}
 
   	/**
@@ -38,7 +38,7 @@ public function assetloc()
 	public function assetlog()
 	{
 		return $this->hasMany('Actionlog','asset_id')
-			->where('assigned_to', '=', '0')
+			->where('checkedout_to', '=', '0')
 			->orderBy('added_on', 'desc');
 	}
 
@@ -72,6 +72,37 @@ public static function availassetcount()
 
 	}
 
+	public function availcount()
+	{
+		return DB::table('license_seats')
+                    ->where('assigned_to', '=', '0')
+                    ->where('license_id', '=', $this->id)
+                    ->whereNull('deleted_at','and')
+                    ->count();
+	}
+
+
+	public function assignedcount()
+	{
+		return DB::table('license_seats')
+                    ->where('assigned_to', '>', '0')
+                    ->where('license_id', '=', $this->id)
+                    ->whereNull('deleted_at','and')
+                    ->count();
+	}
+
+	public function totalcount()
+	{
+		$avail =  $this->availcount();
+        $taken =  $this->assignedcount();
+        $diff =   ($avail + $taken);
+        return $diff;
+	}
+
+	public function licenseseats()
+	{
+		return $this->hasMany('LicenseSeat');
+	}
 
 
 }
diff --git a/app/models/LicenseSeat.php b/app/models/LicenseSeat.php
index 9d2321ad2777..ae0ce4441304 100644
--- a/app/models/LicenseSeat.php
+++ b/app/models/LicenseSeat.php
@@ -3,10 +3,14 @@
 class LicenseSeat extends Elegant {
 	protected $table = 'license_seats';
 
-	public function assignedusers()
-  	{
-    	return $this->belongsToMany('LicenseSeat', 'assigned_to');
-  	}
+	public function license()
+	{
+		return $this->belongsTo('License');
+	}
 
+	public function user()
+	{
+		return $this->belongsTo('User','assigned_to');
+	}
 
 }
\ No newline at end of file
diff --git a/app/views/backend/licenses/edit.blade.php b/app/views/backend/licenses/edit.blade.php
index 4c2a7c539683..c189073bf2d9 100755
--- a/app/views/backend/licenses/edit.blade.php
+++ b/app/views/backend/licenses/edit.blade.php
@@ -50,23 +50,27 @@
 					{{ $errors->first('serial', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
-
+			<div class="control-group {{ $errors->has('license_name') ? 'error' : '' }}">
+				<label class="control-label" for="license_name">Licensed to Name</label>
+				<div class="controls">
+					<input class="span6" type="text" name="license_name" id="license_name" value="{{ Input::old('license_name', $license->license_name) }}" />
+					{{ $errors->first('license_name', '<span class="help-inline">:message</span>') }}
+				</div>
+			</div>
 			<div class="control-group {{ $errors->has('license_email') ? 'error' : '' }}">
-				<label class="control-label" for="license_email">License Email</label>
+				<label class="control-label" for="license_email">Licensed to Email</label>
 				<div class="controls">
 					<input class="span6" type="text" name="license_email" id="license_email" value="{{ Input::old('license_email', $license->license_email) }}" />
 					{{ $errors->first('license_email', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
-
-			<div class="control-group {{ $errors->has('license_name') ? 'error' : '' }}">
-				<label class="control-label" for="license_name">License Name</label>
+			<div class="control-group {{ $errors->has('seats') ? 'error' : '' }}">
+				<label class="control-label" for="seats">Seats</label>
 				<div class="controls">
-					<input class="span6" type="text" name="license_name" id="license_name" value="{{ Input::old('license_name', $license->license_name) }}" />
-					{{ $errors->first('license_name', '<span class="help-inline">:message</span>') }}
+					<input class="span1" type="text" name="seats" id="seats" value="{{ Input::old('seats', $license->seats) }}" />
+					{{ $errors->first('seats', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
-
 			<div class="control-group {{ $errors->has('order_number') ? 'error' : '' }}">
 				<label class="control-label" for="order_number">Order Number</label>
 				<div class="controls">
@@ -74,8 +78,6 @@
 					{{ $errors->first('order_number', '<span class="help-inline">:message</span>') }}
 				</div>
 			</div>
-
-
 			<div class="control-group {{ $errors->has('purchase_cost') ? 'error' : '' }}">
 				<label class="control-label" for="purchase_cost">Purchase Cost</label>
 				<div class="controls">
diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php
index 003c60ac78a7..751a22ef33ce 100755
--- a/app/views/backend/licenses/index.blade.php
+++ b/app/views/backend/licenses/index.blade.php
@@ -23,7 +23,8 @@
 <table class="table table-hover">
 	<thead>
 		<tr>
-			<th class="span2">@lang('admin/licenses/table.title')</th>
+			<th class="span1">@lang('admin/licenses/table.seats')</th>
+			<th class="span2"><span class="line"></span>@lang('admin/licenses/table.title')</th>
 			<th class="span2"><span class="line"></span>@lang('admin/licenses/table.serial')</th>
 			<th class="span2"><span class="line"></span>@lang('admin/licenses/table.license_name')</th>
 			<th class="span2"><span class="line"></span>@lang('admin/licenses/table.license_email')</th>
@@ -33,35 +34,68 @@
 		</tr>
 	</thead>
 	<tbody>
+
+
 		@foreach ($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>{{ $license->license_name }}</td>
-			<td>{{ $license->license_email }}</td>
-
-			<td>
-			@if ($license->assigned_to != 0)
-				<a href="{{ route('view/user', $license->assigned_to) }}">
-				{{ $license->assigneduser->fullName() }}
-				</a>
-			@endif
-			</td>
-			<td>
-			@if ($license->assigned_to != 0)
-				<a href="{{ route('checkin/license', $license->id) }}" class="btn-flat info">Checkin</a>
-			@else
-				<a href="{{ route('checkout/license', $license->id) }}" class="btn-flat success">Checkout</a>
-			@endif
-			</td>
-			<td>
-				<a href="{{ route('update/license', $license->id) }}" class="btn-flat white"> @lang('button.edit')</a>
-				<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/license', $license->id) }}" data-content="Are you sure you wish to delete the  {{ $license->name }} license?" data-title="Delete {{ $license->name }}?" onClick="return false;">@lang('button.delete')</a>
-
-			</td>
-		</tr>
+
+			<tr>
+					<td>{{ $license->seats }}</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>{{ $license->license_name }}</td>
+					<td>{{ $license->license_email }} </td>
+					<td></td>
+					<td></td>
+					<td>
+
+					<a href="{{ route('update/license', $license->id) }}" class="btn-flat white"> @lang('button.edit')</a>
+						<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/license', $license->id) }}" data-content="Are you sure you wish to delete the  {{ $license->name }} license?" data-title="Delete {{ $license->name }}?" onClick="return false;">@lang('button.delete')</a>
+
+
+					</td>
+				</tr>
+				@if ($license->licenseseats)
+
+				@foreach ($license->licenseseats as $licensedto)
+
+				<tr>
+
+					<td></td>
+					<td></td>
+					<td><i class="icon-chevron-right"></i> {{ $license->serial }}</td>
+
+
+					<td>{{ $license->license_name }}</td>
+					<td>{{ $license->license_email }} </td>
+					<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>
+					<td>
+					</td>
+				</tr>
+				@endforeach
+				@endif
+
+
 		@endforeach
+
+
+
+
+
+
+
 	</tbody>
 </table>
 </div>
diff --git a/app/views/backend/licenses/view.blade.php b/app/views/backend/licenses/view.blade.php
index 6af5bddd5bb7..57f6093c62ba 100644
--- a/app/views/backend/licenses/view.blade.php
+++ b/app/views/backend/licenses/view.blade.php
@@ -28,11 +28,28 @@
                                     <li><a href="{{ route('update/license', $license->id) }}">Edit License</a></li>
                                 </ul>
                             </div>
-
-
 				</h3>
 
 
+						<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>
+
 
 
 
@@ -106,6 +123,8 @@
                     <!-- side address column -->
                     <div class="span3 address pull-right">
 
+
+
 						@if ((isset($license->assigned_to ) && ($license->assigned_to > 0)))
                        		<h6><br>Checked Out To:</h6>
                        		<ul>