diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
index 997ecbab82..cd901c0c1d 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
@@ -51,7 +51,7 @@ import org.sleuthkit.datamodel.TskException;
  * View correlation results from other cases
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-@ServiceProvider(service = DataContentViewer.class, position = 9)
+@ServiceProvider(service = DataContentViewer.class, position = 10)
 @Messages({"DataContentViewerOtherCases.title=Other Occurrences",
     "DataContentViewerOtherCases.toolTip=Displays instances of the selected file/artifact from other occurrences."})
 public final class DataContentViewerOtherCases extends JPanel implements DataContentViewer {
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/AnnotationsContentViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/AnnotationsContentViewer.java
index a12675994e..5a4725a8d7 100755
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/AnnotationsContentViewer.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/AnnotationsContentViewer.java
@@ -61,7 +61,7 @@ import org.jsoup.nodes.Element;
  * Annotations view of file contents.
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-@ServiceProvider(service = DataContentViewer.class, position = 8)
+@ServiceProvider(service = DataContentViewer.class, position = 9)
 @Messages({
     "AnnotationsContentViewer.title=Annotations",
     "AnnotationsContentViewer.toolTip=Displays tags and comments associated with the selected content.",
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/contextviewer/ContextViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/contextviewer/ContextViewer.java
index c223f577b0..bfa0cfc3e9 100644
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/contextviewer/ContextViewer.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/contextviewer/ContextViewer.java
@@ -48,7 +48,7 @@ import org.sleuthkit.datamodel.TskCoreException;
  * usage, if known.
  *
  */
-@ServiceProvider(service = DataContentViewer.class, position = 7)
+@ServiceProvider(service = DataContentViewer.class, position = 8)
 public final class ContextViewer extends javax.swing.JPanel implements DataContentViewer {
 
     private static final long serialVersionUID = 1L;
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/Bundle.properties-MERGED
index 266168e4ad..4a962469c1 100755
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/Bundle.properties-MERGED
@@ -11,6 +11,6 @@ OsAccountDataPanel_realm_name=Name
 OsAccountDataPanel_realm_scope=Scope
 OsAccountDataPanel_realm_title=Realm Properties
 OsAccountDataPanel_realm_unknown=Unknown
-OsAccountViewer_title=Os Account
-OsAccountViewer_tooltip=Viewer for OS accounts related to the selected node.
+OsAccountViewer_title=OS Account
+OsAccountViewer_tooltip=Viewer for Operating System accounts related to the selected node.
 TableDataPanel.titleLabel.text=Title
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountViewer.form b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountViewer.form
index 910ba27b78..e627b40c94 100755
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountViewer.form
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountViewer.form
@@ -11,6 +11,7 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,1,-112"/>
   </AuxValues>
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountViewer.java
index ccedd942bb..a56e4de8c3 100755
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountViewer.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountViewer.java
@@ -34,7 +34,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 /**
  * DataContentViewer for OsAccounts.
  */
-@ServiceProvider(service = DataContentViewer.class, position = 12)
+@ServiceProvider(service = DataContentViewer.class, position = 7)
 public class OsAccountViewer extends javax.swing.JPanel implements DataContentViewer {
 
     private static final long serialVersionUID = 1L;
@@ -87,7 +87,7 @@ public class OsAccountViewer extends javax.swing.JPanel implements DataContentVi
     }
 
     @Messages({
-        "OsAccountViewer_title=Os Account"
+        "OsAccountViewer_title=OS Account"
     })
     @Override
     public String getTitle() {
@@ -95,7 +95,7 @@ public class OsAccountViewer extends javax.swing.JPanel implements DataContentVi
     }
 
     @Messages({
-        "OsAccountViewer_tooltip=Viewer for OS accounts related to the selected node."
+        "OsAccountViewer_tooltip=Viewer for Operating System accounts related to the selected node."
     })
     @Override
     public String getToolTip() {