diff --git a/module/story/css/create.css b/module/story/css/create.css
index 73c283b6c5..168ca0b892 100644
--- a/module/story/css/create.css
+++ b/module/story/css/create.css
@@ -4,3 +4,10 @@ select {border:1px solid #ccc}
 
 .row .col-sm-8{width:76%}
 .row .col-sm-2{padding-left:0px; padding-right:0px; width:12%}
+
+#dataform .input-group-btn > .btn + .btn {margin-left: -1px;}
+#dataform .input-group-addon > .checkbox-inline {padding-right: 10px;}
+#dataform .input-group .chosen-container-single .chosen-single {border-top-right-radius: 0; border-bottom-right-radius: 0}
+#title.form-control {border-top-right-radius: 0; border-bottom-right-radius: 0}
+
+.dropdown-pris > .btn {background-color: #fff;}
diff --git a/module/story/js/create.js b/module/story/js/create.js
index bad3c11473..9ed93eb63f 100644
--- a/module/story/js/create.js
+++ b/module/story/js/create.js
@@ -9,17 +9,21 @@ $(function()
         $('#assignedTo').removeAttr('disabled');
     }
     $('#assignedTo').trigger("chosen:updated");
-})
 
-$('#needNotReview').change(function()
-{
-    if($('#needNotReview').prop('checked'))
+    $('#needNotReview').change(function()
     {
-        $('#assignedTo').attr('disabled', 'disabled');
-    }
-    else
-    {
-        $('#assignedTo').removeAttr('disabled');
-    }
-    $('#assignedTo').trigger("chosen:updated");
-})
+        if($('#needNotReview').prop('checked'))
+        {
+            $('#assignedTo').attr('disabled', 'disabled');
+        }
+        else
+        {
+            $('#assignedTo').removeAttr('disabled');
+        }
+        $('#assignedTo').trigger("chosen:updated");
+    });
+
+    $('[data-toggle=tooltip]').tooltip();
+});
+
+
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 0a86aeb447..a51bd573f9 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -55,10 +55,10 @@
           echo html::select('plan', $plans, $planID, "class='form-control chosen'");
           if(count($plans) == 1) 
           {
-              echo "<span class='input-group-addon'>";
-              echo html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch"), $lang->productplan->create, '_blank');
+              echo "<span class='input-group-btn'>";
+              echo html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch"), "<i class='icon icon-plus'></i>", '_blank', "class='btn' data-toggle='tooltip' title='{$lang->productplan->create}'");
               echo '&nbsp; ';
-              echo html::a("javascript:loadProductPlans($productID)", $lang->refresh);
+              echo html::a("javascript:loadProductPlans($productID)", "<i class='icon icon-refresh'></i>", '', "class='btn' data-toggle='tooltip' title='{$lang->refresh}'");
               echo '</span>';
           }
           ?>
@@ -119,11 +119,9 @@
             if($contactLists) echo html::select('', $contactLists, '', "class='form-control chosen' onchange=\"setMailto('mailto', this.value)\"");
             if(empty($contactLists))
             {
-                echo '<span class="input-group-addon">';
-                echo '<a href="' . $this->createLink('company', 'browse') . '" target="_blank">' . $lang->user->contacts->manage . '</a>';
-                echo '</span>';
-                echo '<span class="input-group-addon">';
-                echo '<a href="###" onclick="ajaxGetContacts(this)">' . $lang->refresh . '</a>';
+                echo '<span class="input-group-btn">';
+                echo '<a data-toggle="tooltip" title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('company', 'browse') . '" target="_blank" class="btn"><i class="icon icon-cog"></i></a>';
+                echo '<a data-toggle="tooltip" title="' . $lang->refresh . '" href="###" class="btn" onclick="ajaxGetContacts(this)"><i class="icon icon-refresh"></i></a>';
                 echo '</span>';
             }
             ?>