diff --git a/Core/src/org/sleuthkit/autopsy/timeline/actions/RebuildDataBase.java b/Core/src/org/sleuthkit/autopsy/timeline/actions/RebuildDataBase.java
index 63669522df..b632ebadbb 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/actions/RebuildDataBase.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/actions/RebuildDataBase.java
@@ -29,9 +29,9 @@ import org.sleuthkit.autopsy.timeline.TimeLineController;
  * ingest.
  */
 public class RebuildDataBase extends Action {
-
+    
     private static final Image DB_REFRESH = new Image("org/sleuthkit/autopsy/timeline/images/database_refresh.png");
-
+    
     @NbBundle.Messages({
         "RebuildDataBase.text=Update DB",
         "RebuildDataBase.longText=Update the DB to include new events."})
@@ -40,5 +40,6 @@ public class RebuildDataBase extends Action {
         setLongText(Bundle.RebuildDataBase_longText());
         setGraphic(new ImageView(DB_REFRESH));
         setEventHandler(actionEvent -> controller.rebuildRepo());
+        disabledProperty().bind(controller.eventsDBStaleProperty().not());
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/images/warning.png b/Core/src/org/sleuthkit/autopsy/timeline/images/warning.png
new file mode 100644
index 0000000000..b6281848a7
Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/timeline/images/warning.png differ
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/images/warning_triangle.png b/Core/src/org/sleuthkit/autopsy/timeline/images/warning_triangle.png
new file mode 100644
index 0000000000..b7024717af
Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/timeline/images/warning_triangle.png differ
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/images/warning_triangle_small.png b/Core/src/org/sleuthkit/autopsy/timeline/images/warning_triangle_small.png
new file mode 100644
index 0000000000..06da735537
Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/timeline/images/warning_triangle_small.png differ
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/StatusBar.fxml b/Core/src/org/sleuthkit/autopsy/timeline/ui/StatusBar.fxml
index d838472f56..bdb713b123 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/StatusBar.fxml
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/StatusBar.fxml
@@ -1,52 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ProgressBar?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.ToolBar?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.StackPane?>
 
 <fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" type="ToolBar" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1">
     <items>
-      <HBox fx:id="refreshBox" alignment="CENTER" spacing="5.0">
-         <children>
-              <Label fx:id="refreshLabel">
-                  <graphic>
-                      <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
-                          <image>
-                              <Image url="@../images/information-frame.png" />
-                          </image>
-                      </ImageView>
-                  </graphic>
-              </Label>
-            <Button fx:id="updateDBButton" mnemonicParsing="false" text="Update DB">
-               <graphic>
-                  <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../images/database_refresh.png" />
-                     </image>
-                  </ImageView>
-               </graphic>
-            </Button>
-         </children>
-      </HBox>
-        <Separator orientation="VERTICAL" />
-      <Label fx:id="statusLabel" layoutX="10.0" layoutY="11.0">
-         <graphic>
-            <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
-               <image>
-                  <Image url="@../images/information-white.png" />
-               </image>
-            </ImageView>
-         </graphic>
-      </Label>
-        <Region fx:id="spacer" maxWidth="1.7976931348623157E308" />
-        <Separator orientation="VERTICAL" />
+        <Label fx:id="statusLabel" layoutX="10.0" layoutY="11.0" HBox.hgrow="ALWAYS">
+            <graphic>
+                <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
+                    <image>
+                        <Image url="@../images/information-white.png" />
+                    </image>
+                </ImageView>
+            </graphic>
+        </Label>
+        <Separator halignment="RIGHT" orientation="VERTICAL" />
         <Label fx:id="taskLabel" contentDisplay="RIGHT">
             <graphic>
                 <StackPane>
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/StatusBar.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/StatusBar.java
index f89008e4e4..f894d59ff9 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/StatusBar.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/StatusBar.java
@@ -19,41 +19,26 @@
 package org.sleuthkit.autopsy.timeline.ui;
 
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.ProgressBar;
 import javafx.scene.control.ToolBar;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.Region;
-import org.controlsfx.control.action.ActionUtils;
-import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.timeline.FXMLConstructor;
 import org.sleuthkit.autopsy.timeline.TimeLineController;
-import org.sleuthkit.autopsy.timeline.actions.RebuildDataBase;
 
 /**
  * Simple status bar that shows a possible message determined by
- * TimeLineController.eventsDBStaleProperty() and the warning/button to update
- * the db if it is stale
+ * TimeLineController.getStatusProperty() and progress of background tasks.
  */
 public class StatusBar extends ToolBar {
 
     private final TimeLineController controller;
 
-    @FXML
-    private Label refreshLabel;
-    @FXML
-    private HBox refreshBox;
-    @FXML
-    private Button updateDBButton;
     @FXML
     private Label statusLabel;
+
     @FXML
     private ProgressBar progressBar;
     @FXML
-    private Region spacer;
-    @FXML
     private Label taskLabel;
     @FXML
     private Label messageLabel;
@@ -64,28 +49,19 @@ public class StatusBar extends ToolBar {
     }
 
     @FXML
-    @NbBundle.Messages({"StatusBar.refreshLabel.text=The timeline DB may be out of date."})
     void initialize() {
-        assert refreshLabel != null : "fx:id=\"refreshLabel\" was not injected: check your FXML file 'StatusBar.fxml'."; // NON-NLS
         assert progressBar != null : "fx:id=\"progressBar\" was not injected: check your FXML file 'StatusBar.fxml'."; // NON-NLS
-        assert spacer != null : "fx:id=\"spacer\" was not injected: check your FXML file 'StatusBar.fxml'."; // NON-NLS
         assert taskLabel != null : "fx:id=\"taskLabel\" was not injected: check your FXML file 'StatusBar.fxml'."; // NON-NLS
         assert messageLabel != null : "fx:id=\"messageLabel\" was not injected: check your FXML file 'StatusBar.fxml'."; // NON-NLS
-        HBox.setHgrow(spacer, Priority.ALWAYS);
-
-        refreshLabel.setText(Bundle.StatusBar_refreshLabel_text());
-        refreshBox.visibleProperty().bind(this.controller.eventsDBStaleProperty());
-        refreshBox.managedProperty().bind(this.controller.eventsDBStaleProperty());
 
         taskLabel.setVisible(false);
         taskLabel.textProperty().bind(this.controller.taskTitleProperty());
+        taskLabel.visibleProperty().bind(this.controller.getTasks().emptyProperty().not());
+
         messageLabel.textProperty().bind(this.controller.taskMessageProperty());
         progressBar.progressProperty().bind(this.controller.taskProgressProperty());
-        taskLabel.visibleProperty().bind(this.controller.getTasks().emptyProperty().not());
 
         statusLabel.textProperty().bind(this.controller.getStatusProperty());
         statusLabel.visibleProperty().bind(statusLabel.textProperty().isNotEmpty());
-
-        ActionUtils.configureButton(new RebuildDataBase(controller), updateDBButton);
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.fxml b/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.fxml
index 1bf2c31d03..2ef513655c 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.fxml
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.fxml
@@ -19,13 +19,13 @@
 
 <fx:root prefHeight="-1.0" prefWidth="-1.0" type="javafx.scene.layout.BorderPane" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1">
     <top>
-        <HBox BorderPane.alignment="CENTER">
+        <HBox alignment="CENTER_LEFT" BorderPane.alignment="CENTER">
             <children>
-                <ToolBar fx:id="toolBar" HBox.hgrow="ALWAYS">
+                <ToolBar fx:id="toolBar" HBox.hgrow="NEVER">
                     <items>
-                        <HBox alignment="CENTER" BorderPane.alignment="CENTER">
+                        <HBox alignment="CENTER_LEFT" BorderPane.alignment="CENTER" HBox.hgrow="ALWAYS">
                             <children>
-                                <Label fx:id="visualizationModeLabel" text="Visualisation Mode:">
+                                <Label fx:id="visualizationModeLabel" text="Visualisation Mode:" textAlignment="CENTER" wrapText="true" HBox.hgrow="NEVER">
                                     <HBox.margin>
                                         <Insets right="5.0" />
                                     </HBox.margin>
@@ -34,7 +34,7 @@
                                     </font>
                                 </Label>
                                    
-                                <SegmentedButton maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity">
+                                <SegmentedButton maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" HBox.hgrow="NEVER">
                                     <buttons>   
                                         <ToggleButton fx:id="countsToggle" alignment="TOP_LEFT" mnemonicParsing="false" selected="true">
                                             <graphic>
@@ -74,10 +74,10 @@
                         <Separator orientation="VERTICAL" />
                     </items>
                 </ToolBar>
-                <ToolBar maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308">
+                <ToolBar maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS">
                     <items>
-                        <Separator orientation="VERTICAL" />
-                        <Button fx:id="snapShotButton" mnemonicParsing="false">
+                        <Separator halignment="RIGHT" orientation="VERTICAL" HBox.hgrow="ALWAYS" />
+                        <Button fx:id="snapShotButton" mnemonicParsing="false" text="Snapshot Report">
                             <graphic>
                                 <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
                                     <image>
@@ -86,8 +86,8 @@
                                 </ImageView>
                             </graphic>
                         </Button>
-                        <Separator halignment="LEFT" maxWidth="1.7976931348623157E308" orientation="VERTICAL" />
-                        <Button fx:id="refreshButton" alignment="CENTER_RIGHT" mnemonicParsing="false" text="Refresh">
+                        <Separator maxWidth="1.7976931348623157E308" orientation="VERTICAL" />
+                        <Button fx:id="refreshButton" alignment="CENTER_RIGHT" mnemonicParsing="false" text="Refresh Vis.">
                             <graphic>
                                 <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
                                     <image>
@@ -96,6 +96,15 @@
                                 </ImageView>
                             </graphic>
                         </Button>
+                        <Button fx:id="updateDBButton" mnemonicParsing="false" text="Update DB">
+                            <graphic>
+                                <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
+                                    <image>
+                                        <Image url="@../images/database_refresh.png" />
+                                    </image>
+                                </ImageView>
+                            </graphic>
+                        </Button>
                     </items>
                 </ToolBar>
             </children>
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
index 1ed89786db..cc9fb8b2ca 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
@@ -74,6 +74,7 @@ import org.sleuthkit.autopsy.timeline.FXMLConstructor;
 import org.sleuthkit.autopsy.timeline.TimeLineController;
 import org.sleuthkit.autopsy.timeline.VisualizationMode;
 import org.sleuthkit.autopsy.timeline.actions.Back;
+import org.sleuthkit.autopsy.timeline.actions.RebuildDataBase;
 import org.sleuthkit.autopsy.timeline.actions.ResetFilters;
 import org.sleuthkit.autopsy.timeline.actions.SaveSnapshotAsReport;
 import org.sleuthkit.autopsy.timeline.actions.ZoomIn;
@@ -99,6 +100,7 @@ final public class VisualizationPanel extends BorderPane {
     private static final Logger LOGGER = Logger.getLogger(VisualizationPanel.class.getName());
 
     private static final Image INFORMATION = new Image("org/sleuthkit/autopsy/timeline/images/information.png", 16, 16, true, true); // NON-NLS
+    private static final Image WARNING = new Image("org/sleuthkit/autopsy/timeline/images/warning_triangle.png", 16, 16, true, true); // NON-NLS
     private static final Image REFRESH = new Image("org/sleuthkit/autopsy/timeline/images/arrow-circle-double-135.png"); // NON-NLS
     private static final Background GRAY_BACKGROUND = new Background(new BackgroundFill(Color.GREY, CornerRadii.EMPTY, Insets.EMPTY));
 
@@ -164,6 +166,8 @@ final public class VisualizationPanel extends BorderPane {
     private Button snapShotButton;
     @FXML
     private Button refreshButton;
+    @FXML
+    private Button updateDBButton;
 
     /*
      * Wraps contained visualization so that we can show notifications over it.
@@ -260,7 +264,8 @@ final public class VisualizationPanel extends BorderPane {
         "VisualizationPanel.countsToggle.text=Counts",
         "VisualizationPanel.detailsToggle.text=Details",
         "VisualizationPanel.zoomMenuButton.text=Zoom in/out to",
-        "VisualizationPanel.tagsAddedOrDeleted=Tags have been created and/or deleted.  The visualization may not be up to date."})
+        "VisualizationPanel.tagsAddedOrDeleted=Tags have been created and/or deleted.  The visualization may not be up to date.",
+        "StatusBar.refreshLabel.text=The timeline DB may be out of date."})
     void initialize() {
         assert endPicker != null : "fx:id=\"endPicker\" was not injected: check your FXML file 'ViewWrapper.fxml'."; // NON-NLS
         assert histogramBox != null : "fx:id=\"histogramBox\" was not injected: check your FXML file 'ViewWrapper.fxml'."; // NON-NLS
@@ -275,12 +280,32 @@ final public class VisualizationPanel extends BorderPane {
         setCenter(notificationPane);
         needsRefresh.addListener(observable -> {
             if (needsRefresh.get()) {
+                notificationPane.getActions().setAll(new Refresh());
                 notificationPane.show(Bundle.VisualizationPanel_tagsAddedOrDeleted(), new ImageView(INFORMATION));
             } else {
                 notificationPane.hide();
             }
         });
 
+        //this should use an event(EventBus) , not this weird observable pattern
+        controller.eventsDBStaleProperty().addListener(staleProperty -> {
+            Platform.runLater(() -> {
+                if (controller.isEventsDBStale()) {
+                    notificationPane.getActions().setAll(new RebuildDataBase(controller));
+                    notificationPane.show(Bundle.StatusBar_refreshLabel_text(), new ImageView(WARNING));
+                } else {
+                    VisualizationPanel.this.refreshHistorgram();
+                    notificationPane.hide();
+                }
+            });
+        });
+
+        //configure snapshor button / action
+        ActionUtils.configureButton(new SaveSnapshotAsReport(controller, notificationPane::getContent), snapShotButton);
+        ActionUtils.configureButton(new Refresh(), refreshButton);
+
+        ActionUtils.configureButton(new RebuildDataBase(controller), updateDBButton);
+
         //configure visualization mode toggle
         visualizationModeLabel.setText(Bundle.VisualizationPanel_visualizationModeLabel_text());
         countsToggle.setText(Bundle.VisualizationPanel_countsToggle_text());
@@ -306,10 +331,6 @@ final public class VisualizationPanel extends BorderPane {
         controller.visualizationModeProperty().addListener(visualizationMode -> syncVisualizationMode());
         syncVisualizationMode();
 
-        //configure snapshor button / action
-        ActionUtils.configureButton(new SaveSnapshotAsReport(controller, notificationPane::getContent), snapShotButton);
-        ActionUtils.configureButton(new Refresh(), refreshButton);
-
         /////configure start and end pickers
         startLabel.setText(Bundle.VisualizationPanel_startLabel_text());
         endLabel.setText(Bundle.VisualizationPanel_endLabel_text());
@@ -366,12 +387,6 @@ final public class VisualizationPanel extends BorderPane {
         filteredEvents.zoomParametersProperty().addListener(zoomListener);
         refreshTimeUI(); //populate the viz
 
-        //this should use an event(EventBus) , not this weird observable pattern
-        controller.eventsDBStaleProperty().addListener(staleProperty -> {
-            if (controller.isEventsDBStale()) {
-                Platform.runLater(VisualizationPanel.this::refreshHistorgram);
-            }
-        });
         refreshHistorgram();
 
     }