diff --git a/app/assets/javascripts/app/controllers/_application_controller_form.coffee b/app/assets/javascripts/app/controllers/_application_controller_form.coffee
index 3f5859a30..a8511625d 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_form.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_form.coffee
@@ -108,7 +108,7 @@ class App.ControllerForm extends App.Controller
     if @fullForm
       if !@formClass
         @formClass = ''
-      fieldset = $('<form class="' + @formClass + '" autocomplete="off"><button class="btn">' + App.i18n.translateContent('Submit') + '</button></form>').prepend( fieldset )
+      fieldset = $('<form class="' + @formClass + '" autocomplete="off"><button class="btn">' + App.i18n.translateContent('Submit') + '</button></form>').prepend(fieldset)
 
     # bind form events
     if @events
@@ -117,8 +117,11 @@ class App.ControllerForm extends App.Controller
           evs = eventSelector.split(' ')
           fieldset.find( evs[1] ).bind( evs[0], (e) -> callback(e) )
 
+    # bind tool tips
+    fieldset.find('.js-helpMessage').tooltip()
+
     # return form
-    return fieldset
+    fieldset
 
   ###
 
diff --git a/app/assets/javascripts/app/controllers/sla.coffee b/app/assets/javascripts/app/controllers/sla.coffee
index c591bc96d..a8f5160bf 100644
--- a/app/assets/javascripts/app/controllers/sla.coffee
+++ b/app/assets/javascripts/app/controllers/sla.coffee
@@ -60,7 +60,7 @@ class Index extends App.ControllerSubContent
     new App.ControllerGenericNew(
       pageData:
         title: 'SLAs'
-        object: 'Sla'
+        object: 'SLA'
         objects: 'SLAs'
       genericObject: 'Sla'
       container:     @el.closest('.content')
diff --git a/app/assets/javascripts/app/views/generic/attribute.jst.eco b/app/assets/javascripts/app/views/generic/attribute.jst.eco
index 6c45d2493..b630f9d6e 100644
--- a/app/assets/javascripts/app/views/generic/attribute.jst.eco
+++ b/app/assets/javascripts/app/views/generic/attribute.jst.eco
@@ -1,6 +1,6 @@
 <div class="<%= @attribute.tag %> form-group<%= " #{ @attribute.item_class }" if @attribute.item_class %>">
   <div class="formGroup-label">
-    <label for="<%= @attribute.id %>"<% if @attribute.label_class: %> class="<%= @attribute.label_class %>"<% end %>><%- @T( @attribute.display ) %> <span><% if !@attribute.null: %>*<% end %></span></label>
+    <label for="<%= @attribute.id %>"<% if @attribute.label_class: %> class="<%= @attribute.label_class %>"<% end %>><%- @T(@attribute.display) %> <span><% if !@attribute.null: %>*<% end %></span></label>
     <%- @item %>
     <% if @bookmarkable: %>
     <div class="align-right js-bookmark formGroup-bookmark">
@@ -8,7 +8,7 @@
     </div>
     <% end %>
     <% if @attribute.note: %>
-    <div class="help-message" title="<%- @Ti( @attribute.note ) + ' ' %>">
+    <div class="help-message js-helpMessage" title="<%- @Ti(@attribute.note) %>">
       <%- @Icon('help') %>
     </div>
     <% end %>
@@ -17,6 +17,6 @@
 	<% if @attribute.remove: %><span><a href="#" class="glyphicon glyphicon-minus"></a></span><% end %>
 	<% if @attribute.add: %><span><a href="#" class="glyphicon glyphicon-plus"></a></span><% end %>
     <span class="help-inline"></span>
-    <span class="help-block"><% if @attribute.help: %><%- @T( @attribute.help ) + ' ' %><% end %><%- @attribute.helpLink %></span>
+    <span class="help-block"><% if @attribute.help: %><%- @T(@attribute.help) %><% end %><%- @attribute.helpLink %></span>
   </div>
 </div>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index de71c75dd..87efe2997 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -3684,6 +3684,10 @@ footer {
   font-family: inherit;
 }
 
+.tooltip-inner {
+  max-width: 400px;
+}
+
 .popover {
   font-family: inherit;
   width: 372px;
@@ -7383,11 +7387,11 @@ output {
   .action-flow {
     display: flex;
     flex-wrap: wrap;
-    
+
     &.action-flow--noWrap {
       flex-wrap: nowrap;
     }
-    
+
     &.action-flow--row {
       flex-basis: 100%;
     }
@@ -7403,7 +7407,7 @@ output {
     margin-left: -9px;
     margin-right: -9px;
   }
-  
+
   h2 {
     margin-bottom: 0;
   }
@@ -7412,7 +7416,7 @@ output {
   .action-controls,
   .action-row {
     padding: 10px;
-    
+
     h2:first-child,
     h3:first-child {
       margin-top: 0;
@@ -7428,7 +7432,7 @@ output {
   .action-row {
     flex-basis: 100%;
   }
-  
+
   h3 {
     color: hsl(0,0%,60%);
     margin-top: 0;
@@ -7446,7 +7450,7 @@ output {
     color: hsl(197,16%,65%);
     cursor: default;
   }
-    
+
   .action-flow-icon {
     width: 15px;
     height: 24px;
@@ -7460,15 +7464,15 @@ output {
     display: flex;
     margin-left: auto;
     align-self: flex-end;
-    
+
     .btn {
       align-self: center;
     }
   }
 }
 
-  
-/* 
+
+/*
   datepicker resets some css it potentially inherits when its rendered inside a table
 */