diff --git a/module/program/ui/browse.html.php b/module/program/ui/browse.html.php
index c4e875726a..5dfa80b0fc 100644
--- a/module/program/ui/browse.html.php
+++ b/module/program/ui/browse.html.php
@@ -14,7 +14,7 @@ if(common::hasPriv('project', 'batchEdit') and $programType != 'bygrid' and $has
     $toolbar->append(html::checkbox('editProject', array('1' => $lang->project->edit), '', $this->cookie->editProject ? 'checked=checked' : ''));
 }
 
-$toolbar->append('<a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> ' . $lang->user->search . '</a>');
+$toolbar->append('<a class="querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> ' . $lang->user->search . '</a>');
 
 /* Set actionbar. */
 $actionbar = actionbar();
diff --git a/zin/wg/actionbar/v1.php b/zin/wg/actionbar/v1.php
index cf7061999c..2be0c07ccc 100644
--- a/zin/wg/actionbar/v1.php
+++ b/zin/wg/actionbar/v1.php
@@ -49,7 +49,7 @@ class actionbar extends wg
      */
     public function toString()
     {
-        $html = '<div class="pull-right">';
+        $html = '<nav id="actionBar">';
         foreach($this->actions as $action)
         {
             if(is_string($action))
@@ -60,6 +60,6 @@ class actionbar extends wg
 
             $html .= $action->toString();
         }
-        return $html . '</div>';
+        return $html . '</nav>';
     }
 }
diff --git a/zin/wg/toolbar/v1.php b/zin/wg/toolbar/v1.php
index f85451120c..fd782c12a3 100644
--- a/zin/wg/toolbar/v1.php
+++ b/zin/wg/toolbar/v1.php
@@ -54,7 +54,7 @@ class toolbar extends wg
         {
             if(is_string($tool))
             {
-                $html .= $tool;
+                $html .= "<li class='nav-item'>" . $tool . '</li>';
                 continue;
             }
             $html .= $tool->toString();