diff --git a/module/execution/css/task.css b/module/execution/css/task.css
index f81f6ed7f3..805c1af281 100644
--- a/module/execution/css/task.css
+++ b/module/execution/css/task.css
@@ -1,4 +1,4 @@
-body {margin-bottom: 25px; overflow: hidden;}
+body {margin-bottom: 10px;}
 .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
 .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
 
diff --git a/module/product/css/browse.css b/module/product/css/browse.css
index f26266dfc6..7680c02bcd 100644
--- a/module/product/css/browse.css
+++ b/module/product/css/browse.css
@@ -1,3 +1,8 @@
+#mainMenu .btn-toolbar .btn-group .dropdown-menu .btn-active-text:hover .text {color: #fff;}
+#mainMenu .btn-toolbar .btn-group .dropdown-menu .btn-active-text:hover .text:after {border-bottom: unset;}
+.body-modal #mainMenu>.btn-toolbar {width: auto;}
+.assignedTo{border-radius: 4px !important;}
+
 #createActionMenu .dropdown-menu {width: 100%;}
 #productStoryForm table tbody tr td {overflow: hidden; white-space: nowrap;}
 
@@ -32,6 +37,11 @@ a.removeModule:hover {color: red;}
 .btn-toolbar #query span.text{overflow: hidden; width: 52px; vertical-align: middle; margin-right: 1px;}
 #linkStoryByPlan .modal-header {padding: 20px 0 10px 0; border-bottom: 0px}
 
+.dtable-cell[data-col="actions"] > .dtable-cell-content .c-actions {overflow: visible;}
 .dtable-cell[data-col="actions"] > .dtable-cell-content .c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
 .table-footer{z-index: 10}
 #dtable .scrollbar, .table-header.fixed-right {z-index: 11}
+
+.btn-group .icon-close:before {font-size: 5px; vertical-align: 25%;}
+.btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
+.btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
diff --git a/module/product/js/browse.js b/module/product/js/browse.js
index 8e87a9319f..fe87fc0598 100644
--- a/module/product/js/browse.js
+++ b/module/product/js/browse.js
@@ -56,16 +56,9 @@ $(function()
             if(!$next.length) break;
             height += $next.outerHeight;
         }
-        if(height < menuHeight)
-        {
-            $this.addClass('dropup');
-        }
+        if(height < menuHeight) $this.addClass('dropup');
     });
 
-    adjustTableFooter();
-    $('body').on('click', '#toggleFold', adjustTableFooter);
-    $('body').on('click', '.icon.icon-angle-double-right', adjustTableFooter);
-
     /* Get checked stories. */
     $('#importToLib').on('click', function()
     {
@@ -147,22 +140,6 @@ $(function()
     });
 });
 
-/**
- * Adjust the table footer style.
- *
- * @access public
- * @return void
- */
-function adjustTableFooter()
-{
-    if($('.main-col').height() < $(window).height())
-    {
-        $('.table.with-footer-fixed').css('margin-bottom', '0');
-        $('.table-footer').removeClass('fixed-footer');
-        $('.table-footer').css({"left":"0", "bottom":"0", "width":"unset"});
-    }
-}
-
 function createSortLink(col)
 {
     var sort = col.name + '_asc';
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 4f9162c784..f872ef02a1 100755
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -51,46 +51,25 @@ js::set('orderBy', $orderBy);
 js::set('sortLink', $sortLink);
 js::set('cols', json_encode($cols));
 js::set('data', json_encode($rows));
-?>
-<style>
-body {margin-bottom: 25px;}
-#mainMenu .btn-toolbar .btn-group .dropdown-menu .btn-active-text:hover .text {color: #fff;}
-#mainMenu .btn-toolbar .btn-group .dropdown-menu .btn-active-text:hover .text:after {border-bottom: unset;}
-.body-modal #mainMenu>.btn-toolbar {width: auto;}
-.assignedTo{border-radius: 4px !important;}
-</style>
-<?php
+
 $lang->story->createCommon = $storyType == 'story' ? $lang->story->createStory : $lang->story->createRequirement;
-$unfoldStories     = isset($config->product->browse->unfoldStories) ? json_decode($config->product->browse->unfoldStories, true) : array();
-$unfoldStories     = zget($unfoldStories, $productID, array());
-$isProjectStory    = $this->app->rawModule == 'projectstory';
 $projectIDParam    = $isProjectStory ? "projectID=$projectID&" : '';
 $projectModel      = isset($project->model) ? $project->model : '';
-js::set('browseType', $browseType);
-js::set('account', $this->app->user->account);
-js::set('reviewStory', $lang->product->reviewStory);
-js::set('productID', $productID);
-js::set('projectID', $projectID);
-js::set('branch', $branch);
-js::set('rawModule', $this->app->rawModule);
-js::set('productType', $this->app->tab == 'product' ? $product->type : '');
+js::set('browseType',        $browseType);
+js::set('account',           $this->app->user->account);
+js::set('reviewStory',       $lang->product->reviewStory);
+js::set('productID',         $productID);
+js::set('projectID',         $projectID);
+js::set('branch',            $branch);
+js::set('rawModule',         $this->app->rawModule);
+js::set('productType',       $this->app->tab == 'product' ? $product->type : '');
 js::set('projectHasProduct', $projectHasProduct);
-js::set('projectModel', $projectModel);
-js::set('URAndSR', $this->config->URAndSR);
-js::set('unfoldStories', $unfoldStories);
-js::set('unfoldAll',     $lang->execution->treeLevel['all']);
-js::set('foldAll',       $lang->execution->treeLevel['root']);
-js::set('storyType',     $storyType);
-js::set('vision',        $this->config->vision);
-js::set('pageSummary',   $summary);
+js::set('projectModel',      $projectModel);
+js::set('URAndSR',           $this->config->URAndSR);
+js::set('storyType',         $storyType);
+js::set('vision',            $this->config->vision);
+js::set('pageSummary',       $summary);
 ?>
-<style>
-.btn-group .icon-close:before {font-size: 5px; vertical-align: 25%;}
-.btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
-.btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
-#productStoryForm table tbody tr td.c-actions {overflow: visible;}
-#productStoryForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
-</style>
 <?php if(isset($project->hasProduct) && empty($project->hasProduct) && $project->model != 'scrum'):?>
 <style>
 #productStoryForm th.c-plan {display: none !important;}
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 2ef96b1d5d..9958723be7 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -124,7 +124,7 @@ foreach($fieldParams as $fieldName => $param)
                 echo '</td>';
 
                 /* Print field. */
-                echo "<td class='fieldWidth' style='overflow: visible'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . '</td>';
+                echo "<td class='fieldWidth' style='overflow: visible'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control picker-select'") . '</td>';
 
                 /* Print operator. */
                 echo "<td class='operatorWidth'>" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control' onchange='setPlaceHolder($fieldNO)'") . '</td>';
@@ -132,7 +132,7 @@ foreach($fieldParams as $fieldName => $param)
                 /* Print value. */
                 echo "<td id='valueBox$fieldNO' style='overflow:visible'>";
                 if(isset($config->moreLinks["field{$currentField}"])) $config->moreLinks["value$fieldNO"] = $config->moreLinks["field{$currentField}"];
-                if($param['control'] == 'select') echo html::select("value$fieldNO", $param['values'], $formSession["value$fieldNO"], "class='form-control searchSelect chosen' data-max_drop_width='0'");
+                if($param['control'] == 'select') echo html::select("value$fieldNO", $param['values'], $formSession["value$fieldNO"], "class='form-control searchSelect picker-select' data-max_drop_width='0'");
                 if($param['control'] == 'input')
                 {
                     $fieldName  = $formSession["field$fieldNO"];
@@ -188,7 +188,7 @@ foreach($fieldParams as $fieldName => $param)
                 echo '</td>';
 
                 /* Print field. */
-                echo "<td class='fieldWidth' style='overflow: visible'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . '</td>';
+                echo "<td class='fieldWidth' style='overflow: visible'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control picker-select'") . '</td>';
 
                 /* Print operator. */
                 echo "<td class='operatorWidth'>" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control' onchange='setPlaceHolder($fieldNO)'") . '</td>';
@@ -200,7 +200,7 @@ foreach($fieldParams as $fieldName => $param)
                     $selected = $formSession["value$fieldNO"];
                     if(!isset($param['values'][$selected])) $config->moreLinks["value$fieldNO"] = $config->moreLinks["field{$currentField}"];
                 }
-                if($param['control'] == 'select') echo html::select("value$fieldNO", $param['values'], $formSession["value$fieldNO"], "class='form-control searchSelect chosen' data-max_drop_width='0'");
+                if($param['control'] == 'select') echo html::select("value$fieldNO", $param['values'], $formSession["value$fieldNO"], "class='form-control searchSelect picker-select' data-max_drop_width='0'");
 
                 if($param['control'] == 'input')
                 {