diff --git a/burpui/templates/backup-report.html b/burpui/templates/backup-report.html
index 8c343f61..67464d35 100644
--- a/burpui/templates/backup-report.html
+++ b/burpui/templates/backup-report.html
@@ -19,40 +19,52 @@
           <h1 class="page-header">{{ _('Backup n°%(number)s of %(client)s', number=mypad(nbackup), client=cname) }}</h1>
           <div class="row placeholders">
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_new" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('New') }}</h4>
+                <div class="mycharts" id="chart_new" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('New') }}</h4>
             </div>
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_changed" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Changed') }}</h4>
+                <div class="mycharts" id="chart_changed" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Changed') }}</h4>
             </div>
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_unchanged" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Unchanged') }}</h4>
+                <div class="mycharts" id="chart_unchanged" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Unchanged') }}</h4>
             </div>
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_deleted" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Deleted') }}</h4>
+                <div class="mycharts" id="chart_deleted" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Deleted') }}</h4>
             </div>
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_total" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Total') }}</h4>
+                <div class="mycharts" id="chart_total" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Total') }}</h4>
             </div>
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_scanned" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Scanned') }}</h4>
+                <div class="mycharts" id="chart_scanned" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Scanned') }}</h4>
             </div>
             <!--
             <div class="col-xs-12 col-sm-12 placeholder">
@@ -74,8 +86,10 @@
             </div>
             -->
             <div class="col-xs-12 col-sm-12 placeholder">
-              <div class="mycharts" id="chart_combined" style="height: 450px;">
-                <svg></svg>
+              <div class="well">
+                <div class="mycharts" id="chart_combined" style="height: 450px;">
+                  <svg></svg>
+                </div>
               </div>
             </div>
           </div>
diff --git a/burpui/templates/client-report.html b/burpui/templates/client-report.html
index c3fdde06..46a7a19c 100644
--- a/burpui/templates/client-report.html
+++ b/burpui/templates/client-report.html
@@ -17,46 +17,60 @@
           <h1 class="page-header">{{ cname }}</h1>
           <div class="row placeholders">
             <div class="col-xs-12 col-sm-12 placeholder">
-              <div class="mycharts" id="chart_new" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('New') }}</h4>
+                <div class="mycharts" id="chart_new" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('New') }}</h4>
             </div>
             <div class="col-xs-12 col-sm-12 placeholder">
-              <div class="mycharts" id="chart_changed" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Changed') }}</h4>
+                <div class="mycharts" id="chart_changed" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Changed') }}</h4>
             </div>
             <div class="col-xs-12 col-sm-12 placeholder">
-              <div class="mycharts" id="chart_unchanged" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Unchanged') }}</h4>
+                <div class="mycharts" id="chart_unchanged" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Unchanged') }}</h4>
             </div>
             <div class="col-xs-12 col-sm-12 placeholder">
-              <div class="mycharts" id="chart_deleted" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Deleted') }}</h4>
+                <div class="mycharts" id="chart_deleted" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Deleted') }}</h4>
             </div>
             <div class="col-xs-12 col-sm-12 placeholder">
-              <div class="mycharts" id="chart_total" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Total') }}</h4>
+                <div class="mycharts" id="chart_total" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Total') }}</h4>
             </div>
             <div class="col-xs-12 col-sm-12 placeholder">
-              <div class="mycharts" id="chart_scanned" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Scanned') }}</h4>
+                <div class="mycharts" id="chart_scanned" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Scanned') }}</h4>
             </div>
             <div class="col-xs-12 col-sm-12 placeholder">
-              <div class="mycharts" id="chart_stats" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Statistics') }}</h4>
+                <div class="mycharts" id="chart_stats" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Statistics') }}</h4>
             </div>
           </div>
         </div>
diff --git a/burpui/templates/clients-report.html b/burpui/templates/clients-report.html
index efbf38a4..a4d300d7 100644
--- a/burpui/templates/clients-report.html
+++ b/burpui/templates/clients-report.html
@@ -43,30 +43,39 @@
               </div>
             </form>
           </div>
+          <div class="row"><br/></div>
           <div class="row placeholders">
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_repartition" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Clients repartition') }}</h4>
+                <div class="mycharts" id="chart_repartition" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Clients repartition') }}</h4>
             </div>
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_size" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Used space') }}</h4>
+                <div class="mycharts" id="chart_size" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Used space') }}</h4>
             </div>
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_files" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Total files') }}</h4>
+                <div class="mycharts" id="chart_files" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Total files') }}</h4>
             </div>
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_backups" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Number of backups') }}</h4>
+                <div class="mycharts" id="chart_backups" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Number of backups') }}</h4>
             </div>
           </div>
         </div>
diff --git a/burpui/templates/servers-report.html b/burpui/templates/servers-report.html
index 0d29f43b..47bf7876 100644
--- a/burpui/templates/servers-report.html
+++ b/burpui/templates/servers-report.html
@@ -10,28 +10,36 @@
           <h1 class="page-header">{{ _('Global report') }}</h1>
           <div class="row placeholders">
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_repartition" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Clients repartition per server') }}</h4>
+                <div class="mycharts" id="chart_repartition" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Clients repartition per server') }}</h4>
             </div>
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_size" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Used space') }}</h4>
+                <div class="mycharts" id="chart_size" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Used space') }}</h4>
             </div>
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_files" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Total files') }}</h4>
+                <div class="mycharts" id="chart_files" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Total files') }}</h4>
             </div>
             <div class="col-xs-6 col-sm-6 placeholder">
-              <div class="mycharts" id="chart_backups" style="height: 350px;">
-                <svg></svg>
+              <div class="well">
+                <h4>{{ _('Number of backups') }}</h4>
+                <div class="mycharts" id="chart_backups" style="height: 350px;">
+                  <svg></svg>
+                </div>
               </div>
-              <h4>{{ _('Number of backups') }}</h4>
             </div>
           </div>
         </div>
diff --git a/burpui/templates/user.html b/burpui/templates/user.html
index 4c6fa209..4ba6b4b7 100644
--- a/burpui/templates/user.html
+++ b/burpui/templates/user.html
@@ -54,8 +54,8 @@
                 </div>
                 <div class="form-group">
                   <div class="col-lg-10 col-lg-offset-2">
-                    <button type="reset" class="btn btn-default">{{ _('Cancel') }}</button>
-                    <button type="submit" class="btn btn-primary" ng-disabled="changePassword.$invalid && changePassword.$dirty">{{ _('Submit') }}</button>
+                    <button type="submit" class="btn btn-primary" ng-disabled="changePassword.$invalid && changePassword.$dirty"><span class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span>&nbsp;{{ _('Save') }}</button>
+                    <button type="reset" class="btn btn-default"><span class="glyphicon glyphicon-remove-circle" aria-hidden="true"></span>&nbsp;{{ _('Cancel') }}</button>
                   </div>
                 </div>
               </fieldset>
@@ -88,8 +88,8 @@
                 </div>
                 <div class="form-group">
                   <div class="col-lg-10 col-lg-offset-2">
-                    <button type="reset" class="btn btn-default">{{ _('Cancel') }}</button>
-                    <button type="submit" class="btn btn-primary">{{ _('Submit') }}</button>
+                    <button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span>&nbsp;{{ _('Save') }}</button>
+                    <button type="reset" class="btn btn-default"><span class="glyphicon glyphicon-remove-circle" aria-hidden="true"></span>&nbsp;{{ _('Cancel') }}</button>
                   </div>
                 </div>
               </fieldset>