diff --git a/testresults/src/org/labkey/testresults/TestResultsController.java b/testresults/src/org/labkey/testresults/TestResultsController.java
index 199fb36f..345ff79e 100644
--- a/testresults/src/org/labkey/testresults/TestResultsController.java
+++ b/testresults/src/org/labkey/testresults/TestResultsController.java
@@ -111,6 +111,8 @@
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -133,6 +135,60 @@ public class TestResultsController extends SpringActionController
 
     private static final DefaultActionResolver _actionResolver = new DefaultActionResolver(TestResultsController.class);
 
+    // Tab name constants for menu highlighting
+    public static class TabNames
+    {
+        // Request attribute name
+        public static final String ACTIVE_TAB_ATTR = "activeTab";
+        // CSS classes
+        private static final String NAV_TAB_CLASS = "nav-tab";
+        private static final String ACTIVE_CSS_CLASS = " active";
+
+        // Tab identifiers
+        public static final String OVERVIEW = "overview";
+        public static final String USER = "user";
+        public static final String RUN = "run";
+        public static final String LONGTERM = "longterm";
+        public static final String FLAGS = "flags";
+        public static final String TRAINING_DATA = "trainingdata";
+        public static final String ERRORS = "errors";
+
+        /** Returns CSS class for a tab link: "nav-tab" or "nav-tab active" */
+        public static String getTabClass(String tabName, String activeTab)
+        {
+            return NAV_TAB_CLASS + (tabName.equals(activeTab) ? ACTIVE_CSS_CLASS : "");
+        }
+    }
+
+    // Form class for RetrainAllAction
+    public static class RetrainAllForm
+    {
+        private String _mode = "reset";
+        private int _maxRuns = 20;
+        private int _minRuns = 5;
+        private Integer _targetRuns; // backwards compatibility
+
+        public String getMode() { return _mode; }
+        public void setMode(String mode) { _mode = mode; }
+
+        public int getMaxRuns()
+        {
+            // Support legacy targetRuns parameter
+            if (_targetRuns != null)
+                return _targetRuns;
+            return _maxRuns;
+        }
+        public void setMaxRuns(int maxRuns) { _maxRuns = maxRuns; }
+
+        public int getMinRuns() { return _minRuns; }
+        public void setMinRuns(int minRuns) { _minRuns = minRuns; }
+
+        public Integer getTargetRuns() { return _targetRuns; }
+        public void setTargetRuns(Integer targetRuns) { _targetRuns = targetRuns; }
+
+        public boolean isIncremental() { return "incremental".equalsIgnoreCase(_mode); }
+    }
+
     public TestResultsController()
     {
         setActionResolver(_actionResolver);
@@ -1037,6 +1093,110 @@ public Object execute(Object o, BindException errors)
         }
     }
 
+    @RequiresSiteAdmin
+    public static class RetrainAllAction extends MutatingApiAction<RetrainAllForm>
+    {
+        @Override
+        public Object execute(RetrainAllForm form, BindException errors)
+        {
+            // Validate and clamp parameters
+            int maxRuns = Math.max(1, Math.min(100, form.getMaxRuns()));
+            int minRuns = Math.max(1, Math.min(maxRuns, form.getMinRuns()));
+            boolean incremental = form.isIncremental();
+
+            Container c = getContainer();
+            String containerPath = c.getPath();
+            int expectedDuration = containerPath.toLowerCase().contains("perf") ? 720 : 540;
+
+            // Only look back 1.5x maxRuns days to avoid ancient data
+            int lookbackDays = (int) Math.ceil(maxRuns * 1.5);
+            java.sql.Timestamp cutoffDate = new java.sql.Timestamp(
+                System.currentTimeMillis() - (long) lookbackDays * 24 * 60 * 60 * 1000);
+
+            TestResultsManager mgr = TestResultsManager.get();
+            DbScope scope = TestResultsSchema.getSchema().getScope();
+
+            try (DbScope.Transaction transaction = scope.ensureTransaction())
+            {
+                List<Integer> allUserIds = mgr.getRecentUserIds(c, cutoffDate);
+
+                if (!incremental)
+                {
+                    mgr.deleteTrainRunsForContainer(c);
+                    mgr.deleteUserDataForContainer(c);
+                }
+
+                int usersRetrained = 0;
+                int totalTrainRuns = 0;
+
+                for (int userId : allUserIds)
+                {
+                    Set<Integer> existingRunIds = mgr.getExistingTrainRunIds(userId, c);
+                    List<Integer> recentCleanRunIds = mgr.getCleanRunIds(userId, c, cutoffDate, expectedDuration);
+
+                    // Determine final set of trainrun IDs
+                    List<Integer> finalRunIds;
+                    if (incremental && !existingRunIds.isEmpty())
+                    {
+                        finalRunIds = mgr.getCandidateRunIds(userId, c, existingRunIds, recentCleanRunIds, maxRuns);
+                    }
+                    else
+                    {
+                        finalRunIds = recentCleanRunIds.size() > maxRuns
+                            ? new ArrayList<>(recentCleanRunIds.subList(0, maxRuns))
+                            : new ArrayList<>(recentCleanRunIds);
+                    }
+
+                    // Skip if total runs is below minimum threshold
+                    if (finalRunIds.size() < minRuns)
+                        continue;
+
+                    // Determine runs to add and remove
+                    Set<Integer> finalRunSet = new HashSet<>(finalRunIds);
+                    List<Integer> runsToAdd = new ArrayList<>();
+                    List<Integer> runsToRemove = new ArrayList<>();
+
+                    for (int runId : finalRunIds)
+                    {
+                        if (!existingRunIds.contains(runId))
+                            runsToAdd.add(runId);
+                    }
+                    for (int runId : existingRunIds)
+                    {
+                        if (!finalRunSet.contains(runId))
+                            runsToRemove.add(runId);
+                    }
+
+                    mgr.removeTrainRuns(runsToRemove);
+                    mgr.addTrainRuns(runsToAdd);
+
+                    boolean isActive = finalRunIds.size() >= maxRuns;
+                    mgr.upsertUserData(userId, c, finalRunIds, isActive);
+
+                    usersRetrained++;
+                    totalTrainRuns += runsToAdd.size();
+                }
+
+                transaction.commit();
+
+                ApiSimpleResponse response = new ApiSimpleResponse();
+                response.put("success", true);
+                response.put("usersRetrained", usersRetrained);
+                response.put("totalTrainRuns", totalTrainRuns);
+                response.put("mode", form.getMode());
+                return response;
+            }
+            catch (Exception e)
+            {
+                _log.error("Error in RetrainAllAction", e);
+                ApiSimpleResponse response = new ApiSimpleResponse();
+                response.put("success", false);
+                response.put("error", e.getMessage());
+                return response;
+            }
+        }
+    }
+
     /**
      * action for posting test output as an xml file
      */
diff --git a/testresults/src/org/labkey/testresults/TestResultsManager.java b/testresults/src/org/labkey/testresults/TestResultsManager.java
index 0398c6b1..605541a3 100644
--- a/testresults/src/org/labkey/testresults/TestResultsManager.java
+++ b/testresults/src/org/labkey/testresults/TestResultsManager.java
@@ -16,6 +16,20 @@
 
 package org.labkey.testresults;
 
+import org.labkey.api.data.Container;
+import org.labkey.api.data.DbScope;
+import org.labkey.api.data.SQLFragment;
+import org.labkey.api.data.SqlExecutor;
+import org.labkey.api.data.SqlSelector;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * User: Yuval Boss, yuval(at)uw.edu
  * Date: 1/14/2015
@@ -33,4 +47,212 @@ public static TestResultsManager get()
     {
         return _instance;
     }
-}
\ No newline at end of file
+
+    /**
+     * Get distinct user IDs from recent test runs in a container.
+     */
+    public List<Integer> getRecentUserIds(Container container, Timestamp cutoffDate)
+    {
+        DbScope scope = TestResultsSchema.getSchema().getScope();
+        SQLFragment sql = new SQLFragment();
+        sql.append(
+            "SELECT DISTINCT userid FROM " + TestResultsSchema.getTableInfoTestRuns() +
+            " WHERE container = ? AND posttime >= ?");
+        sql.add(container.getEntityId());
+        sql.add(cutoffDate);
+
+        List<Integer> userIds = new ArrayList<>();
+        new SqlSelector(scope, sql).forEach(rs -> userIds.add(rs.getInt("userid")));
+        return userIds;
+    }
+
+    /**
+     * Get trainrun counts per user for a container.
+     */
+    public Map<Integer, Integer> getTrainRunCounts(Container container)
+    {
+        DbScope scope = TestResultsSchema.getSchema().getScope();
+        SQLFragment sql = new SQLFragment();
+        sql.append(
+            "SELECT r.userid, COUNT(tr.runid) as traincount" +
+            " FROM " + TestResultsSchema.getTableInfoTrain() + " tr" +
+            " JOIN " + TestResultsSchema.getTableInfoTestRuns() + " r ON tr.runid = r.id" +
+            " WHERE r.container = ?" +
+            " GROUP BY r.userid");
+        sql.add(container.getEntityId());
+
+        Map<Integer, Integer> counts = new HashMap<>();
+        new SqlSelector(scope, sql).forEach(rs ->
+            counts.put(rs.getInt("userid"), rs.getInt("traincount")));
+        return counts;
+    }
+
+    /**
+     * Delete all trainruns for a container.
+     */
+    public void deleteTrainRunsForContainer(Container container)
+    {
+        DbScope scope = TestResultsSchema.getSchema().getScope();
+        SQLFragment sql = new SQLFragment();
+        sql.append(
+            "DELETE FROM " + TestResultsSchema.getTableInfoTrain() +
+            " WHERE runid IN (SELECT id FROM " + TestResultsSchema.getTableInfoTestRuns() +
+            " WHERE container = ?)");
+        sql.add(container.getEntityId());
+        new SqlExecutor(scope).execute(sql);
+    }
+
+    /**
+     * Delete all userdata for a container.
+     */
+    public void deleteUserDataForContainer(Container container)
+    {
+        DbScope scope = TestResultsSchema.getSchema().getScope();
+        SQLFragment sql = new SQLFragment();
+        sql.append("DELETE FROM " + TestResultsSchema.getTableInfoUserData() + " WHERE container = ?");
+        sql.add(container.getEntityId());
+        new SqlExecutor(scope).execute(sql);
+    }
+
+    /**
+     * Get existing trainrun IDs for a user in a container.
+     */
+    public Set<Integer> getExistingTrainRunIds(int userId, Container container)
+    {
+        DbScope scope = TestResultsSchema.getSchema().getScope();
+        SQLFragment sql = new SQLFragment();
+        sql.append(
+            "SELECT tr.runid FROM " + TestResultsSchema.getTableInfoTrain() + " tr" +
+            " JOIN " + TestResultsSchema.getTableInfoTestRuns() + " r ON tr.runid = r.id" +
+            " WHERE r.userid = ? AND r.container = ?");
+        sql.add(userId);
+        sql.add(container.getEntityId());
+
+        Set<Integer> runIds = new HashSet<>();
+        new SqlSelector(scope, sql).forEach(rs -> runIds.add(rs.getInt("runid")));
+        return runIds;
+    }
+
+    /**
+     * Get clean run IDs for a user within lookback period.
+     * Clean = 0 failures, 0 leaks, passedtests > 0, not flagged, full duration, no hangs.
+     */
+    public List<Integer> getCleanRunIds(int userId, Container container, Timestamp cutoffDate, int expectedDuration)
+    {
+        DbScope scope = TestResultsSchema.getSchema().getScope();
+        SQLFragment sql = new SQLFragment();
+        sql.append(
+            "SELECT tr.id FROM " + TestResultsSchema.getTableInfoTestRuns() + " tr" +
+            " WHERE tr.userid = ? AND tr.container = ?" +
+            " AND tr.posttime >= ?" +
+            " AND tr.failedtests = 0 AND tr.leakedtests = 0" +
+            " AND tr.passedtests > 0 AND tr.flagged = false" +
+            " AND tr.duration >= ?" +
+            " AND NOT EXISTS (SELECT 1 FROM " + TestResultsSchema.getTableInfoHangs() +
+            " h WHERE h.testrunid = tr.id)" +
+            " ORDER BY tr.posttime DESC");
+        sql.add(userId);
+        sql.add(container.getEntityId());
+        sql.add(cutoffDate);
+        sql.add(expectedDuration);
+
+        List<Integer> runIds = new ArrayList<>();
+        new SqlSelector(scope, sql).forEach(rs -> runIds.add(rs.getInt("id")));
+        return runIds;
+    }
+
+    /**
+     * Get combined candidate run IDs (existing + recent) sorted by posttime, limited to maxRuns.
+     */
+    public List<Integer> getCandidateRunIds(int userId, Container container,
+                                            Set<Integer> existingIds, List<Integer> recentIds, int maxRuns)
+    {
+        if (existingIds.isEmpty() && recentIds.isEmpty())
+            return new ArrayList<>();
+
+        DbScope scope = TestResultsSchema.getSchema().getScope();
+        SQLFragment sql = new SQLFragment();
+        sql.append(
+            "SELECT id FROM " + TestResultsSchema.getTableInfoTestRuns() +
+            " WHERE userid = ? AND container = ?" +
+            " AND (id = ANY(?) OR id = ANY(?))" +
+            " ORDER BY posttime DESC");
+        sql.add(userId);
+        sql.add(container.getEntityId());
+        sql.add(existingIds.toArray(new Integer[0]));
+        sql.add(recentIds.toArray(new Integer[0]));
+
+        List<Integer> result = new ArrayList<>();
+        new SqlSelector(scope, sql).forEach(rs -> {
+            if (result.size() < maxRuns)
+                result.add(rs.getInt("id"));
+        });
+        return result;
+    }
+
+    /**
+     * Delete trainruns by run IDs.
+     */
+    public void removeTrainRuns(List<Integer> runIds)
+    {
+        if (runIds.isEmpty())
+            return;
+
+        DbScope scope = TestResultsSchema.getSchema().getScope();
+        for (int runId : runIds)
+        {
+            SQLFragment sql = new SQLFragment();
+            sql.append("DELETE FROM " + TestResultsSchema.getTableInfoTrain() + " WHERE runid = ?");
+            sql.add(runId);
+            new SqlExecutor(scope).execute(sql);
+        }
+    }
+
+    /**
+     * Insert trainruns by run IDs.
+     */
+    public void addTrainRuns(List<Integer> runIds)
+    {
+        if (runIds.isEmpty())
+            return;
+
+        DbScope scope = TestResultsSchema.getSchema().getScope();
+        for (int runId : runIds)
+        {
+            SQLFragment sql = new SQLFragment();
+            sql.append("INSERT INTO " + TestResultsSchema.getTableInfoTrain() + " (runid) VALUES (?)");
+            sql.add(runId);
+            new SqlExecutor(scope).execute(sql);
+        }
+    }
+
+    /**
+     * Upsert userdata with calculated stats from specified run IDs.
+     */
+    public void upsertUserData(int userId, Container container, List<Integer> runIds, boolean active)
+    {
+        if (runIds.isEmpty())
+            return;
+
+        DbScope scope = TestResultsSchema.getSchema().getScope();
+        SQLFragment sql = new SQLFragment();
+        sql.append(
+            "INSERT INTO " + TestResultsSchema.getTableInfoUserData() +
+            " (userid, container, meantestsrun, meanmemory, stddevtestsrun, stddevmemory, active)" +
+            " SELECT ?, ?, avg(passedtests), avg(averagemem)," +
+            " stddev_pop(passedtests), stddev_pop(averagemem), ?" +
+            " FROM " + TestResultsSchema.getTableInfoTestRuns() +
+            " WHERE id = ANY(?)" +
+            " ON CONFLICT(userid, container) DO UPDATE SET" +
+            " meantestsrun = excluded.meantestsrun," +
+            " meanmemory = excluded.meanmemory," +
+            " stddevtestsrun = excluded.stddevtestsrun," +
+            " stddevmemory = excluded.stddevmemory," +
+            " active = excluded.active");
+        sql.add(userId);
+        sql.add(container.getEntityId());
+        sql.add(active);
+        sql.add(runIds.toArray(new Integer[0]));
+        new SqlExecutor(scope).execute(sql);
+    }
+}
diff --git a/testresults/src/org/labkey/testresults/view/errorFiles.jsp b/testresults/src/org/labkey/testresults/view/errorFiles.jsp
index 015d84aa..7eb70766 100644
--- a/testresults/src/org/labkey/testresults/view/errorFiles.jsp
+++ b/testresults/src/org/labkey/testresults/view/errorFiles.jsp
@@ -24,6 +24,7 @@
     Container c = getContainer();
 %>
 
+<% request.setAttribute(TestResultsController.TabNames.ACTIVE_TAB_ATTR, TestResultsController.TabNames.ERRORS); %>
 <%@include file="menu.jsp" %>
 
 <p>All the files listed below at one point or another failed to post.  When a run is successfully posted through this page it gets removed from the list.</p>
diff --git a/testresults/src/org/labkey/testresults/view/failureDetail.jsp b/testresults/src/org/labkey/testresults/view/failureDetail.jsp
index e5986926..6537303b 100644
--- a/testresults/src/org/labkey/testresults/view/failureDetail.jsp
+++ b/testresults/src/org/labkey/testresults/view/failureDetail.jsp
@@ -188,6 +188,7 @@
     }
 %>
 
+<% request.setAttribute(TestResultsController.TabNames.ACTIVE_TAB_ATTR, ""); %>
 <%@include file="menu.jsp" %>
 
 <style>
diff --git a/testresults/src/org/labkey/testresults/view/flagged.jsp b/testresults/src/org/labkey/testresults/view/flagged.jsp
index 98b87de7..f51a9aec 100644
--- a/testresults/src/org/labkey/testresults/view/flagged.jsp
+++ b/testresults/src/org/labkey/testresults/view/flagged.jsp
@@ -25,6 +25,7 @@
     TestsDataBean data = (TestsDataBean)me.getModelBean();
 %>
 
+<% request.setAttribute(TestResultsController.TabNames.ACTIVE_TAB_ATTR, TestResultsController.TabNames.FLAGS); %>
 <%@include file="menu.jsp" %>
 
 <p>Runs which are flagged will not show up in the Overview breakdown, Long Term, and Failure pages.  This includes graphs, charts, and any other sort of data visualization.</p>
diff --git a/testresults/src/org/labkey/testresults/view/longTerm.jsp b/testresults/src/org/labkey/testresults/view/longTerm.jsp
index 894119b1..21b1f421 100644
--- a/testresults/src/org/labkey/testresults/view/longTerm.jsp
+++ b/testresults/src/org/labkey/testresults/view/longTerm.jsp
@@ -31,8 +31,8 @@
     }
 %>
 
+<% request.setAttribute(TestResultsController.TabNames.ACTIVE_TAB_ATTR, TestResultsController.TabNames.LONGTERM); %>
 <%@include file="menu.jsp" %>
-<br />
 <form action="<%=h(new ActionURL(TestResultsController.LongTermAction.class, c))%>">
     View Type: <select id="view-type-combobox" name="viewType">
                     <option disabled selected> -- select an option -- </option>
diff --git a/testresults/src/org/labkey/testresults/view/menu.jsp b/testresults/src/org/labkey/testresults/view/menu.jsp
index 8cac25da..80314efd 100644
--- a/testresults/src/org/labkey/testresults/view/menu.jsp
+++ b/testresults/src/org/labkey/testresults/view/menu.jsp
@@ -7,19 +7,73 @@
 <%
     final String menuContextPath = AppProps.getInstance().getContextPath();
     Container menuContainer = getViewContext().getContainer();
+    // activeTab is set by parent JSP via request attribute before including menu.jsp
+    String activeTab = (String) request.getAttribute(TestResultsController.TabNames.ACTIVE_TAB_ATTR);
+    if (activeTab == null) activeTab = "";
 %>
 
-<div id="menu">
+<style>
+    #menu.testresults-nav {
+        background: #4b2e83;
+        padding: 0 !important;
+        padding-top: 6px !important;
+        margin: 0 0 12px 0 !important;
+        height: 40px !important;
+        overflow: visible;
+    }
+    #menu.testresults-nav ul {
+        list-style: none !important;
+        margin: 0 !important;
+        padding: 0 0 0 10px !important;
+        display: inline;
+    }
+    #menu.testresults-nav li {
+        display: inline;
+        margin: 0;
+        padding: 0;
+    }
+    #menu.testresults-nav li:hover {
+        background-color: transparent !important;
+    }
+    .testresults-nav .nav-tab {
+        display: inline-block;
+        padding: 4px 10px;
+        color: #fff;
+        text-decoration: none;
+        border-radius: 4px;
+        transition: background 0.2s;
+    }
+    .testresults-nav .nav-tab:hover {
+        background: #B8A506;
+    }
+    .testresults-nav .nav-tab.active {
+        background: rgba(255, 255, 255, 0.25);
+        font-weight: bold;
+    }
+    #menu.testresults-nav #stats {
+        float: right;
+        margin-right: 40px;
+        margin-top: 6px;
+        color: #fff;
+        font-weight: 600;
+    }
+    #menu.testresults-nav #uw {
+        float: right;
+        margin-top: 2px;
+    }
+</style>
+
+<div id="menu" class="testresults-nav">
+    <img src="<%=getWebappURL("TestResults/img/uw.png")%>" id="uw" alt="UW">
+    <span id="stats"></span>
     <ul>
-        <li><a href="<%=h(new ActionURL(TestResultsController.BeginAction.class, menuContainer))%>" style="color:#fff;">-Overview</a></li>
-        <li><a href="<%=h(new ActionURL(TestResultsController.ShowUserAction.class, menuContainer))%>" style="color:#fff;">-User</a></li>
-        <li><a href="<%=h(new ActionURL(TestResultsController.ShowRunAction.class, menuContainer))%>" style="color:#fff;">-Run</a></li>
-        <li><a href="<%=h(new ActionURL(TestResultsController.LongTermAction.class, menuContainer))%>" style="color:#fff;">-Long Term</a></li>
-        <li><a href="<%=h(new ActionURL(TestResultsController.ShowFlaggedAction.class, menuContainer))%>" style="color:#fff;">-Flags</a></li>
-        <li><a href="<%=h(new ActionURL(TestResultsController.TrainingDataViewAction.class, menuContainer))%>" style="color:#fff;">-Training Data</a></li>
-        <li><a href="<%=h(new ActionURL(TestResultsController.ErrorFilesAction.class, menuContainer))%>" style="color:#fff;">-Posting Errors</a></li>
-        <li><a href="/home/issues/project-begin.view" target="_blank" title="Report bugs/Request features.  Use 'TestResults' as area when creating new issue" style="color:#fff;">-Issues</a></li>
-        <img src="<%=getWebappURL("TestResults/img/uw.png")%>" id="uw">
-        <span id="stats"></span>
+        <li><a href="<%=h(new ActionURL(TestResultsController.BeginAction.class, menuContainer))%>" class="<%=h(TestResultsController.TabNames.getTabClass(TestResultsController.TabNames.OVERVIEW, activeTab))%>">Overview</a></li>
+        <li><a href="<%=h(new ActionURL(TestResultsController.ShowUserAction.class, menuContainer))%>" class="<%=h(TestResultsController.TabNames.getTabClass(TestResultsController.TabNames.USER, activeTab))%>">User</a></li>
+        <li><a href="<%=h(new ActionURL(TestResultsController.ShowRunAction.class, menuContainer))%>" class="<%=h(TestResultsController.TabNames.getTabClass(TestResultsController.TabNames.RUN, activeTab))%>">Run</a></li>
+        <li><a href="<%=h(new ActionURL(TestResultsController.LongTermAction.class, menuContainer))%>" class="<%=h(TestResultsController.TabNames.getTabClass(TestResultsController.TabNames.LONGTERM, activeTab))%>">Long Term</a></li>
+        <li><a href="<%=h(new ActionURL(TestResultsController.ShowFlaggedAction.class, menuContainer))%>" class="<%=h(TestResultsController.TabNames.getTabClass(TestResultsController.TabNames.FLAGS, activeTab))%>">Flags</a></li>
+        <li><a href="<%=h(new ActionURL(TestResultsController.TrainingDataViewAction.class, menuContainer))%>" class="<%=h(TestResultsController.TabNames.getTabClass(TestResultsController.TabNames.TRAINING_DATA, activeTab))%>">Training Data</a></li>
+        <li><a href="<%=h(new ActionURL(TestResultsController.ErrorFilesAction.class, menuContainer))%>" class="<%=h(TestResultsController.TabNames.getTabClass(TestResultsController.TabNames.ERRORS, activeTab))%>">Posting Errors</a></li>
+        <li><a href="/home/issues/project-begin.view" target="_blank" title="Report bugs/Request features. Use 'TestResults' as area when creating new issue" class="nav-tab">Issues</a></li>
     </ul>
 </div>
diff --git a/testresults/src/org/labkey/testresults/view/multiFailureDetail.jsp b/testresults/src/org/labkey/testresults/view/multiFailureDetail.jsp
index 6f457e75..573165d9 100644
--- a/testresults/src/org/labkey/testresults/view/multiFailureDetail.jsp
+++ b/testresults/src/org/labkey/testresults/view/multiFailureDetail.jsp
@@ -63,8 +63,8 @@
     }
 %>
 
+<% request.setAttribute(TestResultsController.TabNames.ACTIVE_TAB_ATTR, ""); %>
 <%@include file="menu.jsp" %>
-<br />
 <form action="<%=h(new ActionURL(TestResultsController.ShowFailures.class, c))%>">
     View Type: <select name="viewType">
     <option disabled selected> -- select an option -- </option>
diff --git a/testresults/src/org/labkey/testresults/view/runDetail.jsp b/testresults/src/org/labkey/testresults/view/runDetail.jsp
index 73e1e026..3013117d 100644
--- a/testresults/src/org/labkey/testresults/view/runDetail.jsp
+++ b/testresults/src/org/labkey/testresults/view/runDetail.jsp
@@ -37,6 +37,7 @@
     String runId = getViewContext().getRequest().getParameter("runId");
 %>
 
+<% request.setAttribute(TestResultsController.TabNames.ACTIVE_TAB_ATTR, TestResultsController.TabNames.RUN); %>
 <%@include file="menu.jsp" %>
 <script type="text/javascript" nonce="<%=getScriptNonce()%>">
     LABKEY.requiresCss("/TestResults/css/style.css");
diff --git a/testresults/src/org/labkey/testresults/view/rundown.jsp b/testresults/src/org/labkey/testresults/view/rundown.jsp
index 1fae2331..0c42692e 100644
--- a/testresults/src/org/labkey/testresults/view/rundown.jsp
+++ b/testresults/src/org/labkey/testresults/view/rundown.jsp
@@ -92,6 +92,7 @@
 </style>
 
 <div id="container">
+<% request.setAttribute(TestResultsController.TabNames.ACTIVE_TAB_ATTR, TestResultsController.TabNames.OVERVIEW); %>
 <%@include file="menu.jsp" %>
 <div id="content">
     <p>
diff --git a/testresults/src/org/labkey/testresults/view/trainingdata.jsp b/testresults/src/org/labkey/testresults/view/trainingdata.jsp
index 5a236c3f..f19abf73 100644
--- a/testresults/src/org/labkey/testresults/view/trainingdata.jsp
+++ b/testresults/src/org/labkey/testresults/view/trainingdata.jsp
@@ -35,6 +35,7 @@
 %>
 
 <div id="content">
+    <% request.setAttribute(TestResultsController.TabNames.ACTIVE_TAB_ATTR, TestResultsController.TabNames.TRAINING_DATA); %>
     <%@include file="menu.jsp" %>
     <%
         String value = (request.getParameter("action"));
@@ -47,9 +48,10 @@
         <option disabled value="firsttime" <%= h(value.equals("firsttime") ? "selected='selected'" : "") %>> -- select an option -- </option>
         <option id="email" value="email"  <%= h(value.equals("email") ? "selected='selected'" : "") %>>Email Form</option>
         <option id="error" value="error" <%= h(value.equals("error") ? "selected='selected'" : "") %>>Error/Warning edits</option>
+        <option id="retrain" value="retrain" <%= h(value.equals("retrain") ? "selected='selected'" : "") %>>Retrain</option>
     </select>
 
-    <table id="emailform">
+    <table id="emailform" style="margin: 10px 0 10px 5px;">
         <tr>
             <td style="vertical-align: top; padding-right: 20px;">
                 <div style="font-weight:600;" title="testresults-setEmailCron.view?action={status|start|stop}">Email cron active: <span id="emailstatus" style="color:#247BA0;"></span>
@@ -57,60 +59,90 @@
                     <div id="email-cron"></div>
                 </div>
             </td>
-            <td style="vertical-align: top; padding-right: 20px;">
-                <form autocomplete="off">
-                    <table style="margin-top: 0;">
+            <td style="vertical-align: top; padding-right: 12px;">
+                <form autocomplete="off" style="margin: 0; padding: 0;">
+                    <table style="border-spacing: 0; border-collapse: separate; margin: 0;">
                         <tr>
-                            <td style="text-align: left;">From:</td>
-                            <td><input type="text" name="from" id="emailFrom" value="<%=h(SendTestResultsEmail.DEFAULT_EMAIL.ADMIN_EMAIL)%>" autocomplete="off"></td>
+                            <td style="text-align: right; padding: 0 12px 4px 0;">From:</td>
+                            <td style="padding: 0 0 4px 0;"><input type="text" name="from" id="emailFrom" value="<%=h(SendTestResultsEmail.DEFAULT_EMAIL.ADMIN_EMAIL)%>" autocomplete="off"></td>
                         </tr>
                         <tr>
-                            <td style="text-align: left;">To:</td>
-                            <td><input type="text" name="to" id="emailTo" value="<%=h(SendTestResultsEmail.DEFAULT_EMAIL.RECIPIENT)%>" autocomplete="off"></td>
+                            <td style="text-align: right; padding: 4px 12px 4px 0;">To:</td>
+                            <td style="padding: 4px 0;"><input type="text" name="to" id="emailTo" value="<%=h(SendTestResultsEmail.DEFAULT_EMAIL.RECIPIENT)%>" autocomplete="off"></td>
                         </tr>
                     </table>
                     <div id="send-email-msg"></div>
                 </form>
             </td>
-            <td style="vertical-align: top; padding-right: 20px;">
-                <div style="display: flex; flex-direction: column;">
-                    <input type="button" value="Generate Email" id="html-button" style="margin-left: 20px;">
-                    <input type="button" value="Send" id="send-button" style="margin-left: 20px;">
-                </div>
-            </td>
-            <td style="vertical-align: top; padding-right: 20px;">
-                <div style="display: flex; flex-direction: column;">
-                    <input style="width: 100px;" type="text" id="generate-email-datepicker">
-                </div>
+            <td style="vertical-align: top;">
+                <table style="border-spacing: 0; border-collapse: separate; margin: 0;">
+                    <tr>
+                        <td style="padding: 0 8px 4px 0;"><input type="button" value="Generate Email" id="html-button"></td>
+                        <td style="padding: 0 0 4px 0;"><input style="width: 100px;" type="text" id="generate-email-datepicker"></td>
+                    </tr>
+                    <tr>
+                        <td style="padding: 4px 0;"><input type="button" value="Send Now" id="send-button"></td>
+                        <td></td>
+                    </tr>
+                </table>
             </td>
         </tr>
     </table>
 
-    <table id="errorform">
+    <table id="errorform" style="margin: 10px 0 10px 5px;">
         <tr>
-            <td style="vertical-align: top; padding-right: 20px;">
-                <form autocomplete="off">
-                    <table style="margin-top: 0;">
+            <td style="vertical-align: top; padding-right: 12px;">
+                <form autocomplete="off" style="margin: 0; padding: 0;">
+                    <table style="border-spacing: 0; border-collapse: separate; margin: 0;">
                         <tr>
-                            <td style="text-align: left;">Warning Boundary:</td>
-                            <td><input type="text" name="warningb" id="warningb" autocomplete="off" value="<%= data.getWarningBoundary() %>"></td>
+                            <td style="text-align: right; padding: 0 12px 4px 0;">Warning boundary:</td>
+                            <td style="padding: 0 0 4px 0;"><input type="text" name="warningb" id="warningb" autocomplete="off" value="<%= data.getWarningBoundary() %>" style="width: 50px;"></td>
                         </tr>
                         <tr>
-                            <td style="text-align: left;">Error Boundary:</td>
-                            <td><input type="text" name="errorb" id="errorb" autocomplete="off" value="<%= data.getErrorBoundary() %>"></td>
+                            <td style="text-align: right; padding: 0 12px 0 0;">Error boundary:</td>
+                            <td><input type="text" name="errorb" id="errorb" autocomplete="off" value="<%= data.getErrorBoundary() %>" style="width: 50px;"></td>
                         </tr>
                     </table>
                     <div id="send-boundaries-msg"></div>
                 </form>
             </td>
-            <td style="vertical-align: top; padding-right: 20px">
-                <div style="display: flex; flex-direction: column">
-                    <input type="button" value="submit" id="submit-button" style="margin-left: 20px;">
-                </div>
+            <td style="vertical-align: top;">
+                <input type="button" value="Submit" id="submit-button">
             </td>
         </tr>
     </table>
 
+    <table id="retrainform" style="margin: 10px 0 10px 5px;">
+        <tr>
+            <td style="vertical-align: top; padding-right: 12px;">
+                <form autocomplete="off" style="margin: 0; padding: 0;">
+                    <table style="border-spacing: 0; border-collapse: separate; margin: 0;">
+                        <tr>
+                            <td style="text-align: right; vertical-align: top; padding: 0 12px 4px 0;">Mode:</td>
+                            <td style="padding: 0 0 4px 0;">
+                                <label style="display: block; margin-bottom: 4px;"><input type="radio" name="retrainMode" value="reset" checked> Reset (delete all and rebuild)</label>
+                                <label style="display: block;"><input type="radio" name="retrainMode" value="incremental"> Incremental (add to existing)</label>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="text-align: right; padding: 4px 12px 4px 0;">Max runs:</td>
+                            <td style="padding: 4px 0;"><input type="text" name="maxRuns" id="maxRuns" autocomplete="off" value="20" style="width: 50px;"></td>
+                        </tr>
+                        <tr>
+                            <td style="text-align: right; padding: 0 12px 0 0;">Min runs:</td>
+                            <td><input type="text" name="minRuns" id="minRuns" autocomplete="off" value="5" style="width: 50px;"></td>
+                        </tr>
+                    </table>
+                </form>
+            </td>
+            <td style="vertical-align: top;">
+                <input type="button" value="Retrain All" id="retrain-all-button">
+            </td>
+            <td style="vertical-align: middle; padding-left: 10px;">
+                <span id="retrain-all-status"></span>
+            </td>
+        </tr>
+    </table>
 
     <div id="msg-container"></div>
     <table id="trainingdata">
@@ -147,9 +179,11 @@
             </tr>
             <%
                 int firstRunId = -1;
+                int runCount = 0;
                 for (RunDetail run : runs) {
                     if (run.getUserid() == user.getId()) {
                         if (firstRunId == -1) { firstRunId = run.getId(); }
+                        runCount++;
             %>
             <tr>
                 <td style="border-left: 1px solid #000; padding-left: 5px;"><%=h(formatDateTime(run.getPostTime()))%></td>
@@ -162,7 +196,7 @@
             <% }
             } %>
             <tr class="stats-row" style="font-weight: 600; font-size: 10px;" data-runid="<%=h(firstRunId != -1 ? String.valueOf(firstRunId) : "")%>">
-                <td style="padding-left: 5px;"></td>
+                <td style="padding-left: 5px; color:#50514F;">RunCount:<%=runCount%>&nbsp;||&nbsp;</td>
                 <td></td>
                 <td class="stats-row-mem-mean" style="padding-left: 0; color:#50514F;">
                     MeanTotalMem:<%=h(data.round(user.getMeanmemory(), 2))%> mb&nbsp;||&nbsp;
@@ -294,13 +328,46 @@
         }, "json")
     });
 
+    $("#retrain-all-button").click(function() {
+        var mode = $('input[name="retrainMode"]:checked').val();
+        var maxRuns = parseInt($('#maxRuns').val()) || 20;
+        var minRuns = parseInt($('#minRuns').val()) || 5;
+        var confirmMsg = mode === 'reset'
+            ? "This will DELETE all existing training data and rebuild with " + minRuns + "-" + maxRuns + " clean runs per computer. Continue?"
+            : "This will ADD clean runs to computers with fewer than " + maxRuns + " training runs. Continue?";
+        if (!confirm(confirmMsg))
+            return;
+        var btn = $(this);
+        btn.prop('disabled', true);
+        $('#retrain-all-status').text('Retraining...');
+        let url = <%=jsURL(new ActionURL(TestResultsController.RetrainAllAction.class, c))%>;
+        url.searchParams.set('mode', mode);
+        url.searchParams.set('maxRuns', maxRuns);
+        url.searchParams.set('minRuns', minRuns);
+        $.post(url.toString(), csrf_header, function(data) {
+            if (data.success) {
+                $('#retrain-all-status').text('Retrained ' + data.usersRetrained + ' computers with ' + data.totalTrainRuns + ' runs. Reloading...');
+                location.reload();
+            } else {
+                $('#retrain-all-status').text('Error: ' + (data.error || 'Unknown error'));
+                btn.prop('disabled', false);
+            }
+        }, "json").fail(function() {
+            $('#retrain-all-status').text('Request failed');
+            btn.prop('disabled', false);
+        });
+    });
+
     $("#actionform").change(function() {
         $("#errorform").hide();
         $("#emailform").hide();
+        $("#retrainform").hide();
         if ($(this).val() == "email") {
             $("#emailform").show();
         } else if ($(this).val() == "error") {
             $("#errorform").show();
+        } else if ($(this).val() == "retrain") {
+            $("#retrainform").show();
         }
     }).trigger("change");
 
diff --git a/testresults/src/org/labkey/testresults/view/user.jsp b/testresults/src/org/labkey/testresults/view/user.jsp
index 0f84b87d..4ef8a471 100644
--- a/testresults/src/org/labkey/testresults/view/user.jsp
+++ b/testresults/src/org/labkey/testresults/view/user.jsp
@@ -84,6 +84,7 @@
 %>
 
 <div id="content">
+    <% request.setAttribute(TestResultsController.TabNames.ACTIVE_TAB_ATTR, TestResultsController.TabNames.USER); %>
     <%@include file="menu.jsp" %>
 <%--    <form action="<%=h(new ActionURL(TestResultsController.PostAction.class, c))%>" method="post" enctype="multipart/form-data">--%>
 <%--        <labkey:csrf/>--%>