diff --git a/app/app/Http/Controllers/Admin/SIPRouterController.php b/app/app/Http/Controllers/Admin/SIPRouterController.php
index 1b63980c4..d5a6dcbe8 100755
--- a/app/app/Http/Controllers/Admin/SIPRouterController.php
+++ b/app/app/Http/Controllers/Admin/SIPRouterController.php
@@ -4,6 +4,7 @@
 use App\User;
 use App\SIPRouter;
 use App\RTPProxy;
+use App\RTPEngine;
 use App\Workspace;
 use App\PortNumber;
 use App\MediaServer;
@@ -130,8 +131,8 @@ public function edit(SIPRouter $router)
         $servers->where('sip_routers_media_servers.router_id', '=', $router->id);
         $servers = $servers->get();
         $rtpproxies = RTPProxy::where('router_id', $router->id)->get();
-        
-        return view('admin.siprouter.create_edit', compact('router', 'servers', 'ranges', 'regions', 'rtpproxies', 'digitMappings'));
+        $rtpengines = RTPEngine::where('router_id', $router->id)->get();
+        return view('admin.siprouter.create_edit', compact('router', 'servers', 'ranges', 'regions', 'rtpproxies', 'rtpengines', 'digitMappings'));
     }
 
     /**
diff --git a/app/app/Http/Controllers/Admin/WorkspaceController.php b/app/app/Http/Controllers/Admin/WorkspaceController.php
index 2d7f96d6f..46c84da0c 100755
--- a/app/app/Http/Controllers/Admin/WorkspaceController.php
+++ b/app/app/Http/Controllers/Admin/WorkspaceController.php
@@ -10,6 +10,7 @@
 use App\UsageTrigger;
 use App\PlanUsagePeriod;
 use App\UserInvoice;
+use App\WorkspaceSuspension;
 use App\Http\Requests\Admin\WorkspaceRequest;
 use App\Enums\WorkspaceSuspensionStatus;
 use App\Helpers\MainHelper;
@@ -88,12 +89,15 @@ public function edit(Workspace $workspace)
         $routingACLs = WorkspaceHelper::getACLs($workspace);
         $planHistory = PlanUsagePeriod::where("workspace_id", $workspace->id)->get();
         $gracePeriodExtension = WorkspaceSuspensionHelper::getGracePeriodExtension($workspace->id);
+        $suspensions = WorkspaceSuspension::where('workspace_id', $workspace->id)
+                                            ->orderBy('suspension_initiated_at', 'DESC')
+                                            ->get();
         $isSuspended = NULL;
         if (MainHelper::isWorkspaceSuspended($workspace->id)) {
             $isSuspended = TRUE;
         }
 
-        return view('admin.workspace.create_edit', compact('workspace', 'users', 'billingHistory', 'billingInfo', 'usageTriggers', 'routingACLs', 'planHistory', 'invoices', 'gracePeriodExtension', 'isSuspended'));
+        return view('admin.workspace.create_edit', compact('workspace', 'users', 'billingHistory', 'billingInfo', 'usageTriggers', 'routingACLs', 'suspensions', 'planHistory', 'invoices', 'gracePeriodExtension', 'isSuspended'));
     }
 
     /**
diff --git a/app/app/WorkspaceSuspension.php b/app/app/WorkspaceSuspension.php
index 2f07a79c6..26602049b 100644
--- a/app/app/WorkspaceSuspension.php
+++ b/app/app/WorkspaceSuspension.php
@@ -13,7 +13,6 @@ class WorkspaceSuspension extends Model
     protected $guarded = array('id');
     protected $table = 'workspaces_suspensions';
     protected $casts = array(
-        'status' => 'boolean',
         'grace_period_extension' => 'integer',
     );
 }
diff --git a/app/resources/lang/en/admin/modal.php b/app/resources/lang/en/admin/modal.php
index 20c9df5e1..bc0d06d7b 100755
--- a/app/resources/lang/en/admin/modal.php
+++ b/app/resources/lang/en/admin/modal.php
@@ -31,6 +31,7 @@
     'termination' => 'Termination',
     'did_numbers' => 'DID Numbers',
     'rtpproxies' => 'RTP proxies',
+    'rtpengines' => 'RTP engines',
     'digitmapping' => 'Digit Mapping',
     'plandetails' => 'Plan Details',
     'users' => 'Users',
diff --git a/app/resources/views/admin/siprouter/create_edit.blade.php b/app/resources/views/admin/siprouter/create_edit.blade.php
index cd330622b..988328442 100755
--- a/app/resources/views/admin/siprouter/create_edit.blade.php
+++ b/app/resources/views/admin/siprouter/create_edit.blade.php
@@ -18,6 +18,12 @@
      <li><a href="#tab-rtpproxies" data-toggle="tab"> {{
             trans("admin/modal.rtpproxies") }}</a></li>
             @endif
+            @if (!empty($rtpengines))
+     <li><a href="#tab-rtpengines" data-toggle="tab"> {{
+            trans("admin/modal.rtpengines") }}</a></li>
+            @endif
+
+
 
 </ul>
 <!-- ./ tabs -->
@@ -316,6 +322,33 @@
         </div>
             @endif
 
+    @if (isset($router))
+    <div class="tab-pane" id="tab-rtpengines">
+        <div class="row">
+            <div class="col-md-12">
+                <table class="table stripped">
+                    <thead>
+                        <th>Socket address</th>
+                        <th>Set ID</th>
+                        <th>Priority</th>
+                    </thead>
+                    <tbody>
+                        @foreach ($rtpengines as $engine)
+                            <tr>
+                                <td>{{$engine->socket}}</td>
+                                <td>{{$engine->set_id}}</td>
+                                <td>{{$engine->priority}}</td>
+                            </tr>
+                        @endforeach
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+            @endif
+
+
+
     {!! Form::close() !!}
     @endsection @section('scripts')
         <script type="text/javascript">
diff --git a/app/resources/views/admin/workspace/create_edit.blade.php b/app/resources/views/admin/workspace/create_edit.blade.php
index 4ed830fb9..97824af3c 100755
--- a/app/resources/views/admin/workspace/create_edit.blade.php
+++ b/app/resources/views/admin/workspace/create_edit.blade.php
@@ -118,7 +118,37 @@
             </div>
         </div>
 
+
         <div class="row">
+            <div class="col-md-12">
+                <h3>Suspensions</h3>
+                <table class="table stripped">
+                    <thead>
+                        <th>Suspended At</th>
+                        <th>Suspension Initiated At</th>
+                        <th>Reason</th>
+                        <th>Status</th>
+                    </thead>
+                    <tbody>
+                        @foreach ($suspensions as $record)
+                            <tr>
+                                <td>{{$record['suspended_at']}}</td>
+                                <td>{{$record['suspension_initiated_at']}}</td>
+                                <td>{{$record['reason']}}</td>
+                                <td>
+                                    @if ($record['status'] == 'LIFTED')
+                                        <i class="fa fa-check" style="color:green"></i> Lifted 
+                                    @elseif ($record['status'] == 'SUSPENDED')
+                                        <i class="fa fa-times" style="color:red"></i> Suspended
+                                    @elseif ($record['status'] == 'INITIATED')
+                                        <i class="fa fa-clock-o" style="color:orange"></i> Initiated
+                                    @endif
+                                </td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
             <div class="col-md-12">
                 <h3>Invoices</h3>
                 <table class="table stripped">
@@ -126,27 +156,25 @@
                         <th>Amount</th>
                         <th>Status</th>
                         <th>Date/time</th>
-                        <th>Actions</th>
                     </thead>
                     <tbody>
                         @foreach ($invoices as $record)
                             <tr>
                                 <td>{{$record['dollars']}}</td>
                                 <td>
-                                    @if ($record['status'] == 'COMPLETE')
+                                    @if ($record['status'] == 'PAID')
                                         <i class="fa fa-check" style="color:green"></i> Paid
-                                    @elseif ($record['status'] == 'INCOMPLETE')
-                                        <i class="fa fa-times" style="color:red"></i> Unpaid
+                                    @elseif ($record['status'] == 'FAILED')
+                                        <i class="fa fa-times" style="color:red"></i> Charge Failed
                                     @elseif ($record['status'] == 'REFUNDED')
                                         <i class="fa fa-undo" style="color:orange"></i> Refunded
+                                   @elseif ($record['status'] == 'PENDING')
+                                        <i class="fa fa-clock-o" style="color:orange"></i> Pending
+                                    @else
+                                        {{$record['status']}}
                                     @endif
                                 </td>
                                 <td>{{$record['created_at']}}</td>
-                                <td>
-                                    @if ($record['status'] == 'COMPLETE')
-                                        <button type="button" data-invoice-id="{{$record['id']}}" class="btn btn-sm btn-danger refund-trigger">Refund</button>
-                                    @endif
-                                </td>
                             </tr>
                         @endforeach
                     </tbody>