diff --git a/components/views/overlay.php b/components/views/overlay.php
index 6947fdd..a4c818c 100644
--- a/components/views/overlay.php
+++ b/components/views/overlay.php
@@ -23,7 +23,7 @@
                               'items' => array(
                                   array(
                                       'buttonType'  => 'link',
-                                      'label'       => 'Edit Widget <span class="label '.$model->statusCssClass.'">' . $model->status . '</span>',
+                                      'label'       => 'Edit Widget <span class="label label-'.$model->statusCssClass.'">' . $model->status . '</span>',
                                       'visible'     => $model->isUpdateable,
                                       'url'         => array(
                                           '/p3widgets/p3Widget/update',
@@ -61,7 +61,7 @@
                                   ),
                                   array(
                                       'buttonType'  => 'link',
-                                      'label' => 'Edit Translation <span class="label">' . $model->translationModel->status . '</span>',
+                                      'label' => 'Edit Translation <span class="label label-'.$model->translationModel->statusCssClass.'">' . $model->translationModel->status . '</span>',
                                       'visible'     => ($model->translationModel->isUpdateable && !$model->translationModel->isNewRecord),
                                       'url'         => array(
                                           '/p3widgets/p3WidgetTranslation/update',
@@ -83,7 +83,7 @@
 
 
         if ($model->isUpdateable) {
-            echo '<div class="handle">';
+            echo ' <div class="handle">';
             $this->widget(
                  'TbButton',
                      array(
@@ -147,13 +147,6 @@
                               'returnUrl' => Yii::app()->request->getUrl()
                           ),
                           'icon'        => 'plus',
-                          'htmlOptions' => array(
-                              'data-toggle'    => 'tooltip',
-                              'data-placement' => 'bottom',
-                              'title'          => "Create a new Widget in container {$this->id}"
-                          )
-                      ),
-                      array(
                           'items' => Yii::app()->getModule('p3widgets')->buildWidgetMenuItems($widgetAttributes)
                       ),
                   ),
diff --git a/components/views/widget.php b/components/views/widget.php
index 15aab91..22728d6 100644
--- a/components/views/widget.php
+++ b/components/views/widget.php
@@ -1,6 +1,10 @@
 <div class="widget"
      data-toggle="tooltip"
-     title="<?php echo "{$model->alias} #{$model->id}" ?>"
+     data-html="true"
+     title="<?php echo "{$model->alias}
+        <span class='label label-{$model->statusCssClass}'><i class='icon icon-pencil'></i></span>
+        <span class='label label-{$model->translationModel->statusCssClass}'><i class='icon icon-flag'></i></span>
+        " ?>"
      id="<?php echo P3WidgetContainer::WIDGET_CSS_PREFIX . $model->id ?>">
 
     <?php $this->render(
diff --git a/models/P3Widget.php b/models/P3Widget.php
index 1f86bfd..b7336ec 100644
--- a/models/P3Widget.php
+++ b/models/P3Widget.php
@@ -31,7 +31,7 @@ public function init()
 
     public function getItemLabel()
     {
-        return '#' . $this->id . ' ' . $this->alias . ' ' . $this->module_id . '/' . $this->controller_id . '/' . $this->action_name . '/' . $this->container_id . '/' . $this->request_param . ':' . $this->rank;
+        return '#' . $this->id . ' ' . $this->alias . ' /' . $this->module_id . '/' . $this->controller_id . '/' . $this->action_name . '/' . $this->request_param . ' ' . $this->container_id . ':' . $this->rank;
     }
 
     public function behaviors()