diff --git a/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.form b/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.form
index ea5a68ccdc..a05e7505ec 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.form
+++ b/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.form
@@ -54,7 +54,7 @@
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
       <SubComponents>
-        <Container class="javafx.embed.swing.JFXPanel" name="jFXVizPanel">
+        <Container class="javafx.embed.swing.JFXPanel" name="jFXViewPanel">
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
               <JSplitPaneConstraints position="left"/>
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java b/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
index 4d1802bcd5..d22ff290d9 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
@@ -59,7 +59,7 @@ import org.sleuthkit.autopsy.timeline.explorernodes.EventRootNode;
 import org.sleuthkit.autopsy.timeline.ui.HistoryToolBar;
 import org.sleuthkit.autopsy.timeline.ui.StatusBar;
 import org.sleuthkit.autopsy.timeline.ui.TimeZonePanel;
-import org.sleuthkit.autopsy.timeline.ui.VisualizationPanel;
+import org.sleuthkit.autopsy.timeline.ui.ViewFrame;
 import org.sleuthkit.autopsy.timeline.ui.detailview.tree.EventsTree;
 import org.sleuthkit.autopsy.timeline.ui.filtering.FilterSetPanel;
 import org.sleuthkit.autopsy.timeline.zooming.ZoomSettingsPane;
@@ -124,7 +124,7 @@ public final class TimeLineTopComponent extends TopComponent implements Explorer
                             LOGGER.log(Level.SEVERE, "Failed to lookup Sleuthkit object backing a SingleEvent.", ex); // NON-NLS
                             Platform.runLater(() -> {
                                 Notifications.create()
-                                        .owner(jFXVizPanel.getScene().getWindow())
+                                        .owner(jFXViewPanel.getScene().getWindow())
                                         .text(Bundle.TimelineTopComponent_selectedEventListener_errorMsg())
                                         .showError();
                             });
@@ -250,8 +250,8 @@ public final class TimeLineTopComponent extends TopComponent implements Explorer
         final VBox leftVBox = new VBox(5, timeZonePanel, historyToolBar, zoomSettingsPane, leftTabPane);
         SplitPane.setResizableWithParent(leftVBox, Boolean.FALSE);
 
-        final VisualizationPanel visualizationPanel = new VisualizationPanel(controller, eventsTree);
-        final SplitPane mainSplitPane = new SplitPane(leftVBox, visualizationPanel);
+        final ViewFrame viewFrame = new ViewFrame(controller, eventsTree);
+        final SplitPane mainSplitPane = new SplitPane(leftVBox, viewFrame);
         mainSplitPane.setDividerPositions(0);
 
         final Scene scene = new Scene(mainSplitPane);
@@ -268,7 +268,7 @@ public final class TimeLineTopComponent extends TopComponent implements Explorer
         });
 
         //add ui componenets to JFXPanels
-        jFXVizPanel.setScene(scene);
+        jFXViewPanel.setScene(scene);
         jFXstatusPanel.setScene(new Scene(new StatusBar(controller)));
     }
 
@@ -287,7 +287,7 @@ public final class TimeLineTopComponent extends TopComponent implements Explorer
 
         jFXstatusPanel = new javafx.embed.swing.JFXPanel();
         splitYPane = new javax.swing.JSplitPane();
-        jFXVizPanel = new javafx.embed.swing.JFXPanel();
+        jFXViewPanel = new javafx.embed.swing.JFXPanel();
         horizontalSplitPane = new javax.swing.JSplitPane();
         leftFillerPanel = new javax.swing.JPanel();
         rightfillerPanel = new javax.swing.JPanel();
@@ -298,7 +298,7 @@ public final class TimeLineTopComponent extends TopComponent implements Explorer
         splitYPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
         splitYPane.setResizeWeight(0.9);
         splitYPane.setPreferredSize(new java.awt.Dimension(1024, 400));
-        splitYPane.setLeftComponent(jFXVizPanel);
+        splitYPane.setLeftComponent(jFXViewPanel);
 
         horizontalSplitPane.setDividerLocation(600);
         horizontalSplitPane.setResizeWeight(0.5);
@@ -351,7 +351,7 @@ public final class TimeLineTopComponent extends TopComponent implements Explorer
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JSplitPane horizontalSplitPane;
-    private javafx.embed.swing.JFXPanel jFXVizPanel;
+    private javafx.embed.swing.JFXPanel jFXViewPanel;
     private javafx.embed.swing.JFXPanel jFXstatusPanel;
     private javax.swing.JPanel leftFillerPanel;
     private javax.swing.JPanel rightfillerPanel;
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/actions/SaveSnapshotAsReport.java b/Core/src/org/sleuthkit/autopsy/timeline/actions/SaveSnapshotAsReport.java
index e50e1909a8..7649b35705 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/actions/SaveSnapshotAsReport.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/actions/SaveSnapshotAsReport.java
@@ -71,7 +71,7 @@ public class SaveSnapshotAsReport extends Action {
         "Timeline.ModuleName=Timeline",
         "SaveSnapShotAsReport.action.dialogs.title=Timeline",
         "SaveSnapShotAsReport.action.name.text=Snapshot Report",
-        "SaveSnapShotAsReport.action.longText=Save a screen capture of the visualization as a report.",
+        "SaveSnapShotAsReport.action.longText=Save a screen capture of the current view of the timeline as a report.",
         "# {0} - report file path",
         "SaveSnapShotAsReport.ReportSavedAt=Report saved at [{0}]",
         "SaveSnapShotAsReport.Success=Success",
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/events/RefreshRequestedEvent.java b/Core/src/org/sleuthkit/autopsy/timeline/events/RefreshRequestedEvent.java
index 47b04eb479..903cb55178 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/events/RefreshRequestedEvent.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/events/RefreshRequestedEvent.java
@@ -20,7 +20,7 @@ package org.sleuthkit.autopsy.timeline.events;
 
 /**
  * A "local" event published by filteredEventsModel to indicate that the user
- * requested that the current visualization be refreshed with out changing any
+ * requested that the current view be refreshed with out changing any
  * of the parameters ( to include more up to date tag data for example.)
  *
  * This event is not intended for use out side of the Timeline module.
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/snapshot/SnapShotReportWriter.java b/Core/src/org/sleuthkit/autopsy/timeline/snapshot/SnapShotReportWriter.java
index 75377ff5bb..917d2a0881 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/snapshot/SnapShotReportWriter.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/snapshot/SnapShotReportWriter.java
@@ -70,7 +70,7 @@ public class SnapShotReportWriter {
      * @param zoomParams       The ZoomParams in effect when the snapshot was
      *                         taken.
      * @param generationDate   The generation Date of the report.
-     * @param snapshot         A snapshot of the visualization to include in the
+     * @param snapshot         A snapshot of the view to include in the
      *                         report.
      */
     public SnapShotReportWriter(Case currentCase, Path reportFolderPath, String reportName, ZoomParams zoomParams, Date generationDate, BufferedImage snapshot) {
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/AbstractTimeLineView.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/AbstractTimeLineView.java
index faf55aef15..86fa7ec132 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/AbstractTimeLineView.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/AbstractTimeLineView.java
@@ -136,7 +136,7 @@ public abstract class AbstractTimeLineView extends BorderPane {
 
     /**
      * Refresh this view based on current state of zoom / filters. Primarily
-     * this invokes the background VisualizationUpdateTask returned by
+     * this invokes the background ViewRefreshTask returned by
      * getUpdateTask(), which derived classes must implement.
      *
      * TODO: replace this logic with a javafx Service ? -jm
@@ -291,11 +291,11 @@ public abstract class AbstractTimeLineView extends BorderPane {
          * @throws Exception If there is an unhandled exception during the
          *                   background operation
          */
-        @NbBundle.Messages(value = {"VisualizationUpdateTask.preparing=Analyzing zoom and filter settings"})
+        @NbBundle.Messages(value = {"ViewRefreshTask.preparing=Analyzing zoom and filter settings"})
         @Override
         protected Boolean call() throws Exception {
             updateProgress(-1, 1);
-            updateMessage(Bundle.VisualizationUpdateTask_preparing());
+            updateMessage(Bundle.ViewRefreshTask_preparing());
             Platform.runLater(() -> {
                 MaskerPane maskerPane = new MaskerPane();
                 maskerPane.textProperty().bind(messageProperty());
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/AbstractTimelineChart.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/AbstractTimelineChart.java
index fc2ee5ca63..31d53a6b72 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/AbstractTimelineChart.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/AbstractTimelineChart.java
@@ -57,7 +57,7 @@ import org.sleuthkit.autopsy.timeline.TimeLineController;
 import org.sleuthkit.autopsy.timeline.datamodel.eventtype.EventType;
 
 /**
- * Abstract base class for TimeLineChart based visualizations.
+ * Abstract base class for TimeLineChart based views.
  *
  * @param <X>         The type of data plotted along the x axis
  * @param <Y>         The type of data plotted along the y axis
@@ -74,13 +74,13 @@ public abstract class AbstractTimelineChart<X, Y, NodeType extends Node, ChartTy
 
     private static final Logger LOGGER = Logger.getLogger(AbstractTimelineChart.class.getName());
 
-    @NbBundle.Messages("AbstractVisualization.Default_Tooltip.text=Drag the mouse to select a time interval to zoom into.\nRight-click for more actions.")
-    private static final Tooltip DEFAULT_TOOLTIP = new Tooltip(Bundle.AbstractVisualization_Default_Tooltip_text());
+    @NbBundle.Messages("AbstractTimelineChart.defaultTooltip.text=Drag the mouse to select a time interval to zoom into.\nRight-click for more actions.")
+    private static final Tooltip DEFAULT_TOOLTIP = new Tooltip(Bundle.AbstractTimelineChart_defaultTooltip_text());
     private static final Border ONLY_LEFT_BORDER = new Border(new BorderStroke(Color.BLACK, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, new BorderWidths(0, 0, 0, 1)));
 
     /**
-     * Get the tool tip to use for this visualization when no more specific
-     * Tooltip is needed.
+     * Get the tool tip to use for this view when no more specific Tooltip is
+     * needed.
      *
      * @return The default Tooltip.
      */
@@ -89,10 +89,10 @@ public abstract class AbstractTimelineChart<X, Y, NodeType extends Node, ChartTy
     }
 
     /**
-     * The visualization nodes that are selected.
+     * The nodes that are selected.
      *
      * @return An ObservableList<NodeType> of the nodes that are selected in
-     *         this visualization.
+     *         this view.
      */
     protected ObservableList<NodeType> getSelectedNodes() {
         return selectedNodes;
@@ -127,18 +127,18 @@ public abstract class AbstractTimelineChart<X, Y, NodeType extends Node, ChartTy
     }
 
     /**
-     * Get the CharType that implements this visualization.
+     * Get the CharType that implements this view.
      *
-     * @return The CharType that implements this visualization.
+     * @return The CharType that implements this view.
      */
     protected ChartType getChart() {
         return chart;
     }
 
     /**
-     * Set the ChartType that implements this visualization.
+     * Set the ChartType that implements this view.
      *
-     * @param chart The ChartType that implements this visualization.
+     * @param chart The ChartType that implements this view.
      */
     @ThreadConfined(type = ThreadConfined.ThreadType.JFX)
     protected void setChart(ChartType chart) {
@@ -147,7 +147,7 @@ public abstract class AbstractTimelineChart<X, Y, NodeType extends Node, ChartTy
     }
 
     /**
-     * Apply this visualization's 'selection effect' to the given node.
+     * Apply this view's 'selection effect' to the given node.
      *
      * @param node The node to apply the 'effect' to.
      */
@@ -156,7 +156,7 @@ public abstract class AbstractTimelineChart<X, Y, NodeType extends Node, ChartTy
     }
 
     /**
-     * Remove this visualization's 'selection effect' from the given node.
+     * Remove this view's 'selection effect' from the given node.
      *
      * @param node The node to remvoe the 'effect' from.
      */
@@ -168,7 +168,7 @@ public abstract class AbstractTimelineChart<X, Y, NodeType extends Node, ChartTy
      * Should the tick mark at the given value be bold, because it has
      * interesting data associated with it?
      *
-     * @param value A value along this visualization's x axis
+     * @param value A value along this view's x axis
      *
      * @return True if the tick label for the given value should be bold ( has
      *         relevant data), false otherwise
@@ -176,8 +176,8 @@ public abstract class AbstractTimelineChart<X, Y, NodeType extends Node, ChartTy
     abstract protected Boolean isTickBold(X value);
 
     /**
-     * Apply this visualization's 'selection effect' to the given node, if
-     * applied is true. If applied is false, remove the affect
+     * Apply this view's 'selection effect' to the given node, if applied is
+     * true. If applied is false, remove the affect
      *
      * @param node    The node to apply the 'effect' to
      * @param applied True if the effect should be applied, false if the effect
@@ -203,16 +203,16 @@ public abstract class AbstractTimelineChart<X, Y, NodeType extends Node, ChartTy
     abstract protected double getTickSpacing();
 
     /**
-     * Get the X-Axis of this Visualization's chart
+     * Get the X-Axis of this view's chart
      *
-     * @return The horizontal axis used by this Visualization's chart
+     * @return The horizontal axis used by this view's chart
      */
     abstract protected Axis<X> getXAxis();
 
     /**
-     * Get the Y-Axis of this Visualization's chart
+     * Get the Y-Axis of this view's chart
      *
-     * @return The vertical axis used by this Visualization's chart
+     * @return The vertical axis used by this view's chart
      */
     abstract protected Axis<Y> getYAxis();
 
@@ -252,7 +252,7 @@ public abstract class AbstractTimelineChart<X, Y, NodeType extends Node, ChartTy
     /**
      * Constructor
      *
-     * @param controller The TimelineController for this visualization.
+     * @param controller The TimelineController for this view.
      */
     protected AbstractTimelineChart(TimeLineController controller) {
         super(controller);
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties b/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties
index 498dfbaace..9751a035d5 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties
@@ -35,13 +35,13 @@ Timeline.ui.ZoomRanges.threeyears.text=Three Years
 Timeline.ui.ZoomRanges.fiveyears.text=Five Years
 Timeline.ui.ZoomRanges.tenyears.text=Ten Years
 Timeline.ui.ZoomRanges.all.text=All
-VisualizationPanel.histogramTask.title=Rebuild Histogram
-VisualizationPanel.histogramTask.preparing=preparing
-VisualizationPanel.histogramTask.resetUI=resetting ui
-VisualizationPanel.histogramTask.queryDb=querying db
-VisualizationPanel.histogramTask.updateUI2=updating ui
-VisualizationPanel.noEventsDialogLabel.text=There are no events visible with the current zoom / filter settings.
-VisualizationPanel.zoomButton.text=Zoom to events
+ViewFrame.histogramTask.title=Rebuild Histogram
+ViewFrame.histogramTask.preparing=preparing
+ViewFrame.histogramTask.resetUI=resetting ui
+ViewFrame.histogramTask.queryDb=querying db
+ViewFrame.histogramTask.updateUI2=updating ui
+ViewFrame.noEventsDialogLabel.text=There are no events visible with the current zoom / filter settings.
+ViewFrame.zoomButton.text=Zoom to events
 TimeZonePanel.localRadio.text=Local Time Zone
 TimeZonePanel.otherRadio.text=GMT / UTC
-VisualizationPanel.resetFiltersButton.text=Reset all filters
+ViewFrame.resetFiltersButton.text=Reset all filters
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle_ja.properties
index 3e0fab3823..5c8dacfed2 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle_ja.properties
@@ -2,23 +2,23 @@ Timeline.node.root=\u30eb\u30fc\u30c8
 Timeline.ui.TimeLineChart.tooltip.text=\u30c0\u30d6\u30eb\u30af\u30ea\u30c3\u30af\u3067\u4e0b\u8a18\u306e\u7bc4\u56f2\u3078\u30ba\u30fc\u30e0\uff1a\n{0}\u301c{1}\n\u53f3\u30af\u30ea\u30c3\u30af\u3067\u5143\u306b\u623b\u308a\u307e\u3059\u3002
 Timeline.ui.ZoomRanges.all.text=\u5168\u3066
 
-VisualizationPanel.histogramTask.preparing=\u6e96\u5099\u4e2d
-VisualizationPanel.histogramTask.queryDb=DB\u3092\u30af\u30a8\u30ea\u4e2d
-VisualizationPanel.histogramTask.resetUI=ui\u3092\u518d\u8a2d\u5b9a\u4e2d
-VisualizationPanel.histogramTask.title=\u30d2\u30b9\u30c8\u30b0\u30e9\u30e0\u3092\u518d\u30d3\u30eb\u30c9
-VisualizationPanel.histogramTask.updateUI2=ui\u3092\u66f4\u65b0\u4e2d
+ViewFrame.histogramTask.preparing=\u6e96\u5099\u4e2d
+ViewFrame.histogramTask.queryDb=DB\u3092\u30af\u30a8\u30ea\u4e2d
+ViewFrame.histogramTask.resetUI=ui\u3092\u518d\u8a2d\u5b9a\u4e2d
+ViewFrame.histogramTask.title=\u30d2\u30b9\u30c8\u30b0\u30e9\u30e0\u3092\u518d\u30d3\u30eb\u30c9
+ViewFrame.histogramTask.updateUI2=ui\u3092\u66f4\u65b0\u4e2d
 TimeZonePanel.localRadio.text=\u30ed\u30fc\u30ab\u30eb\u30bf\u30a4\u30e0\u30be\u30fc\u30f3
-VisualizationPanel.countsToggle.text=\u30ab\u30a6\u30f3\u30c8
-VisualizationPanel.detailsToggle.text=\u8a73\u7d30
-VisualizationPanel.endLabel.text=\u30a8\u30f3\u30c9\uff1a
-VisualizationPanel.noEventsDialogLabel.text=\u73fe\u5728\u306e\u30ba\u30fc\u30e0\uff0f\u30d5\u30a3\u30eb\u30bf\u30fc\u8a2d\u5b9a\u3067\u306f\u898b\u3048\u308b\u30a4\u30d9\u30f3\u30c8\u304c\u3042\u308a\u307e\u305b\u3093\u3002
-VisualizationPanel.resetFiltersButton.text=\u5168\u3066\u306e\u30d5\u30a3\u30eb\u30bf\u30fc\u3092\u30ea\u30bb\u30c3\u30c8
-VisualizationPanel.startLabel.text=\u30b9\u30bf\u30fc\u30c8\uff1a
-VisualizationPanel.visualizationModeLabel.text=\u30d3\u30b8\u30e5\u30a2\u30e9\u30a4\u30bc\u30fc\u30b7\u30e7\u30f3\u30e2\u30fc\u30c9\uff1a
-VisualizationPanel.zoomButton.text=\u30a4\u30d9\u30f3\u30c8\u3078\u30ba\u30fc\u30e0
-VisualizationPanel.zoomMenuButton.text=\u4e0b\u8a18\u3078\u30ba\u30fc\u30e0\u30a4\u30f3\uff0f\u30ba\u30fc\u30e0\u30a2\u30a6\u30c8
+ViewFrame.countsToggle.text=\u30ab\u30a6\u30f3\u30c8
+ViewFrame.detailsToggle.text=\u8a73\u7d30
+ViewFrame.endLabel.text=\u30a8\u30f3\u30c9\uff1a
+ViewFrame.noEventsDialogLabel.text=\u73fe\u5728\u306e\u30ba\u30fc\u30e0\uff0f\u30d5\u30a3\u30eb\u30bf\u30fc\u8a2d\u5b9a\u3067\u306f\u898b\u3048\u308b\u30a4\u30d9\u30f3\u30c8\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+ViewFrame.resetFiltersButton.text=\u5168\u3066\u306e\u30d5\u30a3\u30eb\u30bf\u30fc\u3092\u30ea\u30bb\u30c3\u30c8
+ViewFrame.startLabel.text=\u30b9\u30bf\u30fc\u30c8\uff1a
+ViewFrame.viewModeLabel.text=\u30d3\u30b8\u30e5\u30a2\u30e9\u30a4\u30bc\u30fc\u30b7\u30e7\u30f3\u30e2\u30fc\u30c9\uff1a
+ViewFrame.zoomButton.text=\u30a4\u30d9\u30f3\u30c8\u3078\u30ba\u30fc\u30e0
+ViewFrame.zoomMenuButton.text=\u4e0b\u8a18\u3078\u30ba\u30fc\u30e0\u30a4\u30f3\uff0f\u30ba\u30fc\u30e0\u30a2\u30a6\u30c8
 *=Autopsy\u30d5\u30a9\u30ec\u30f3\u30b8\u30c3\u30af\u30d6\u30e9\u30a6\u30b6
-AbstractVisualization.Default_Tooltip.text=\u30de\u30a6\u30b9\u3092\u30c9\u30e9\u30c3\u30b0\u3057\u3066\u30ba\u30fc\u30e0\u3059\u308b\u30bf\u30a4\u30e0\u9593\u9694\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n\u305d\u306e\u4ed6\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u306f\u53f3\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044
+AbstractTimelineChart.defaultTooltip.text=\u30de\u30a6\u30b9\u3092\u30c9\u30e9\u30c3\u30b0\u3057\u3066\u30ba\u30fc\u30e0\u3059\u308b\u30bf\u30a4\u30e0\u9593\u9694\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n\u305d\u306e\u4ed6\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u306f\u53f3\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044
 IntervalSelector.ClearSelectedIntervalAction.tooltTipText=\u9078\u629e\u3057\u305f\u9593\u9694\u3092\u30af\u30ea\u30a2\u3059\u308b
 IntervalSelector.ZoomAction.name=\u30ba\u30fc\u30e0
 NoEventsDialog.titledPane.text=\u898b\u308c\u308b\u30a4\u30d9\u30f3\u30c8\u304c\u3042\u308a\u307e\u305b\u3093
@@ -40,6 +40,6 @@ Timeline.ui.ZoomRanges.fiveyears.text=5\u5e74
 Timeline.ui.ZoomRanges.tenyears.text=10\u5e74
 TimeLineChart.zoomHistoryActionGroup.name=\u30ba\u30fc\u30e0\u5c65\u6b74
 TimeZonePanel.title=\u6642\u9593\u3092\u6b21\u3067\u8868\u793a\uff1a
-VisualizationPanel.refresh=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
-VisualizationPanel.tagsAddedOrDeleted=\u30bf\u30b0\u304c\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\u304a\u3088\u3073\u307e\u305f\u306f\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002\u30d3\u30b8\u30e5\u30a2\u30e9\u30a4\u30bc\u30fc\u30b7\u30e7\u30f3\u304c\u6700\u65b0\u3067\u306f\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
-VisualizationUpdateTask.preparing=\u30ba\u30fc\u30e0\u304a\u3088\u3073\u30d5\u30a3\u30eb\u30bf\u30fc\u8a2d\u5b9a\u3092\u89e3\u6790\u4e2d
+ViewFrame.refresh=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
+ViewFrame.tagsAddedOrDeleted=\u30bf\u30b0\u304c\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\u304a\u3088\u3073\u307e\u305f\u306f\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002\u30d3\u30b8\u30e5\u30a2\u30e9\u30a4\u30bc\u30fc\u30b7\u30e7\u30f3\u304c\u6700\u65b0\u3067\u306f\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
+ViewRefreshTask.preparing=\u30ba\u30fc\u30e0\u304a\u3088\u3073\u30d5\u30a3\u30eb\u30bf\u30fc\u8a2d\u5b9a\u3092\u89e3\u6790\u4e2d
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.fxml b/Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.fxml
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.fxml
rename to Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.fxml
index 6f9aa7beab..777986e600 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.fxml
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.fxml
@@ -23,7 +23,7 @@
             <items>
                 <HBox alignment="CENTER_LEFT" BorderPane.alignment="CENTER" HBox.hgrow="NEVER">
                     <children>
-                        <Label fx:id="visualizationModeLabel" text="Visualisation Mode:" textAlignment="CENTER" wrapText="true" HBox.hgrow="NEVER">
+                        <Label fx:id="viewModeLabel" text="View Mode:" textAlignment="CENTER" wrapText="true" HBox.hgrow="NEVER">
                             <HBox.margin>
                                 <Insets right="5.0" />
                             </HBox.margin>
@@ -93,7 +93,7 @@
                     </graphic>
                 </Button>
                 <Separator maxWidth="1.7976931348623157E308" orientation="VERTICAL" />
-                <Button fx:id="refreshButton" alignment="CENTER_RIGHT" mnemonicParsing="false" text="Refresh Vis.">
+                <Button fx:id="refreshButton" alignment="CENTER_RIGHT" mnemonicParsing="false" text="Refresh View">
                     <graphic>
                         <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
                             <image>
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.java
similarity index 86%
rename from Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
rename to Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.java
index 7176440656..fe95c004e1 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.java
@@ -97,9 +97,9 @@ import org.sleuthkit.autopsy.timeline.utils.RangeDivisionInfo;
  *
  * TODO: Refactor common code out of histogram and CountsView? -jm
  */
-final public class VisualizationPanel extends BorderPane {
+final public class ViewFrame extends BorderPane {
 
-    private static final Logger LOGGER = Logger.getLogger(VisualizationPanel.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(ViewFrame.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
@@ -108,7 +108,7 @@ final public class VisualizationPanel extends BorderPane {
 
     /**
      * Region that will be stacked in between the no-events "dialog" and the
-     * hosted AbstractVisualizationPane in order to gray out the visualization.
+     * hosted AbstractTimelineView in order to gray out the AbstractTimelineView.
      */
     private final static Region NO_EVENTS_BACKGROUND = new Region() {
         {
@@ -159,7 +159,7 @@ final public class VisualizationPanel extends BorderPane {
     @FXML
     private ToolBar toolBar;
     @FXML
-    private Label visualizationModeLabel;
+    private Label viewModeLabel;
     @FXML
     private SegmentedButton modeSegButton;
     @FXML
@@ -176,7 +176,7 @@ final public class VisualizationPanel extends BorderPane {
     private Button updateDBButton;
 
     /*
-     * Wraps contained visualization so that we can show notifications over it.
+     * Wraps contained AbstractTimelineView so that we can show notifications over it.
      */
     private final NotificationPane notificationPane = new NotificationPane();
 
@@ -245,26 +245,26 @@ final public class VisualizationPanel extends BorderPane {
     /**
      * Constructor
      *
-     * @param controller The TimeLineController for this VisualizationPanel
-     * @param eventsTree The EventsTree this VisualizationPanel hosts.
+     * @param controller The TimeLineController for this ViewFrame
+     * @param eventsTree The EventsTree this ViewFrame hosts.
      */
-    public VisualizationPanel(@Nonnull TimeLineController controller, @Nonnull EventsTree eventsTree) {
+    public ViewFrame(@Nonnull TimeLineController controller, @Nonnull EventsTree eventsTree) {
         this.controller = controller;
         this.filteredEvents = controller.getEventsModel();
         this.eventsTree = eventsTree;
-        FXMLConstructor.construct(this, "VisualizationPanel.fxml"); // NON-NLS
+        FXMLConstructor.construct(this, "ViewFrame.fxml"); // NON-NLS
     }
 
     @FXML
     @NbBundle.Messages({
-        "VisualizationPanel.visualizationModeLabel.text=Visualization Mode:",
-        "VisualizationPanel.startLabel.text=Start:",
-        "VisualizationPanel.endLabel.text=End:",
-        "VisualizationPanel.countsToggle.text=Counts",
-        "VisualizationPanel.detailsToggle.text=Details",
-        "VisualizationPanel.listToggle.text=List",
-        "VisualizationPanel.zoomMenuButton.text=Zoom in/out to",
-        "VisualizationPanel.tagsAddedOrDeleted=Tags have been created and/or deleted.  The visualization may not be up to date."
+        "ViewFrame.viewModeLabel.text=View Mode:",
+        "ViewFrame.startLabel.text=Start:",
+        "ViewFrame.endLabel.text=End:",
+        "ViewFrame.countsToggle.text=Counts",
+        "ViewFrame.detailsToggle.text=Details",
+        "ViewFrame.listToggle.text=List",
+        "ViewFrame.zoomMenuButton.text=Zoom in/out to",
+        "ViewFrame.tagsAddedOrDeleted=Tags have been created and/or deleted.  The view may not be up to date."
     })
     void initialize() {
         assert endPicker != null : "fx:id=\"endPicker\" was not injected: check your FXML file 'ViewWrapper.fxml'."; // NON-NLS
@@ -278,11 +278,11 @@ final public class VisualizationPanel extends BorderPane {
         notificationPane.getStyleClass().add(NotificationPane.STYLE_CLASS_DARK);
         setCenter(notificationPane);
 
-        //configure visualization mode toggle
-        visualizationModeLabel.setText(Bundle.VisualizationPanel_visualizationModeLabel_text());
-        countsToggle.setText(Bundle.VisualizationPanel_countsToggle_text());
-        detailsToggle.setText(Bundle.VisualizationPanel_detailsToggle_text());
-        listToggle.setText(Bundle.VisualizationPanel_listToggle_text());
+        //configure view mode toggle
+        viewModeLabel.setText(Bundle.ViewFrame_viewModeLabel_text());
+        countsToggle.setText(Bundle.ViewFrame_countsToggle_text());
+        detailsToggle.setText(Bundle.ViewFrame_detailsToggle_text());
+        listToggle.setText(Bundle.ViewFrame_listToggle_text());
 
         ToggleGroupValue<ViewMode> visModeToggleGroup = new ToggleGroupValue<>();
         visModeToggleGroup.add(listToggle, ViewMode.LIST);
@@ -302,8 +302,8 @@ final public class VisualizationPanel extends BorderPane {
         ActionUtils.configureButton(new UpdateDB(controller), updateDBButton);
 
         /////configure start and end pickers
-        startLabel.setText(Bundle.VisualizationPanel_startLabel_text());
-        endLabel.setText(Bundle.VisualizationPanel_endLabel_text());
+        startLabel.setText(Bundle.ViewFrame_startLabel_text());
+        endLabel.setText(Bundle.ViewFrame_endLabel_text());
 
         //suppress stacktraces on malformed input
         //TODO: should we do anything else? show a warning?
@@ -344,7 +344,7 @@ final public class VisualizationPanel extends BorderPane {
                         }
                     })));
         }
-        zoomMenuButton.setText(Bundle.VisualizationPanel_zoomMenuButton_text());
+        zoomMenuButton.setText(Bundle.ViewFrame_zoomMenuButton_text());
         ActionUtils.configureButton(new ZoomOut(controller), zoomOutButton);
         ActionUtils.configureButton(new ZoomIn(controller), zoomInButton);
 
@@ -355,17 +355,17 @@ final public class VisualizationPanel extends BorderPane {
         TimeLineController.getTimeZone().addListener(timeZoneProp -> refreshTimeUI());
         filteredEvents.timeRangeProperty().addListener(timeRangeProp -> refreshTimeUI());
         filteredEvents.zoomParametersProperty().addListener(zoomListener);
-        refreshTimeUI(); //populate the viz
+        refreshTimeUI(); //populate the view
 
         refreshHistorgram();
 
     }
 
     /**
-     * Handle TagsUpdatedEvents by marking that the visualization needs to be
+     * Handle TagsUpdatedEvents by marking that the view needs to be
      * refreshed.
      *
-     * NOTE: This VisualizationPanel must be registered with the
+     * NOTE: This ViewFrame must be registered with the
      * filteredEventsModel's EventBus in order for this handler to be invoked.
      *
      * @param event The TagsUpdatedEvent to handle.
@@ -376,7 +376,7 @@ final public class VisualizationPanel extends BorderPane {
         Platform.runLater(() -> {
             if (notificationPane.isShowing() == false) {
                 notificationPane.getActions().setAll(new Refresh());
-                notificationPane.show(Bundle.VisualizationPanel_tagsAddedOrDeleted(), new ImageView(INFORMATION));
+                notificationPane.show(Bundle.ViewFrame_tagsAddedOrDeleted(), new ImageView(INFORMATION));
             }
         });
     }
@@ -385,7 +385,7 @@ final public class VisualizationPanel extends BorderPane {
      * Handle a RefreshRequestedEvent from the events model by clearing the
      * refresh notification.
      *
-     * NOTE: This VisualizationPanel must be registered with the
+     * NOTE: This ViewFrame must be registered with the
      * filteredEventsModel's EventBus in order for this handler to be invoked.
      *
      * @param event The RefreshRequestedEvent to handle.
@@ -393,7 +393,7 @@ final public class VisualizationPanel extends BorderPane {
     @Subscribe
     public void handleRefreshRequested(RefreshRequestedEvent event) {
         Platform.runLater(() -> {
-            if (Bundle.VisualizationPanel_tagsAddedOrDeleted().equals(notificationPane.getText())) {
+            if (Bundle.ViewFrame_tagsAddedOrDeleted().equals(notificationPane.getText())) {
                 notificationPane.hide();
             }
         });
@@ -401,9 +401,9 @@ final public class VisualizationPanel extends BorderPane {
 
     /**
      * Handle a DBUpdatedEvent from the events model by refreshing the
-     * visualization.
+     * view.
      *
-     * NOTE: This VisualizationPanel must be registered with the
+     * NOTE: This ViewFrame must be registered with the
      * filteredEventsModel's EventBus in order for this handler to be invoked.
      *
      * @param event The DBUpdatedEvent to handle.
@@ -419,7 +419,7 @@ final public class VisualizationPanel extends BorderPane {
      * Handle a DataSourceAddedEvent from the events model by showing a
      * notification.
      *
-     * NOTE: This VisualizationPanel must be registered with the
+     * NOTE: This ViewFrame must be registered with the
      * filteredEventsModel's EventBus in order for this handler to be invoked.
      *
      * @param event The DataSourceAddedEvent to handle.
@@ -427,11 +427,11 @@ final public class VisualizationPanel extends BorderPane {
     @Subscribe
     @NbBundle.Messages({
         "# {0} - datasource name",
-        "VisualizationPanel.notification.newDataSource={0} has been added as a new datasource.  The Timeline DB may be out of date."})
+        "ViewFrame.notification.newDataSource={0} has been added as a new datasource.  The Timeline DB may be out of date."})
     public void handlDataSourceAdded(DataSourceAddedEvent event) {
         Platform.runLater(() -> {
             notificationPane.getActions().setAll(new UpdateDB(controller));
-            notificationPane.show(Bundle.VisualizationPanel_notification_newDataSource(event.getDataSource().getName()), new ImageView(WARNING));
+            notificationPane.show(Bundle.ViewFrame_notification_newDataSource(event.getDataSource().getName()), new ImageView(WARNING));
         });
     }
 
@@ -439,7 +439,7 @@ final public class VisualizationPanel extends BorderPane {
      * Handle a DataSourceAnalysisCompletedEvent from the events modelby showing
      * a notification.
      *
-     * NOTE: This VisualizationPanel must be registered with the
+     * NOTE: This ViewFrame must be registered with the
      * filteredEventsModel's EventBus in order for this handler to be invoked.
      *
      * @param event The DataSourceAnalysisCompletedEvent to handle.
@@ -447,11 +447,11 @@ final public class VisualizationPanel extends BorderPane {
     @Subscribe
     @NbBundle.Messages({
         "# {0} - datasource name",
-        "VisualizationPanel.notification.analysisComplete=Analysis has finished for {0}.  The Timeline DB may be out of date."})
+        "ViewFrame.notification.analysisComplete=Analysis has finished for {0}.  The Timeline DB may be out of date."})
     public void handleAnalysisCompleted(DataSourceAnalysisCompletedEvent event) {
         Platform.runLater(() -> {
             notificationPane.getActions().setAll(new UpdateDB(controller));
-            notificationPane.show(Bundle.VisualizationPanel_notification_analysisComplete(event.getDataSource().getName()), new ImageView(WARNING));
+            notificationPane.show(Bundle.ViewFrame_notification_analysisComplete(event.getDataSource().getName()), new ImageView(WARNING));
         });
     }
 
@@ -464,13 +464,13 @@ final public class VisualizationPanel extends BorderPane {
         }
 
         histogramTask = new LoggedTask<Void>(
-                NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.histogramTask.title"), true) { // NON-NLS
+                NbBundle.getMessage(ViewFrame.class, "ViewFrame.histogramTask.title"), true) { // NON-NLS
             private final Lighting lighting = new Lighting();
 
             @Override
             protected Void call() throws Exception {
 
-                updateMessage(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.histogramTask.preparing")); // NON-NLS
+                updateMessage(NbBundle.getMessage(ViewFrame.class, "ViewFrame.histogramTask.preparing")); // NON-NLS
 
                 long max = 0;
                 final RangeDivisionInfo rangeInfo = RangeDivisionInfo.getRangeDivisionInfo(filteredEvents.getSpanningInterval());
@@ -483,7 +483,7 @@ final public class VisualizationPanel extends BorderPane {
 
                 //clear old data, and reset ranges and series
                 Platform.runLater(() -> {
-                    updateMessage(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.histogramTask.resetUI")); // NON-NLS
+                    updateMessage(NbBundle.getMessage(ViewFrame.class, "ViewFrame.histogramTask.resetUI")); // NON-NLS
 
                 });
 
@@ -500,7 +500,7 @@ final public class VisualizationPanel extends BorderPane {
 
                     start = end;
 
-                    updateMessage(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.histogramTask.queryDb")); // NON-NLS
+                    updateMessage(NbBundle.getMessage(ViewFrame.class, "ViewFrame.histogramTask.queryDb")); // NON-NLS
                     //query for current range
                     long count = filteredEvents.getEventCounts(interval).values().stream().mapToLong(Long::valueOf).sum();
                     bins.add(count);
@@ -510,7 +510,7 @@ final public class VisualizationPanel extends BorderPane {
                     final double fMax = Math.log(max);
                     final ArrayList<Long> fbins = new ArrayList<>(bins);
                     Platform.runLater(() -> {
-                        updateMessage(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.histogramTask.updateUI2")); // NON-NLS
+                        updateMessage(NbBundle.getMessage(ViewFrame.class, "ViewFrame.histogramTask.updateUI2")); // NON-NLS
 
                         histogramBox.getChildren().clear();
 
@@ -583,7 +583,7 @@ final public class VisualizationPanel extends BorderPane {
         AbstractTimeLineView view;
         ViewMode viewMode = controller.viewModeProperty().get();
 
-        //make new visualization.
+        //make new view.
         switch (viewMode) {
             case LIST:
                 view = new ListViewPane(controller);
@@ -609,20 +609,20 @@ final public class VisualizationPanel extends BorderPane {
                 view = detailViewPane;
                 break;
             default:
-                throw new IllegalArgumentException("Unknown VisualizationMode: " + viewMode.toString());
+                throw new IllegalArgumentException("Unknown ViewMode: " + viewMode.toString());
         }
 
-        //Set the new AbstractVisualizationPane as the one hosted by this VisualizationPanel.
+        //Set the new AbstractTimeLineView as the one hosted by this ViewFrame.
         Platform.runLater(() -> {
-            //clear out old vis.
+            //clear out old view.
             if (hostedView != null) {
                 toolBar.getItems().removeAll(hostedView.getSettingsNodes());
                 hostedView.dispose();
             }
 
             hostedView = view;
-            //setup new vis.
-            ActionUtils.configureButton(new Refresh(), refreshButton);//configure new refresh action for new visualization
+            //setup new view.
+            ActionUtils.configureButton(new Refresh(), refreshButton);//configure new refresh action for new view
             hostedView.refresh();
             toolBar.getItems().addAll(2, view.getSettingsNodes());
             notificationPane.setContent(hostedView);
@@ -670,7 +670,7 @@ final public class VisualizationPanel extends BorderPane {
             assert zoomButton != null : "fx:id=\"zoomButton\" was not injected: check your FXML file 'NoEventsDialog.fxml'."; // NON-NLS
 
             titledPane.setText(Bundle.NoEventsDialog_titledPane_text());
-            noEventsDialogLabel.setText(NbBundle.getMessage(NoEventsDialog.class, "VisualizationPanel.noEventsDialogLabel.text")); // NON-NLS
+            noEventsDialogLabel.setText(NbBundle.getMessage(NoEventsDialog.class, "ViewFrame.noEventsDialogLabel.text")); // NON-NLS
 
             dismissButton.setOnAction(actionEvent -> closeCallback.run());
 
@@ -699,7 +699,7 @@ final public class VisualizationPanel extends BorderPane {
             LocalDateTime pickerTime = pickerSupplier.get().getLocalDateTime();
             if (pickerTime != null) {
                 controller.pushTimeRange(intervalMapper.apply(filteredEvents.timeRangeProperty().get(), localDateTimeToEpochMilli(pickerTime)));
-                Platform.runLater(VisualizationPanel.this::refreshTimeUI);
+                Platform.runLater(ViewFrame.this::refreshTimeUI);
             }
         }
     }
@@ -767,16 +767,16 @@ final public class VisualizationPanel extends BorderPane {
     }
 
     /**
-     * Action that refreshes the Visualization.
+     * Action that refreshes the View.
      */
     private class Refresh extends Action {
 
         @NbBundle.Messages({
-            "VisualizationPanel.refresh.text=Refresh Vis.",
-            "VisualizationPanel.refresh.longText=Refresh the visualization to include information that is in the DB but not visualized, such as newly updated tags."})
+            "ViewFrame.refresh.text=Refresh View",
+            "ViewFrame.refresh.longText=Refresh the view to include information that is in the DB but not displayed, such as newly updated tags."})
         Refresh() {
-            super(Bundle.VisualizationPanel_refresh_text());
-            setLongText(Bundle.VisualizationPanel_refresh_longText());
+            super(Bundle.ViewFrame_refresh_text());
+            setLongText(Bundle.ViewFrame_refresh_longText());
             setGraphic(new ImageView(REFRESH));
             setEventHandler(actionEvent -> filteredEvents.postRefreshRequest());
             disabledProperty().bind(hostedView.outOfDateProperty().not());
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/CountsViewPane.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/CountsViewPane.java
index 28d6b72d1a..1b3424d88e 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/CountsViewPane.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/CountsViewPane.java
@@ -105,7 +105,7 @@ public class CountsViewPane extends AbstractTimelineChart<String, Number, Node,
     /**
      * Constructor
      *
-     * @param controller The TimelineController for this visualization.
+     * @param controller The TimelineController for this view.
      */
     @NbBundle.Messages({
         "# {0} - scale name",
@@ -249,7 +249,7 @@ public class CountsViewPane extends AbstractTimelineChart<String, Number, Node,
             "CountsViewPane.scaleLabel.text=Scale:",
             "CountsViewPane.scaleHelp.label.text=Scales:   ",
             "CountsViewPane.linearRadio.text=Linear",
-            "CountsViewPane.scaleHelpLinear=The linear scale is good for many use cases.  When this scale is selected, the height of the bars represents the counts in a linear, one-to-one fashion, and the y-axis is labeled with values. When the range of values is very large, time periods with low counts may have a bar that is too small to see.  To help the user detect this, the labels for date ranges with events are bold.  To see bars that are too small, there are three options:  adjust the window size so that the visualization area has more vertical space, adjust the time range shown so that time periods with larger bars are excluded, or adjust the scale setting to logarithmic.",
+            "CountsViewPane.scaleHelpLinear=The linear scale is good for many use cases.  When this scale is selected, the height of the bars represents the counts in a linear, one-to-one fashion, and the y-axis is labeled with values. When the range of values is very large, time periods with low counts may have a bar that is too small to see.  To help the user detect this, the labels for date ranges with events are bold.  To see bars that are too small, there are three options:  adjust the window size so that the timeline has more vertical space, adjust the time range shown so that time periods with larger bars are excluded, or adjust the scale setting to logarithmic.",
             "CountsViewPane.scaleHelpLog=The logarithmic scale represents the number of events in a non-linear way that compresses the difference between large and small numbers. Note that even with the logarithmic scale, an extremely large difference in counts may still produce bars too small to see.  In this case the only option may be to filter events to reduce the difference in counts.  NOTE: Because the logarithmic scale is applied to each event type separately, the meaning of the height of the combined bar is not intuitive, and to emphasize this, no labels are shown on the y-axis with the logarithmic scale. The logarithmic scale should be used to quickly compare the counts ",
             "CountsViewPane.scaleHelpLog2=across time within a type, or across types for one time period, but not both.",
             "CountsViewPane.scaleHelpLog3= The actual counts (available in tooltips or the result viewer) should be used for absolute comparisons.  Use the logarithmic scale with care."})
@@ -336,7 +336,7 @@ public class CountsViewPane extends AbstractTimelineChart<String, Number, Node,
      */
     @NbBundle.Messages({
         "CountsViewPane.loggedTask.name=Updating Counts View",
-        "CountsViewPane.loggedTask.updatingCounts=Populating visualization"})
+        "CountsViewPane.loggedTask.updatingCounts=Populating view"})
     private class CountsUpdateTask extends ViewRefreshTask<List<String>> {
 
         CountsUpdateTask() {
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/EventCountsChart.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/EventCountsChart.java
index 84502d62f4..c90280fa54 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/EventCountsChart.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/EventCountsChart.java
@@ -405,25 +405,6 @@ final class EventCountsChart extends StackedBarChart<String, Number> implements
                     if (showConfirmDialog == JOptionPane.YES_OPTION) {
                         controller.setViewMode(ViewMode.DETAIL);
                     }
-
-                    /*
-                     * //I would like to use the JAvafx dialog, but it doesn't
-                     * block the ui (because it is embeded in a TopComponent)
-                     * -jm
-                     *
-                     * final Dialogs.CommandLink yes = new
-                     * Dialogs.CommandLink("Yes", "switch to Details view");
-                     * final Dialogs.CommandLink no = new
-                     * Dialogs.CommandLink("No", "return to Counts view with a
-                     * resolution of Seconds"); Action choice = Dialogs.create()
-                     * .title("Switch to Details View?") .masthead("There is no
-                     * temporal resolution smaller than Seconds.")
-                     * .message("Would you like to switch to the Details view
-                     * instead?") .showCommandLinks(Arrays.asList(yes, no));
-                     *
-                     * if (choice == yes) {
-                     * controller.setViewMode(VisualizationMode.DETAIL); }
-                     */
                 }
             }
         }
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java
index 0a0b71837d..dcb20cb799 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java
@@ -91,7 +91,7 @@ public class DetailViewPane extends AbstractTimelineChart<DateTime, EventStripe,
 
     /**
      * Local copy of the zoomParams. Used to backout of a zoomParam change
-     * without needing to requery/redraw the vis.
+     * without needing to requery/redraw the view.
      */
     private ZoomParams currentZoomParams;
 
@@ -347,7 +347,7 @@ public class DetailViewPane extends AbstractTimelineChart<DateTime, EventStripe,
     @NbBundle.Messages({
         "DetailViewPane.loggedTask.queryDb=Retreiving event data",
         "DetailViewPane.loggedTask.name=Updating Details View",
-        "DetailViewPane.loggedTask.updateUI=Populating visualization",
+        "DetailViewPane.loggedTask.updateUI=Populating view",
         "DetailViewPane.loggedTask.continueButton=Continue",
         "DetailViewPane.loggedTask.backButton=Back (Cancel)",
         "# {0} - number of events",
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailsChartLane.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailsChartLane.java
index 8dc24adff2..6c743c3138 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailsChartLane.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailsChartLane.java
@@ -62,7 +62,7 @@ import org.sleuthkit.autopsy.timeline.ui.AbstractTimelineChart;
 import org.sleuthkit.autopsy.timeline.ui.ContextMenuProvider;
 
 /**
- * One "lane" of a the details visualization, contains all the core logic and
+ * One "lane" of a the details view, contains all the core logic and
  * layout code.
  *
  * NOTE: It was too hard to control the threading of this chart via the
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListViewPane.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListViewPane.java
index 91762abd7c..e2348493a6 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListViewPane.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListViewPane.java
@@ -29,7 +29,7 @@ import org.sleuthkit.autopsy.timeline.datamodel.FilteredEventsModel;
 import org.sleuthkit.autopsy.timeline.ui.AbstractTimeLineView;
 
 /**
- * An AbstractTimeLineView that uses a TableView to represent the events.
+ * An AbstractTimeLineView that uses a TableView to display events.
  */
 public class ListViewPane extends AbstractTimeLineView {
 
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/zooming/ZoomSettingsPane.java b/Core/src/org/sleuthkit/autopsy/timeline/zooming/ZoomSettingsPane.java
index 1b783a6e3d..20d75c32db 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/zooming/ZoomSettingsPane.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/zooming/ZoomSettingsPane.java
@@ -22,6 +22,7 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
+import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
@@ -92,7 +93,6 @@ public class ZoomSettingsPane extends TitledPane {
                 EventTypeZoomLevel::ordinal,
                 Function.identity());
         typeZoomLabel.setText(Bundle.ZoomSettingsPane_typeZoomLabel_text());
-        typeZoomSlider.disableProperty().bind(controller.viewModeProperty().isEqualTo(ViewMode.LIST));
 
         descrLODSlider.setMax(DescriptionLoD.values().length - 1);
         configureSliderListeners(descrLODSlider,
@@ -103,15 +103,14 @@ public class ZoomSettingsPane extends TitledPane {
                 Function.identity());
         descrLODLabel.setText(Bundle.ZoomSettingsPane_descrLODLabel_text());
         //the description slider is only usefull in the detail view
-        descrLODSlider.disableProperty().bind(controller.viewModeProperty().isNotEqualTo(ViewMode.DETAIL));
+        descrLODSlider.disableProperty().bind(controller.viewModeProperty().isEqualTo(ViewMode.COUNTS));
 
         /**
          * In order for the selected value in the time unit slider to correspond
-         * to the amount of time used as units along the x-axis of the
-         * visualization, and since we don't want to show "forever" as a time
-         * unit, the range of the slider is restricted, and there is an offset
-         * of 1 between the "real" value, and what is shown in the slider
-         * labels.
+         * to the amount of time used as units along the x-axis of the view, and
+         * since we don't want to show "forever" as a time unit, the range of
+         * the slider is restricted, and there is an offset of 1 between the
+         * "real" value, and what is shown in the slider labels.
          */
         timeUnitSlider.setMax(TimeUnits.values().length - 2);
         configureSliderListeners(timeUnitSlider,
@@ -122,7 +121,12 @@ public class ZoomSettingsPane extends TitledPane {
                 modelTimeRange -> RangeDivisionInfo.getRangeDivisionInfo(modelTimeRange).getPeriodSize().ordinal() - 1,
                 index -> index + 1);  //compensate for the -1 above when mapping to the Enum whose displayName will be shown at index
         timeUnitLabel.setText(Bundle.ZoomSettingsPane_timeUnitLabel_text());
-        timeUnitSlider.disableProperty().bind(controller.viewModeProperty().isEqualTo(ViewMode.LIST));
+
+        //hide the whole panel in list mode
+        BooleanBinding notListMode = controller.viewModeProperty().isNotEqualTo(ViewMode.LIST);
+        visibleProperty().bind(notListMode);
+        managedProperty().bind(notListMode);
+
     }
 
     /**
@@ -178,7 +182,7 @@ public class ZoomSettingsPane extends TitledPane {
         //set the tick labels to the enum displayNames
         slider.setLabelFormatter(new EnumSliderLabelFormatter<>(enumClass, labelIndexMapper));
 
-        //make a listener to responds to slider value changes (by updating the visualization)
+        //make a listener to responds to slider value changes (by updating the view)
         final InvalidationListener sliderListener = observable -> {
             //only process event if the slider value is not changing (user has released slider thumb)
             if (slider.isValueChanging() == false) {