diff --git a/app/cdash/public/api/v1/index.php b/app/cdash/public/api/v1/index.php
index 604268823a..aa30225989 100644
--- a/app/cdash/public/api/v1/index.php
+++ b/app/cdash/public/api/v1/index.php
@@ -209,7 +209,17 @@
     } else {
         $base_url = "index.php?project={$projectname_encoded}";
     }
-    $response['menu']['current'] = "$base_url";
+    
+    // Only show 'current' button if we're not already on the current date
+    // Check if a date was explicitly provided in the URL
+    $date_specified = isset($_GET['date']);
+    
+    if ($date_specified && $response['date'] !== $response['currentdate']) {
+        $response['menu']['current'] = "$base_url";
+    } else {
+        $response['menu']['current'] = false;
+    }
+    
     $controller->determineNextPrevious($response, $base_url);
 }
 $response['childview'] = $controller->childView ? 1 : 0;
diff --git a/composer.json b/composer.json
index 4f57388587..080246b30a 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,6 @@
     "email": "kitware@kitware.com",
     "issues": "https://github.com/Kitware/CDash/issues",
     "source": "https://github.com/Kitware/CDash",
-    "wiki": "http://public.kitware.com/Wiki/CDash"
   },
   "require": {
     "php": "^8.3",
diff --git a/resources/css/common.css b/resources/css/common.css
index 12651abd7b..cb2f878d95 100644
--- a/resources/css/common.css
+++ b/resources/css/common.css
@@ -737,6 +737,7 @@ div#headertop {
 #headermenu #navigation li a:active,
 #headermenu #navigation li a:visited {
   color:#666666;
+  cursor:pointer;
   display:block;
   font-size:16px;
   height:100%;
@@ -900,61 +901,7 @@ div#main_content {
   padding: 1em 2em;
 }
 
-#settings {
-  cursor: pointer;
-  float: right;
-  height: 20px;
-  margin-right:0;
-  margin-top:20px;
-  position:relative;
-  width: 20px;
-}
-
-#settings ul{
-  -webkit-box-shadow: 0px 20px 27px -2px rgba(0,0,0,0.3);
-  -moz-box-shadow: 0px 20px 27px -2px rgba(0,0,0,0.3);
-  box-shadow: 0px 20px 27px -2px rgba(0,0,0,0.3);
-  list-style: none;
-  margin:0;
-  padding:0;
-  position:absolute;
-  right:27px;
-  top:0;
-  width:130px;
-  z-index:5000;
-}
-
-#settings ul li {
-  background:#e0e0e0;
-  border-bottom:1px solid #bbbbbb;
-  display: block;
-  transition:all .15s ease-in-out;
-}
-
-#settings ul li a {
-  color: #666666;
-  display: block;
-  height: 100%;
-  padding-left: 10px;
-  position: relative;
-  text-decoration: none;
-  transition:all .15s ease-in-out;
-  width: 100%;
-}
-
-#settings ul li:hover {
-  background:#efefef;
-  border-left:4px solid #5775b9;
-}
-
-#settings ul li:hover a {
-  color:#000000;
-  text-decoration: none;
-}
-
-#settings ul.visible {
-  display: block;
-}
+/* #settings styles removed - now using header navigation menu */
 
 /* Table Styles */
 
@@ -990,17 +937,17 @@ div#main_content {
 }
 
 .buildgroup > table.tabb {
-  -webkit-border-radius:3px;
-  -moz-border-radius:3px;
-  border-radius:3px;
+  -webkit-border-radius: 0 0 8px 8px;
+  -moz-border-radius: 0 0 8px 8px;
+  border-radius: 0 0 8px 8px;
   -webkit-box-shadow:0px 3px 10px -2px rgba(0,0,0,0.4);
   -moz-box-shadow:0px 3px 10px -2px rgba(0,0,0,0.4);
   box-shadow:0px 3px 10px -2px rgba(0,0,0,0.4);
-  overflow:scroll;
+  overflow:hidden;
 }
 
 .buildgroup > table.tabb tbody {
-  border-bottom:5px solid #555555;
+  /* Removed dark border for modern card design */
 }
 
 .buildgroup table.tabb .table-heading1,
diff --git a/resources/js/angular/views/index.html b/resources/js/angular/views/index.html
index b671264f1c..755ab733eb 100644
--- a/resources/js/angular/views/index.html
+++ b/resources/js/angular/views/index.html
@@ -8,45 +8,6 @@
           {{::banner}}
         </div>
 
-        <div id="settings" data-cy="settings-dropdown" ng-click="showsettings = ! showsettings">
-          <span class="glyphicon glyphicon-filter"
-                tooltip-popup-delay="1000"
-                tooltip-append-to-body="true"
-                tooltip-placement="left"
-                uib-tooltip="More display options"></span>
-          <ul ng-show="showsettings">
-            <li>
-              <a class="cdash-link" id="label_advancedview" ng-click="toggleAdvancedView()">
-                <span ng-if="::cdash.advancedview == 0">Advanced View</span>
-                <span ng-if="::cdash.advancedview != 0">Simple View</span>
-              </a>
-            </li>
-            <li>
-              <a class="autorefresh cdash-link" ng-click="toggleAutoRefresh()">
-                <span ng-if="::!autoRefresh">Auto-refresh</span>
-                <span ng-if="::autoRefresh">Stop auto-refresh</span>
-              </a>
-            </li>
-            <li>
-              <a class="cdash-link" id="label_colorblind" href="" ng-click="cdash.filterdata.colorblind=!cdash.filterdata.colorblind; colorblind_toggle()">
-                <span ng-show="cdash.filterdata.colorblind == 0" data-cy="color-mode-colorblind">Colorblind palette</span>
-                <span ng-show="cdash.filterdata.colorblind != 0" data-cy="color-mode-classic">Classic palette</span>
-              </a>
-            </li>
-            <li>
-              <a class="cdash-link" id="label_showfilters" ng-click="showfilters_toggle()">
-                <span ng-show="showfilters == 0">Show Filters</span>
-                <span ng-show="showfilters != 0">Hide Filters</span>
-              </a>
-            </li>
-            <li>
-              <a href="http://public.kitware.com/Wiki/CDash:Documentation" class="helptrigger cdash-link" target="_blank">
-                Help
-              </a>
-            </li>
-          </ul>
-        </div>
-
         <!-- Filters -->
         <ng-include src="'assets/js/angular/views/partials/filterdataTemplate.html?id=' + VERSION"></ng-include>
       </div> <!-- End index-top -->
diff --git a/resources/js/angular/views/partials/buildgroup.html b/resources/js/angular/views/partials/buildgroup.html
index d2d8fb1b44..a1fe38dfc3 100644
--- a/resources/js/angular/views/partials/buildgroup.html
+++ b/resources/js/angular/views/partials/buildgroup.html
@@ -1,15 +1,30 @@
-<h3 class="buildgroupname">
-  <a href="#" class="grouptrigger cdash-link"
-     ng-click="jumpToAnchor(buildgroup.linkname)">
-    {{::buildgroup.name}}
-  </a>
-  <span class="buildnums" align="right">{{::buildgroup.numbuildslabel}}</span>
-  <a class="grouplink cdash-link"
-     ng-href="viewBuildGroup.php?project={{::cdash.projectname_encoded}}&buildgroup={{::buildgroup.linkname}}&date={{::cdash.date}}&{{::cdash.filterurl}}">[view timeline]</a>
-</h3>
-<table border="0" cellpadding="4" cellspacing="0" width="100%" class="tabb" id="project_{{::cdash.projectid}}_{{::buildgroup.id}}">
+<!-- Build group header with rounded style -->
+<div style="background: #5775b9; padding: 12px 20px; border-radius: 8px 8px 0 0; box-shadow: 0 2px 8px rgba(0,0,0,0.1); display: flex; align-items: center; justify-content: space-between; margin-top: 4px;">
+  <div style="display: flex; align-items: center; gap: 15px;">
+    <h3 style="color: white; margin: 0; font-size: 18px; font-weight: 600;">
+      <a href="#" class="grouptrigger"
+         ng-click="jumpToAnchor(buildgroup.linkname)"
+         style="color: white; text-decoration: none;">
+        {{::buildgroup.name}}
+      </a>
+    </h3>
+    <span style="color: rgba(255,255,255,0.9); font-size: 13px; font-style: italic;">{{::buildgroup.numbuildslabel}}</span>
+  </div>
+  
+  <!-- Action buttons styled consistently and aligned to the right -->
+  <span style="display: inline-flex; gap: 8px; align-items: center; font-size: 12px;">
+    <a class="btn btn-xs btn-default"
+       ng-href="viewBuildGroup.php?project={{::cdash.projectname_encoded}}&buildgroup={{::buildgroup.linkname}}&date={{::cdash.date}}&{{::cdash.filterurl}}"
+       style="text-decoration: none; font-size: 12px; background: rgba(255,255,255,0.95); border: none;">
+      <span class="glyphicon glyphicon-stats"></span> View Timeline
+    </a>
+  </span>
+</div>
+
+<table border="0" cellpadding="4" cellspacing="0" width="100%" class="tabb" id="project_{{::cdash.projectid}}_{{::buildgroup.id}}" style="border-radius: 0 0 8px 8px; margin-top: 0; box-shadow: 0 2px 8px rgba(0,0,0,0.1); overflow: hidden;">
   <thead>
     <tr class="table-heading1" >
+      <td ng-if="cdash.user.admin == 1 && buildgroup.selectionMode" class="nob"></td>
       <td colspan="2" class="nob"></td>
       <td ng-if="::buildgroup.hasupdatedata" colspan="{{::1 + cdash.showtimecolumns}}" class="center-text botl">Update</td>
       <td ng-if="::buildgroup.hasconfiguredata" colspan="{{::2 + cdash.showtimecolumns}}" class="center-text botl">Configure</td>
@@ -20,6 +35,13 @@ <h3 class="buildgroupname">
 
     <tr class="table-heading">
 
+      <th ng-if="cdash.user.admin == 1 && buildgroup.selectionMode" rowspan="2" class="column-header" style="width: 30px;">
+        <input type="checkbox" 
+               ng-model="buildgroup.selectAll" 
+               ng-change="toggleSelectAll(buildgroup)"
+               title="Select all builds">
+      </th>
+
       <th ng-if="::cdash.childview == 1"
           ng-click="updateOrderByFields(buildgroup, 'label', $event)"
           colspan="2" rowspan="2" class="column-header">
diff --git a/resources/js/angular/views/partials/filterdataTemplate.html b/resources/js/angular/views/partials/filterdataTemplate.html
index 81d9c209c0..c5328e549d 100644
--- a/resources/js/angular/views/partials/filterdataTemplate.html
+++ b/resources/js/angular/views/partials/filterdataTemplate.html
@@ -1,13 +1,12 @@
 <div id="div_showfilters" ng-controller="FiltersController">
 
   <div ng-hide="showfilters == 0">
-    <div class="table-heading0">
-      <a class="cdash-link"
-         ng-href="http://public.kitware.com/Wiki/CDash:Documentation#Filters_on_{{cdash.page}}"
-         target="_blank"
-         style="float: right;">Help</a>
-      <h3>Filters</h3>
+    <div class="filter-header" style="background: #5775b9; padding: 15px 20px; border-radius: 8px 8px 0 0; box-shadow: 0 2px 8px rgba(0,0,0,0.1);">
+      <h3 style="color: white; margin: 0; font-size: 18px; font-weight: 600;">
+        <span class="glyphicon glyphicon-filter"></span> Filters
+      </h3>
     </div>
+    <div style="background: white; padding: 20px; border-radius: 0 0 8px 8px; box-shadow: 0 2px 8px rgba(0,0,0,0.1); margin-bottom: 20px;">
     <ul>
       <li ng-repeat="filter in filterdata.filters"
           ng-init="currentFilter = filter; group = filterdata; availablefilters = filterdata.availablefilters"
@@ -42,39 +41,46 @@ <h3>Filters</h3>
       </li>
     </ul>
 
-    <div>
+    <div style="margin-top: 15px;">
       <div ng-if="filterdata.showlimit == 0">
         <input type="hidden" id="id_limit" name="limit" value="{{filterdata.limit}}">
         </input>
       </div>
-      <div ng-if="filterdata.showlimit == 1">
-        Limit results to
-        <input type="text" size="3" id="id_limit" name="limit" align="center" value="{{filterdata.limit}}">
-        </input>
-        rows (0 for unlimited)
+      <div ng-if="filterdata.showlimit == 1" style="padding: 12px; background: #f8f9fa; border-radius: 6px; display: inline-block;">
+        <label style="margin: 0; font-weight: 500; color: #555;">
+          Limit results to
+          <input type="text" size="3" id="id_limit" name="limit" align="center" value="{{filterdata.limit}}" style="margin: 0 5px; padding: 4px 8px; border: 1px solid #ddd; border-radius: 4px; text-align: center;">
+          </input>
+          rows (0 for unlimited)
+        </label>
       </div>
     </div>
 
     <!-- date range selector -->
-    <div ng-if="filterdata.showdaterange" class="form-group" daterange></div>
+    <div ng-if="filterdata.showdaterange" class="form-group" daterange style="margin-top: 15px;"></div>
 
-    <div>
-      <div>
+    <div style="margin-top: 20px; padding-top: 20px; border-top: 2px solid #e0e0e0;">
+      <div style="display: flex; gap: 10px; align-items: center; flex-wrap: wrap;">
         <input type="hidden" name="filtercount" id="id_filtercount" value="{{filterdata.filters.length}}">
         </input>
         <input type="hidden" name="showfilters" id="id_showfilters" value="1" />
-        <input type="button" ng-click="applyFilters()" name="apply" value="Apply" />
-        &nbsp;
-        <input type="button" ng-click="clearFilters()" name="clear" value="Clear" />
-        &nbsp;
-        <input type="button" ng-click="displayHyperlink()" name="create_hyperlink" value="Create Hyperlink"/>
+        <button class="btn btn-primary" ng-click="applyFilters()" name="apply" style="background: #5775b9; border: none; padding: 8px 20px; font-weight: 500; box-shadow: 0 2px 4px rgba(87, 117, 185, 0.3);">
+          <span class="glyphicon glyphicon-ok"></span> Apply
+        </button>
+        <button class="btn btn-default" ng-click="clearFilters()" name="clear" style="padding: 8px 20px; font-weight: 500; border: 2px solid #ddd; background: white;">
+          <span class="glyphicon glyphicon-remove"></span> Clear
+        </button>
+        <button class="btn btn-info" ng-click="displayHyperlink()" name="create_hyperlink" style="padding: 8px 20px; font-weight: 500; border: none; box-shadow: 0 2px 4px rgba(91, 192, 222, 0.3);">
+          <span class="glyphicon glyphicon-link"></span> Create Hyperlink
+        </button>
       </div>
     </div>
 
-    <div>
+    <div style="margin-top: 15px;">
       <div>
         <div id="div_filtersAsUrl"/>
       </div>
     </div>
+    </div>
   </div>
 </div>
diff --git a/resources/js/vue/components/EditProject.vue b/resources/js/vue/components/EditProject.vue
index 28702a6962..6f2e14ce18 100644
--- a/resources/js/vue/components/EditProject.vue
+++ b/resources/js/vue/components/EditProject.vue
@@ -312,16 +312,11 @@
                             {{ type }}
                           </option>
                         </select>
-                        <a
-                          href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                          target="blank"
+                        <img
+                          :src="$baseURL + '/img/help.gif'"
+                          border="0"
+                          @mouseover="showHelp('issuecreation_help')"
                         >
-                          <img
-                            :src="$baseURL + '/img/help.gif'"
-                            border="0"
-                            @mouseover="showHelp('issuecreation_help')"
-                          >
-                        </a>
                       </td>
                     </tr>
                   </transition>
@@ -409,16 +404,11 @@
                           Protected
                         </option>
                       </select>
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('public_help')"
                         >
-                      </a>
                       <span
                         id="public_help"
                         class="help_content"
@@ -551,16 +541,11 @@
                         a transparent background.  The logo's height should be no
                         more than 100 pixels.
                       </span>
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
+                      <img
+                        :src="$baseURL + '/img/help.gif'"
+                        border="0"
                         @mouseover="showHelp('logo_help')"
                       >
-                        <img
-                          :src="$baseURL + '/img/help.gif'"
-                          border="0"
-                        >
-                      </a>
                     </td>
                   </tr>
                   <tr v-if="cdash.edit == 1">
@@ -635,16 +620,11 @@
                         @change="changeViewerType()"
                         @focus="showHelp('svnViewer_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('svnViewer_help')"
                         >
-                      </a>
                       <span
                         id="svnViewer_help"
                         class="help_content"
@@ -692,16 +672,11 @@
                           {{ viewer.description }}
                         </option>
                       </select>
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('svnViewerType_help')"
                         >
-                      </a>
                       <span
                         id="svnViewerType_help"
                         class="help_content"
@@ -770,16 +745,11 @@
                           @change="cdash.changesmade = true"
                           @focus="showHelp('svnRepository_help')"
                         >
-                        <a
-                          href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                          target="blank"
-                        >
-                          <img
+                        <img
                             :src="$baseURL + '/img/help.gif'"
                             border="0"
                             @mouseover="showHelp('svnRepository_help')"
                           >
-                        </a>
                       </td>
                     </tr>
                     <tr>
@@ -815,15 +785,11 @@
                           @change="cdash.changesmade = true"
                           @focus="showHelp('svnUsername_help')"
                         >
-                        <a
-                          href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                          target="blank"
-                        >
-                          <img
+                        <img
                             :src="$baseURL + '/img/help.gif'"
                             border="0"
                             @mouseover="showHelp('svnUsername_help')"
-                          ></a>
+                          >
                       </td>
                     </tr>
                     <tr>
@@ -842,15 +808,11 @@
                           @change="cdash.changesmade = true"
                           @focus="showHelp('svnPassword_help')"
                         >
-                        <a
-                          href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                          target="blank"
-                        >
-                          <img
+                        <img
                             :src="$baseURL + '/img/help.gif'"
                             border="0"
                             @mouseover="showHelp('svnPassword_help')"
-                          ></a>
+                          >
                       </td>
                     </tr>
                   </template>
@@ -914,16 +876,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('TestingDataUrl_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('TestingDataUrl_help')"
                         >
-                      </a>
                       <span
                         id="TestingDataUrl_help"
                         class="help_content"
@@ -952,16 +909,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('NightlyStart_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('NightlyStart_help')"
                         >
-                      </a>
                       <span
                         id="NightlyStart_help"
                         class="help_content"
@@ -1000,16 +952,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('CoverageThres_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('CoverageThres_help')"
                         >
-                      </a>
                       <span
                         id="CoverageThres_help"
                         class="help_content"
@@ -1041,16 +988,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('EnableTestTiming_help')"
                       >
-                      <a
-                        href="https://public.kitware.com/Wiki/CDash:Design#Test_Timing"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('EnableTestTiming_help')"
                         >
-                      </a>
                       <span
                         id="EnableTestTiming_help"
                         class="help_content"
@@ -1078,16 +1020,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('TimeDeviation_help')"
                       >
-                      <a
-                        href="https://public.kitware.com/Wiki/CDash:Design#Test_Timing"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('TimeDeviation_help')"
                         >
-                      </a>
                       <span
                         id="TimeDeviation_help"
                         class="help_content"
@@ -1121,16 +1058,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('TimeDeviationThreshold_help')"
                       >
-                      <a
-                        href="https://public.kitware.com/Wiki/CDash:Design#Test_Timing"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('TimeDeviationThreshold_help')"
                         >
-                      </a>
                       <span
                         id="TimeDeviationThreshold_help"
                         class="help_content"
@@ -1166,16 +1098,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('TimeMaxStatus_help')"
                       >
-                      <a
-                        href="https://public.kitware.com/Wiki/CDash:Design#Test_Timing"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('TimeMaxStatus_help')"
                         >
-                      </a>
                       <span
                         id="TimeMaxStatus_help"
                         class="help_content"
@@ -1237,16 +1164,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('emailBroken_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('emailBroken_help')"
                         >
-                      </a>
                       <span
                         id="emailBroken_help"
                         class="help_content"
@@ -1275,16 +1197,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('emailRedundant_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('emailRedundant_help')"
                         >
-                      </a>
                       <span
                         id="emailRedundant_help"
                         class="help_content"
@@ -1314,16 +1231,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('emailCoverage_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('emailCoverage_help')"
                         >
-                      </a>
                       <span
                         id="emailCoverage_help"
                         class="help_content"
@@ -1353,16 +1265,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('emailTiming_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('emailTiming_help')"
                         >
-                      </a>
                       <span
                         id="emailTiming_help"
                         class="help_content"
@@ -1454,16 +1361,11 @@
                       <div align="right">
                         <strong>
                           Block List
-                          <a
-                            href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                            target="blank"
-                          >
-                            <img
+                          <img
                               :src="$baseURL + '/img/help.gif'"
                               border="0"
                               @mouseover="showHelp('blockList_help')"
                             >
-                          </a>
                         </strong>
                       </div>
                     </td>
@@ -1623,16 +1525,11 @@
                       >
                         CTestConfig.cmake
                       </a>
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('ctestConfig_help')"
                         >
-                      </a>
                       <span
                         id="ctestConfig_help"
                         class="help_content"
@@ -1663,16 +1560,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('displayLabels_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('displayLabels_help')"
                         >
-                      </a>
                       <span
                         id="displayLabels_help"
                         class="help_content"
@@ -1702,16 +1594,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('shareLabelFilters_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('shareLabelFilters_help')"
                         >
-                      </a>
                       <span
                         id="shareLabelFilters_help"
                         class="help_content"
@@ -1740,16 +1627,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('viewSubProjectsLink_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('viewSubProjectsLink_help')"
                         >
-                      </a>
                       <span
                         id="viewSubProjectsLink_help"
                         class="help_content"
@@ -1779,16 +1661,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('showCoverageCode_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('showCoverageCode_help')"
                         >
-                      </a>
                       <span
                         id="showCoverageCode_help"
                         class="help_content"
@@ -1817,16 +1694,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('autoremoveTimeframe_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('autoremoveTimeframe_help')"
                         >
-                      </a>
                       <span
                         id="autoremoveTimeframe_help"
                         class="help_content"
@@ -1856,16 +1728,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('autoremoveMaxBuilds_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('autoremoveMaxBuilds_help')"
                         >
-                      </a>
                       <span
                         id="autoremoveMaxBuilds_help"
                         class="help_content"
@@ -1895,16 +1762,11 @@
                         @change="cdash.changesmade = true"
                         @focus="showHelp('uploadQuota_help')"
                       >
-                      <a
-                        href="http://www.cdash.org/Wiki/CDash:Administration#Creating_a_project"
-                        target="blank"
-                      >
-                        <img
+                      <img
                           :src="$baseURL + '/img/help.gif'"
                           border="0"
                           @mouseover="showHelp('uploadQuota_help')"
                         >
-                      </a>
                       <span
                         id="uploadQuota_help"
                         class="help_content"
diff --git a/resources/views/components/header.blade.php b/resources/views/components/header.blade.php
index c40dbdeb4e..bb59fb4cc7 100755
--- a/resources/views/components/header.blade.php
+++ b/resources/views/components/header.blade.php
@@ -149,6 +149,35 @@
                         <a class="cdash-link" id="cal" href="" ng-click="toggleCalendar()">Calendar</a>
                         <span id="date_now" style="display:none;">@{{::cdash.date}}</span>
                     </li>
+                    <li ng-if="!cdash.hidenav && cdash.projectname_encoded !== undefined">
+                        <a class="cdash-link" href="#" style="cursor: pointer;">View</a>
+                        <ul>
+                            <li>
+                                <a class="cdash-link" id="header_advancedview" ng-click="toggleAdvancedView()">
+                                    <span ng-if="cdash.advancedview == 0">Advanced View</span>
+                                    <span ng-if="cdash.advancedview != 0">Simple View</span>
+                                </a>
+                            </li>
+                            <li>
+                                <a class="cdash-link autorefresh" ng-click="toggleAutoRefresh()">
+                                    <span ng-if="!autoRefresh">Auto-refresh</span>
+                                    <span ng-if="autoRefresh">Stop auto-refresh</span>
+                                </a>
+                            </li>
+                            <li>
+                                <a class="cdash-link" id="header_colorblind" href="" ng-click="cdash.filterdata.colorblind=!cdash.filterdata.colorblind; colorblind_toggle()">
+                                    <span ng-show="cdash.filterdata.colorblind == 0">Colorblind palette</span>
+                                    <span ng-show="cdash.filterdata.colorblind != 0">Classic palette</span>
+                                </a>
+                            </li>
+                            <li class="endsubmenu">
+                                <a class="cdash-link" id="header_showfilters" ng-click="showfilters_toggle()">
+                                    <span ng-show="showfilters == 0">Show Filters</span>
+                                    <span ng-show="showfilters != 0">Hide Filters</span>
+                                </a>
+                            </li>
+                        </ul>
+                    </li>
                     <li ng-if="!cdash.hidenav && cdash.projectname_encoded !== undefined">
                         <a class="cdash-link" href="#">Project</a>
                         <ul>