diff --git a/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js b/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js
index 48fb283ea..e542cb214 100644
--- a/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js
+++ b/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js
@@ -14,6 +14,7 @@
  *    - activate meridian on class 'time--12'
  *    - normalize output to 24-hour clock
  *    - add hoursAndMinutes
+ *    - disableMousewheel by default
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -1131,7 +1132,7 @@
   $.fn.timepicker.defaults = {
     defaultTime: false,
     disableFocus: false,
-    disableMousewheel: false,
+    disableMousewheel: true,
     isOpen: false,
     minuteStep: 15,
     modalBackdrop: false,
diff --git a/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco
index a55b2d385..573f42233 100644
--- a/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco
@@ -58,7 +58,13 @@
   </div>
 </div>
 <div class="filter-preview">
-  <h3>Preview <span class="subtitle"><span class="u-highlight">5</span> matches</span></h3>
+  <h3>
+    Preview 
+    <span class="subtitle hide">
+      <span class="u-highlight">5</span> matches
+    </span>
+    <span class="tiny loading icon" style="margin-left: 3px;"></span>
+  </h3>
   <table class="table table-hover">
     <thead>
       <tr>
@@ -849,6 +855,7 @@
       <th>Active
       <th>Type
       <th>Time <span class="text-muted">in hours</span>
+      <th>Advance Warning <span class="text-muted">in hours</span>
     </tr>
   </thead>
   <tbody>
@@ -857,21 +864,30 @@
       <td>
         <label class="inline-label" for="first_response_time">First Response Time</label>
         <p class="subtle">Timeframe for the first response.</p>
-      <td><input type="text" value="02:00" class="timeframe js-responseTime">
+      <td>
+        <input type="text" value="02:00" class="form-control--small timeframe js-responseTime">
+      <td>
+        <input type="text" value="00:30" class="form-control--small timeframe js-responseTime">
     </tr>
     <tr class="is-active">
       <td style="text-align: center"><input type="checkbox" checked class="js-activateRow" id="update_time">
       <td>
         <label class="inline-label" for="update_time">Update Time</label>
         <p class="subtle">Timeframe for every following response.</p>
-      <td><input type="text" value="04:00" class="timeframe js-responseTime">
+      <td>
+        <input type="text" value="04:00" class="form-control--small timeframe js-responseTime">
+      <td>
+        <input type="text" value="00:30" class="form-control--small timeframe js-responseTime">
     </tr>
     <tr>
       <td style="text-align: center"><input type="checkbox" id="solution_time" class="js-activateRow">
       <td>
         <label class="inline-label" for="solution_time">Solution Time</label>
         <p class="subtle">Timeframe for solving the problem.</p>
-      <td><input type="text" value="16:00" class="timeframe js-responseTime">
+      <td>
+        <input type="text" value="16:00" class="form-control--small timeframe js-responseTime">
+      <td>
+        <input type="text" value="00:30" class="form-control--small timeframe js-responseTime">
     </tr>
   </tbody>
 </table>
\ No newline at end of file
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index ec65c5fa1..9ce9e231d 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -1918,6 +1918,11 @@ ol.tabs li {
   height: 20px;
 }
 
+.tiny.loading.icon {
+  width: 12px;
+  height: 12px;
+}
+
 @keyframes rotateplane {
   0% { 
     transform: perspective(120px) rotateX(0deg) rotateY(0deg);
@@ -6489,6 +6494,17 @@ output {
   }
 }
 
+.loading-placeholder {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 133px;
+  
+  .loading-text {
+    margin-left: 10px;
+  }
+}
+
 /*
 
   ----------------