diff --git a/controllers/ProjectController.php b/controllers/ProjectController.php
index 3b70f3f..af5ddfd 100644
--- a/controllers/ProjectController.php
+++ b/controllers/ProjectController.php
@@ -3425,8 +3425,8 @@ public function actionUserStatistics()
         $user=Userw::getCurrentUser();
         $uid=$user['id'];
         $username=explode('@',$user['username'])[0];
-        $usage_owner=Project::userStatisticsOwner($uid);
-        $usage_participant=Project::userStatisticsParticipant($uid);
+        $usage_owner=Project::userStatisticsOwner($uid, $user['username']);
+        $usage_participant=Project::userStatisticsParticipant($uid, $user['username']);
         return $this->render('user_statistics', ['usage_participant'=>$usage_participant,'usage_owner'=>$usage_owner, 'username'=>$username]);
     }
 
diff --git a/models/Project.php b/models/Project.php
index 2aa346c..a7745af 100644
--- a/models/Project.php
+++ b/models/Project.php
@@ -671,7 +671,7 @@ public static function getMaximumActiveAcceptedProjects($project_type, $requeste
         return $max_per_role[$requested_role];
     }
 
-    public static function userStatisticsParticipant($uid)
+    public static function userStatisticsParticipant($uid, $username)
     {
         $query=new Query;
 
@@ -894,6 +894,63 @@ public static function userStatisticsParticipant($uid)
                         ->andWhere("$uid = ANY(pr.user_list)")
                         ->andWhere(['<>','pr.submitted_by',$uid])
                         ->count();
+
+        $query=new Query;
+        $active_notebooks=$query->select(['pr.id'])
+                        ->from('project_request as pr')
+                        ->innerJoin('jupyter_request_n as o','o.request_id=pr.id')
+                        ->where(['IN','pr.status',[1,2]])
+                        ->andWhere(['>','pr.end_date','NOW()'])
+                        ->andWhere("$uid = ANY(pr.user_list)")
+                        ->andWhere(['<>','pr.submitted_by',$uid])
+                        ->count();
+
+        $query=new Query;
+        $expired_notebooks=$query->select(['pr.id'])
+                        ->from('project_request as pr')
+                        ->innerJoin('jupyter_request_n as o','o.request_id=pr.id')
+                        ->where(['IN','pr.status',[1,2]])
+                        ->andWhere(['<=','pr.end_date','NOW()'])
+                        ->andWhere("$uid = ANY(pr.user_list)")
+                        ->andWhere(['<>','pr.submitted_by',$uid])
+                        ->count();
+
+        $query=new Query;
+        $total_notebooks=$query->select(['pr.id'])
+                        ->from('project_request as pr')
+                        ->innerJoin('jupyter_request_n as o','o.request_id=pr.id')
+                        ->where(['IN','pr.status',[1,2]])
+                        ->andWhere("$uid = ANY(pr.user_list)")
+                        ->andWhere(['<>','pr.submitted_by',$uid])
+                        ->count();
+
+        $query=new Query;
+        $active_servers=$query->select(['s.id'])
+                        ->from('project_request as pr')
+                        ->innerJoin('jupyter_request_n as o','o.request_id=pr.id')
+                        ->innerJoin('jupyter_server as s','pr.name=s.project')
+                        ->where(['s.created_by'=>$username])
+                        ->andwhere(['IN','pr.status',[1,2]])
+                        ->andWhere(['s.active'=>'t'])
+                        ->andWhere("$uid = ANY(pr.user_list)")
+                        ->andWhere(['<>','pr.submitted_by',$uid])
+                        ->count();
+
+        $query=new Query;
+        $inactive_servers=$query->select(['s.id'])
+                        ->from('project_request as pr')
+                        ->innerJoin('jupyter_request_n as o','o.request_id=pr.id')
+                        ->innerJoin('jupyter_server as s','pr.name=s.project')
+                        ->andwhere(['IN','pr.status',[1,2]])
+                        ->where(['s.created_by'=>$username])
+                        ->andWhere(['s.active'=>'f'])
+                        ->andWhere("$uid = ANY(pr.user_list)")
+                        ->andWhere(['<>','pr.submitted_by',$uid])
+                        ->count();
+
+        $total_servers=$active_servers+$inactive_servers;
+                                
+
         
 
         $final=[
@@ -931,13 +988,19 @@ public static function userStatisticsParticipant($uid)
             'number_volumes_machines'=>$volumes_machines['number'],
             'size_storage_service'=>$volumes_service['total']/1024.0,
             'size_storage_machines'=>$volumes_machines['total']/1024.0,
+            'active_notebooks'=>$active_notebooks,
+            'expired_notebooks'=>$expired_notebooks,
+            'total_notebooks'=>$total_notebooks,
+            'active_servers'=>$active_servers,
+            'inactive_servers'=>$inactive_servers,
+            'total_servers'=>$total_servers,
 
 
         ];
         return $final;
     }
 
-    public static function userStatisticsOwner($uid)
+    public static function userStatisticsOwner($uid, $username)
     {
         $query=new Query;
 
@@ -1148,6 +1211,54 @@ public static function userStatisticsOwner($uid)
                         ->andWhere(['pr.submitted_by'=>$uid])
                         ->count();
 
+        $query=new Query;
+        $active_notebooks=$query->select(['p.id'])
+            ->from('project_request as pr')
+            ->innerJoin('project as p', 'p.latest_project_request_id=pr.id' )
+            ->innerJoin('jupyter_request_n as o','o.request_id=pr.id')
+            ->where(['IN','pr.status',[1,2]])
+            ->andWhere(['>','pr.end_date','NOW()'])
+            ->andWhere(['pr.submitted_by'=>$uid])
+            ->count();
+
+        $query=new Query;
+
+        $expired_notebooks=$query->select(['p.id'])
+                        ->from('project_request as pr')
+                        ->innerJoin('project as p', 'p.latest_project_request_id=pr.id' )
+                        ->innerJoin('jupyter_request_n as o','o.request_id=pr.id')
+                        ->where(['IN','pr.status',[1,2]])
+                        ->andWhere(['<','pr.end_date','NOW()'])
+                        ->andWhere(['pr.submitted_by'=>$uid])
+                        ->count();
+
+        $query=new Query;
+
+        $total_notebooks=$query->select(['p.id'])
+                        ->from('project_request as pr')
+                        ->innerJoin('project as p', 'p.latest_project_request_id=pr.id' )
+                        ->innerJoin('jupyter_request_n as o','o.request_id=pr.id')
+                        ->where(['IN','pr.status',[1,2]])
+                        ->andWhere(['pr.submitted_by'=>$uid])
+                        ->count();
+
+        $query=new Query;
+        $active_servers=$query->select(['s.id'])
+                        ->from('jupyter_server as s')
+                        ->where(['s.created_by'=>$username])
+                        ->andWhere(['s.active'=>'t'])
+                        ->count();
+
+        $query=new Query;
+        $inactive_servers=$query->select(['s.id'])
+                        ->from('jupyter_server as s')
+                        ->where(['s.created_by'=>$username])
+                        ->andWhere(['s.active'=>'f'])
+                        ->count();
+
+        $total_servers=$active_servers+$inactive_servers;
+                
+
         $final=[
             'active_services'=>$active_services,
             'expired_services'=>$expired_services,
@@ -1183,6 +1294,12 @@ public static function userStatisticsOwner($uid)
             'number_volumes_machines'=>$volumes_machines['number'],
             'size_storage_service'=>$volumes_service['total']/1024.0,
             'size_storage_machines'=>$volumes_machines['total']/1024.0,
+            'active_notebooks'=>$active_notebooks,
+            'expired_notebooks'=>$expired_notebooks,
+            'total_notebooks'=>$total_notebooks,
+            'active_servers'=>$active_servers,
+            'inactive_servers'=>$inactive_servers,
+            'total_servers'=>$total_servers,
 
 
         ];
diff --git a/views/project/user_statistics.php b/views/project/user_statistics.php
index 6c2ddb8..068d8d7 100644
--- a/views/project/user_statistics.php
+++ b/views/project/user_statistics.php
@@ -11,9 +11,10 @@
 use yii\helpers\Html;
 use yii\widgets\LinkPager;
 
-$this->title="Statistics for user $username";
+echo Html::CssFile('@web/css/project/index.css');
+$this->registerCssFile("@web/css/project/index.css");
 
-echo Html::cssFile('@web/css/project/project_details.css');
+$this->title="Statistics for user $username";
 
 $back_icon='<i class="fas fa-arrow-left"></i>';
 /*
@@ -32,261 +33,241 @@
 
 <div class="row">&nbsp;</div>
 
-<div class="col-md-12 text-center"><h2><strong>24/7 services (as Owner)</strong></h2></div>
-<div class="table-responsive">
+<div class="text-center"><h2><strong>24/7 services</strong></h2></div>
+
+<div class="table table-bordered">
     <table class="table table-striped">
+        <thead>
+            <tr>
+                <th class="text-center" scope="col" style="width: 23.333%"></th>
+                <th class="text-center" scope="col" style="width: 38.3333% text-align: center">As owner</th>
+                <th class="text-center" scope="col" style="width: 38.3333%">As participant</th>
+            </tr>
+        </thead>
         <tbody>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Active projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['active_services'] ?></td>
+                <th class="text-left" scope="row">Active projects</th>
+                <td class="text-center" ><?= $usage_owner['active_services'] ?></td>
+                <td class="text-center"><?= $usage_participant['active_services'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Expired projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['expired_services'] ?></td>
+                <th class="text-left" scope="row">Expired projects</th>
+                <td class="text-center" ><?= $usage_owner['expired_services'] ?></td>
+                <td class="text-center"><?= $usage_participant['expired_services'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Total  projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['total_services'] ?></td>
+                <th class="text-left" scope="row">Total projects</th>
+                <td class="text-center" ><?= $usage_owner['total_services'] ?></td>
+                <td class="text-center"><?= $usage_participant['total_services'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Active VMs</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['vms_services_active'] ?></td>
+                <th class="text-left" scope="row">Active VMs</th>
+                <td class="text-center" ><?= $usage_owner['vms_services_active'] ?></td>
+                <td class="text-center"><?= $usage_participant['vms_services_active'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Total VMs</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['vms_services_total'] ?></td>
+                <th class="text-left" scope="row">Total VMs</th>
+                <td class="text-center" ><?= $usage_owner['vms_services_total'] ?></td>
+                <td class="text-center"><?= $usage_participant['vms_services_total'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Active used virtual CPUs</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['active_services_cores'] ?></td>
+                <th class="text-left" scope="row">Active used virtual CPUs</th>
+                <td class="text-center" ><?= empty($usage_owner['active_services_cores'])?'0':$usage_owner['active_services_cores'] ?></td>
+                <td class="text-center"><?= empty($usage_participant['active_services_cores'])?'0':$usage_participant['active_services_cores'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Active used RAM (GB)</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['active_services_ram'] ?></td>
+                <th class="text-left" scope="row">Total used virtual CPUs</th>
+                <td class="text-center" ><?= empty($usage_owner['total_services_cores'])?'0':$usage_owner['total_services_cores'] ?></td>
+                <td class="text-center"><?= empty($usage_participant['total_services_cores'])?'0':$usage_participant['total_services_cores'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Total used virtual CPUs</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['total_services_cores'] ?></td>
+                <th class="text-left" scope="row">Active used RAM(GB)</th>
+                <td class="text-center" ><?= empty($usage_owner['active_services_ram'])?'0':$usage_owner['active_services_ram'] ?></td>
+                <td class="text-center"><?= empty($usage_participant['active_services_ram'])?'0':$usage_participant['active_services_ram'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Total used RAM (GB)</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['total_services_ram'] ?></td>
+                <th class="text-left" scope="row">Total used RAM(GB)</th>
+                <td class="text-center" ><?= empty($usage_owner['total_services_ram'])?'0':$usage_owner['total_services_ram'] ?></td>
+                <td class="text-center"><?= empty($usage_participant['total_services_ram'])?'0':$usage_participant['total_services_ram'] ?></td>
             </tr>
         </tbody>
     </table>
 </div>
 
-<div class="col-md-12 text-center"><h2><strong>24/7 services (as Participant)</strong></h2></div>
-<div class="table-responsive">
+<div class="row">&nbsp;</div>
+
+<div class="text-center"><h2><strong>On-demand computation machines</strong></h2></div>
+
+<div class="table table-bordered">
     <table class="table table-striped">
+        <thead>
+            <tr>
+                <th class="text-center" scope="col" style="width: 23.333%"></th>
+                <th class="text-center" scope="col" style="width: 38.3333% text-align: center">As owner</th>
+                <th class="text-center" scope="col" style="width: 38.3333%">As participant</th>
+            </tr>
+        </thead>
         <tbody>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Active projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['active_services'] ?></td>
+                <th class="text-left" scope="row">Active projects</th>
+                <td class="text-center" ><?= $usage_owner['active_machines'] ?></td>
+                <td class="text-center"><?= $usage_participant['active_machines'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Expired projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['expired_services'] ?></td>
+                <th class="text-left" scope="row">Expired projects</th>
+                <td class="text-center" ><?= $usage_owner['expired_machines'] ?></td>
+                <td class="text-center"><?= $usage_participant['expired_machines'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Total  projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['total_services'] ?></td>
+                <th class="text-left" scope="row">Total projects</th>
+                <td class="text-center" ><?= $usage_owner['total_machines'] ?></td>
+                <td class="text-center"><?= $usage_participant['total_machines'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Active VMs</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['vms_services_active'] ?></td>
+                <th class="text-left" scope="row">Active VMs</th>
+                <td class="text-center" ><?= $usage_owner['vms_machines_active'] ?></td>
+                <td class="text-center"><?= $usage_participant['vms_machines_active'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Total VMs</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['vms_services_total'] ?></td>
+                <th class="text-left" scope="row">Total VMs</th>
+                <td class="text-center" ><?= $usage_owner['vms_machines_total'] ?></td>
+                <td class="text-center"><?= $usage_participant['vms_machines_total'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Active used virtual CPUs</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['active_services_cores'] ?></td>
+                <th class="text-left" scope="row">Active used virtual CPUs</th>
+                <td class="text-center" ><?= empty($usage_owner['active_machines_cores'])?'0': $usage_owner['active_machines_cores'] ?></td>
+                <td class="text-center"><?= empty($usage_participant['active_machines_cores'])?'0': $usage_participant['active_machines_cores'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Active used RAM (GB)</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['active_services_ram'] ?></td>
+                <th class="text-left" scope="row">Total used virtual CPUs</th>
+                <td class="text-center" ><?= empty($usage_owner['total_machines_cores'])?'0': $usage_owner['total_machines_cores'] ?></td>
+                <td class="text-center"><?= empty($usage_participant['total_machines_cores'])?'0': $usage_participant['total_machines_cores'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Total used virtual CPUs</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['total_services_cores'] ?></td>
+                <th class="text-left" scope="row">Active used RAM(GB)</th>
+                <td class="text-center" ><?= empty($usage_owner['active_machines_ram'])?'0': $usage_owner['active_machines_ram'] ?></td>
+                <td class="text-center"><?= empty($usage_participant['active_machines_ram'])?'0': $usage_participant['active_machines_ram'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Total used RAM (GB)</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['total_services_ram'] ?></td>
+                <th class="text-left" scope="row">Total used RAM(GB)</th>
+                <td class="text-center" ><?= empty($usage_owner['total_machines_ram'])?'0': $usage_owner['total_machines_ram'] ?></td>
+                <td class="text-center"><?= empty($usage_participant['total_machines_ram'])?'0': $usage_participant['total_machines_ram'] ?></td>
             </tr>
         </tbody>
     </table>
 </div>
 
-<div class="col-md-12 text-center"><h2><strong>On-demand computation machines (as Owner)</strong></h2></div>
-<div class="table-responsive">
+<div class="row">&nbsp;</div>
+
+<div class="text-center"><h2><strong>On-demand batch computations</strong></h2></div>
+
+<div class="table table-bordered">
     <table class="table table-striped">
-        <tbody>
-            <tr>
-                <th class="col-md-6 text-right" scope="col">Active projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['active_machines'] ?></td>
-            </tr>
-            <tr>
-                <th class="col-md-6 text-right" scope="col">Expired projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['expired_machines'] ?></td>
-            </tr>
+        <thead>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Total projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['total_machines'] ?></td>
-            </tr>
-            <tr>
-                <th class="col-md-6 text-right" scope="col"> Active  VMs</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['vms_machines_active'] ?></td>
-            </tr>
-            <tr>
-                <th class="col-md-6 text-right" scope="col"> Total VMs</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['vms_machines_total'] ?></td>
-            </tr>
-            <tr>
-                <th class="col-md-6 text-right" scope="col">Active used virtual CPUs</th>
-                <td class="col-md-6 text-left" scope="col"><?= empty($usage_owner['active_machines_cores'])?'0': $usage_owner['active_machines_cores'] ?></td>
+                <th class="text-center" scope="col" style="width: 23.333%"></th>
+                <th class="text-center" scope="col" style="width: 38.3333% text-align: center">As owner</th>
+                <th class="text-center" scope="col" style="width: 38.3333%">As participant</th>
             </tr>
+        </thead>
+        <tbody>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Active  used RAM (GB)</th>
-                <td class="col-md-6 text-left" scope="col"><?= empty($usage_owner['active_machines_ram'])?'0': $usage_owner['active_machines_ram'] ?></td>
+                <th class="text-left" scope="row">Active projects</th>
+                <td class="text-center" ><?= $usage_owner['active_ondemand'] ?></td>
+                <td class="text-center"><?= $usage_participant['active_ondemand'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Total used virtual CPUs</th>
-                <td class="col-md-6 text-left" scope="col"><?= empty($usage_owner['total_machines_cores'])?'0': $usage_owner['total_machines_cores'] ?></td>
+                <th class="text-left" scope="row">Expired projects</th>
+                <td class="text-center" ><?= $usage_owner['expired_ondemand'] ?></td>
+                <td class="text-center"><?= $usage_participant['expired_ondemand'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Total  used RAM (GB)</th>
-                <td class="col-md-6 text-left" scope="col"><?= empty($usage_owner['total_machines_ram'])?'0': $usage_owner['total_machines_ram'] ?></td>
+                <th class="text-left" scope="row">Total projects</th>
+                <td class="text-center" ><?= $usage_owner['total_ondemand'] ?></td>
+                <td class="text-center"><?= $usage_participant['total_ondemand'] ?></td>
             </tr>
-    </tbody>
+        </tbody>
     </table>
 </div>
 
-<div class="col-md-12 text-center"><h2><strong>On-demand computation machines (as Participant)</strong></h2></div>
-<div class="table-responsive">
+<div class="row">&nbsp;</div>
+
+<div class="text-center"><h2><strong>On-demand notebooks</strong></h2></div>
+
+<div class="table table-bordered">
     <table class="table table-striped">
-        <tbody>
-            <tr>
-                <th class="col-md-6 text-right" scope="col">Active projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['active_machines'] ?></td>
-            </tr>
-            <tr>
-                <th class="col-md-6 text-right" scope="col">Expired projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['expired_machines'] ?></td>
-            </tr>
+        <thead>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Total projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['total_machines'] ?></td>
+                <th class="text-center" scope="col" style="width: 23.333%"></th>
+                <th class="text-center" scope="col" style="width: 38.3333% text-align: center">As owner</th>
+                <th class="text-center" scope="col" style="width: 38.3333%">As participant</th>
             </tr>
+        </thead>
+        <tbody>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Active  VMs</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['vms_machines_active'] ?></td>
+                <th class="text-left" scope="row">Active projects</th>
+                <td class="text-center" ><?= $usage_owner['active_notebooks'] ?></td>
+                <td class="text-center"><?= $usage_participant['active_notebooks'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Total VMs</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['vms_machines_total'] ?></td>
+                <th class="text-left" scope="row">Expired projects</th>
+                <td class="text-center" ><?= $usage_owner['expired_notebooks'] ?></td>
+                <td class="text-center"><?= $usage_participant['expired_notebooks'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Active used virtual CPUs</th>
-                <td class="col-md-6 text-left" scope="col"><?= empty($usage_participant['active_machines_cores'])?'0': $usage_participant['active_machines_cores'] ?></td>
+                <th class="text-left" scope="row">Total projects</th>
+                <td class="text-center" ><?= $usage_owner['total_notebooks'] ?></td>
+                <td class="text-center"><?= $usage_participant['total_notebooks'] ?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Active  used RAM (GB)</th>
-                <td class="col-md-6 text-left" scope="col"><?= empty($usage_participant['active_machines_ram'])?'0': $usage_participant['active_machines_ram'] ?></td>
+                <th class="text-left" scope="row">Active servers</th>
+                <td class="text-center" ><?= $usage_owner['active_servers'] ?></td>
+                <td class="text-center"><?=$usage_participant['active_servers']?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Total used virtual CPUs</th>
-                <td class="col-md-6 text-left" scope="col"><?= empty($usage_participant['total_machines_cores'])?'0': $usage_participant['total_machines_cores'] ?></td>
+                <th class="text-left" scope="row">Deleted servers</th>
+                <td class="text-center" ><?= $usage_owner['inactive_servers'] ?></td>
+                <td class="text-center"><?=$usage_participant['inactive_servers']?></td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col"> Total  used RAM (GB)</th>
-                <td class="col-md-6 text-left" scope="col"><?= empty($usage_participant['total_machines_ram'])?'0': $usage_participant['total_machines_ram'] ?></td>
+                <th class="text-left" scope="row">Total servers</th>
+                <td class="text-center" ><?= $usage_owner['total_servers'] ?></td>
+                <td class="text-center"><?=$usage_participant['total_servers']?></td>
             </tr>
-    </tbody>
+        </tbody>
     </table>
 </div>
 
+<div class="row">&nbsp;</div>
 
-<div class="col-md-12 text-center"><h2><strong>On-demand batch computations (as Owner)</strong></h2></div>
-<div class="table-responsive">
-    <table class="table table-striped">
-        <tbody>
-
-            <tr>
-                <th class="col-md-6 text-right" scope="col">Active projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['active_ondemand'] ?></td>
-            </tr>
-            <tr>
-                <th class="col-md-6 text-right" scope="col">Expired projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['expired_ondemand'] ?></td>
-            </tr>
-            <tr>
-                <th class="col-md-6 text-right" scope="col">Total projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['total_ondemand'] ?></td>
-            </tr>
-        </tbody>
-    </table>
-</div>
+<div class="text-center"><h2><strong>Storage volumes</strong></h2></div>
 
-<div class="col-md-12 text-center"><h2><strong>On-demand batch computations (as Participant)</strong></h2></div>
-<div class="table-responsive">
+<div class="table table-bordered">
     <table class="table table-striped">
-        <tbody>
-
-            <tr>
-                <th class="col-md-6 text-right" scope="col">Active projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['active_ondemand'] ?></td>
-            </tr>
+        <thead>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Expired projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['expired_ondemand'] ?></td>
+                <th class="text-center" scope="col" style="width: 23.333%"></th>
+                <th class="text-center" scope="col" style="width: 38.3333% text-align: center">As owner</th>
+                <th class="text-center" scope="col" style="width: 38.3333%">As participant</th>
             </tr>
-            <tr>
-                <th class="col-md-6 text-right" scope="col">Total projects</th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['total_ondemand'] ?></td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-
-<div class="col-md-12 text-center"><h2><strong>Storage volumes (as Owner)</strong></h2></div>
-<div class="table-responsive">
-    <table class="table table-striped">
+        </thead>
         <tbody>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Total projects </th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['total_storage_projects'] ?> (<?= $usage_owner['number_storage_service_projects']?> for 24/7 service, <?= $usage_owner['number_storage_machines_projects']?> for on-demand compute machines)</td> 
+                <th class="text-left" scope="row">Total projects</th>
+                <td class="text-center" ><?= $usage_owner['total_storage_projects'] ?> (<?= $usage_owner['number_storage_service_projects']?> for 24/7 service, <?= $usage_owner['number_storage_machines_projects']?> for on-demand compute machines)</td>
+                <td class="text-center"><?= $usage_participant['total_storage_projects'] ?> (<?= $usage_participant['number_storage_service_projects']?> for 24/7 service, <?= $usage_participant['number_storage_machines_projects']?> for on-demand compute machines)</td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Total volumes </th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_owner['total_volumes'] ?> (<?= $usage_owner['number_volumes_service']?> for 24/7 service, <?= $usage_owner['number_volumes_machines']?> for on-demand compute machines)</td> 
+                <th class="text-left" scope="row">Total volumes</th>
+                <td class="text-center" ><?= $usage_owner['total_volumes'] ?> (<?= $usage_owner['number_volumes_service']?> for 24/7 service, <?= $usage_owner['number_volumes_machines']?> for on-demand compute machines)</td>
+                <td class="text-center"><?= $usage_participant['total_volumes'] ?> (<?= $usage_participant['number_volumes_service']?> for 24/7 service, <?= $usage_participant['number_volumes_machines']?> for on-demand compute machines)</td>
             </tr>
             <tr>
-                <th class="col-md-6 text-right" scope="col">Total used storage (TB)</th>
-                <td class="col-md-6 text-left" scope="col"><?= number_format($usage_owner['total_storage_size'],2) ?> TB (<?= number_format($usage_owner['size_storage_service'],2)?> TB for 24/7 service, <?= number_format($usage_owner['size_storage_machines'],2)?> TB for compute machines)</td>
+                <th class="text-left" scope="row">Total used storage (TB)</th>
+                <td class="text-center" ><?= number_format($usage_owner['total_storage_size'],2) ?> TB (<?= number_format($usage_owner['size_storage_service'],2)?> TB for 24/7 service, <?= number_format($usage_owner['size_storage_machines'],2)?> TB for compute machines)</td>
+                <td class="text-center"><?= number_format($usage_participant['total_storage_size'],2) ?> TB (<?= number_format($usage_participant['size_storage_service'],2)?> TB for 24/7 service, <?= number_format($usage_participant['size_storage_machines'],2)?> TB for compute machines)</td>
             </tr>
         </tbody>
     </table>
 </div>
 
-<div class="col-md-12 text-center"><h2><strong>Storage volumes (as Participant)</strong></h2></div>
-<div class="table-responsive">
-    <table class="table table-striped">
-        <tbody>
-            <tr>
-                <th class="col-md-6 text-right" scope="col">Total projects </th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['total_storage_projects'] ?> (<?= $usage_participant['number_storage_service_projects']?> for 24/7 service, <?= $usage_participant['number_storage_machines_projects']?> for on-demand compute machines)</td> 
-            </tr>
-            <tr>
-                <th class="col-md-6 text-right" scope="col">Total volumes </th>
-                <td class="col-md-6 text-left" scope="col"><?= $usage_participant['total_volumes'] ?> (<?= $usage_participant['number_volumes_service']?> for 24/7 service, <?= $usage_participant['number_volumes_machines']?> for on-demand compute machines)</td> 
-            </tr>
-            <tr>
-                <th class="col-md-6 text-right" scope="col">Total used storage (TB)</th>
-                <td class="col-md-6 text-left" scope="col"><?= number_format($usage_participant['total_storage_size'],2) ?> TB (<?= number_format($usage_participant['size_storage_service'],2)?> TB for 24/7 service, <?= number_format($usage_participant['size_storage_machines'],2)?> TB for compute machines)</td>
-            </tr>
-        </body>
-    </table>
-</div>
diff --git a/web/css/project/index.css b/web/css/project/index.css
index 8f2135d..fe49c0a 100644
--- a/web/css/project/index.css
+++ b/web/css/project/index.css
@@ -12,7 +12,6 @@
 	
 }
 
-
 .bronze-user
 {