Index: services/Author/Home.php
===================================================================
--- services/Author/Home.php	(revision 3738)
+++ services/Author/Home.php	(working copy)
@@ -189,6 +189,7 @@
         //   Those we can construct BEFORE the search is executed
         $interface->setPageTitle('Author Search Results');
         $interface->assign('sortList',   $searchObject->getSortList());
+        $interface->assign('viewList',   $searchObject->getViewList());
         $interface->assign('rssLink',    $searchObject->getRSSUrl());
 
         // Process Search
@@ -228,6 +229,9 @@
         // Save the URL of this search to the session so we can return to it easily:
         $_SESSION['lastSearchURL'] = $searchObject->renderSearchUrl();
 
+        //Get view & load template
+        $currentView  = $searchObject->getView();
+        $interface->assign('subpage', 'Search/list-' . $currentView .'.tpl');
         $interface->setTemplate('home.tpl');
         $interface->display('layout.tpl', 'Author' . $_GET['author']);
     }
Index: services/Search/NewItem.php
===================================================================
--- services/Search/NewItem.php	(revision 3669)
+++ services/Search/NewItem.php	(working copy)
@@ -82,6 +82,10 @@
             // Must have atleast Action and Module set to continue
             $interface->setPageTitle('New Item Search Results');
             $interface->setTemplate('newitem-list.tpl');
+            //Get view & load template
+            $currentView  = $searchObject->getView();
+            $interface->assign('subpage', 'Search/list-' . $currentView .'.tpl');
+            $interface->assign('viewList',   $searchObject->getViewList());
             $interface->assign('sortList', $searchObject->getSortList());
             $interface->assign('rssLink', $searchObject->getRSSUrl());
 
Index: services/Search/Reserves.php
===================================================================
--- services/Search/Reserves.php	(revision 3669)
+++ services/Search/Reserves.php	(working copy)
@@ -65,8 +65,11 @@
 
             // Must have atleast Action and Module set to continue
             $interface->setPageTitle('Reserves Search Results');
-            $interface->assign('subpage', 'Search/list-list.tpl');
             $interface->setTemplate('reserves-list.tpl');
+            //Get view & load template
+            $currentView  = $searchObject->getView();
+            $interface->assign('subpage', 'Search/list-' . $currentView .'.tpl');
+            $interface->assign('viewList',   $searchObject->getViewList());
             $interface->assign('sortList', $searchObject->getSortList());
             $interface->assign('rssLink', $searchObject->getRSSUrl());
 
Index: interface/themes/blueprint/Author/home.tpl
===================================================================
--- interface/themes/blueprint/Author/home.tpl	(revision 3806)
+++ interface/themes/blueprint/Author/home.tpl	(working copy)
@@ -21,15 +21,52 @@
     {/foreach}
   {/if}
 
+  {* Listing Options *}
   <div class="resulthead">
-    {translate text="Showing"}
-    <strong>{$recordStart}</strong> - <strong>{$recordEnd}</strong>
-    {translate text='of'} <strong>{$recordCount}</strong>
-    {translate text='for search'}: <strong>'{$authorName|escape:"html"}'</strong>,
-    {translate text='query time'}: {$qtime}s
+    <div class="floatleft hitCount">
+      {if $recordCount}
+        {translate text="Showing"}
+        <strong>{$recordStart}</strong> - <strong>{$recordEnd}</strong>
+        {translate text='of'} <strong>{$recordCount}</strong>
+        {if $searchType == 'basic'}{translate text='for search'}: <strong>'{$lookfor|escape:"html"}'</strong>,{/if}
+      {/if}
+      {translate text='query time'}: {$qtime}s
+      {if $spellingSuggestions}
+      <div class="correction">
+        <strong>{translate text='spell_suggest'}</strong>:
+        {foreach from=$spellingSuggestions item=details key=term name=termLoop}
+          <br/>{$term|escape} &raquo; {foreach from=$details.suggestions item=data key=word name=suggestLoop}<a href="{$data.replace_url|escape}">{$word|escape}</a>{if $data.expand_url} <a href="{$data.expand_url|escape}"><img src="{$path}/images/silk/expand.png" alt="{translate text='spell_expand_alt'}"/></a> {/if}{if !$smarty.foreach.suggestLoop.last}, {/if}{/foreach}
+        {/foreach}
+      </div>
+      {/if}
+    </div>
+
+    <div class="floatright">
+      <div class="viewButtons">
+      {if $viewList|@count gt 1}
+        {foreach from=$viewList item=viewData key=viewLabel}
+          {if !$viewData.selected}<a href="{$viewData.viewUrl|escape}" title="{translate text='Switch view to'} {translate text=$viewData.desc}" >{/if}<img src="{$path}/images/view_{$viewData.viewType}.png" {if $viewData.selected}title="{translate text=$viewData.desc} {translate text='view already selected'}"{/if}/>{if !$viewData.selected}</a>{/if}
+        {/foreach}
+      {/if}</div>
+      <form action="{$path}/Search/SortResults" method="post">
+        <label for="sort_options_1">{translate text='Sort'}</label>
+        <select id="sort_options_1" name="sort" class="jumpMenu">
+          {foreach from=$sortList item=sortData key=sortLabel}
+            <option value="{$sortData.sortUrl|escape}"{if $sortData.selected} selected="selected"{/if}>{translate text=$sortData.desc}</option>
+          {/foreach}
+        </select>
+        <noscript><input type="submit" value="{translate text="Set"}" /></noscript>
+      </form>
+    </div>
+    <div class="clear"></div>
   </div>
+  {* End Listing Options *}
 
-  {include file=Search/list-list.tpl}
+  {if $subpage}
+    {include file=$subpage}
+  {else}
+    {$pageContent}
+  {/if}
 
   {if $pageLinks.all}<div class="pagination">{$pageLinks.all}</div>{/if}
 
Index: interface/themes/classic/Author/home.tpl
===================================================================
--- interface/themes/classic/Author/home.tpl	(revision 3806)
+++ interface/themes/classic/Author/home.tpl	(working copy)
@@ -5,7 +5,7 @@
   <div id="yui-main" class="content">
     <div class="yui-b first contentbox">
     
-      <div class="record">
+      <div>
         {if $lastsearch}
           <p>  <a href="{$lastsearch|escape}" class="backtosearch">&laquo; {translate text="Back to Search Results"}</a></p>
         {/if}
@@ -28,15 +28,52 @@
           {/foreach}
         {/if}
 
-        <div class="resulthead">
-          {translate text="Showing"}
-          <b>{$recordStart}</b> - <b>{$recordEnd}</b>
-          {translate text='of'} <b>{$recordCount}</b>
-          {translate text='for search'}: <b>'{$authorName|escape:"html"}'</b>,
-          {translate text='query time'}: {$qtime}s
+        {* Listing Options *}
+        <div class="yui-gc resulthead">
+          <div class="yui-u first">
+          {if $recordCount}
+            {translate text="Showing"}
+            <b>{$recordStart}</b> - <b>{$recordEnd}</b>
+            {translate text='of'} <b>{$recordCount}</b>
+            {if $searchType == 'basic'}{translate text='for search'}: <b>'{$lookfor|escape:"html"}'</b>,{/if}
+          {/if}
+            {translate text='query time'}: {$qtime}s
+            {if $spellingSuggestions}
+            <br /><br /><div class="correction"><strong>{translate text='spell_suggest'}</strong>:<br/>
+            {foreach from=$spellingSuggestions item=details key=term name=termLoop}
+              {$term|escape} &raquo; {foreach from=$details.suggestions item=data key=word name=suggestLoop}<a href="{$data.replace_url|escape}">{$word|escape}</a>{if $data.expand_url} <a href="{$data.expand_url|escape}"><img src="{$path}/images/silk/expand.png" alt="{translate text='spell_expand_alt'}"/></a> {/if}{if !$smarty.foreach.suggestLoop.last}, {/if}{/foreach}{if !$smarty.foreach.termLoop.last}<br/>{/if}
+            {/foreach}
+            </div>
+            {/if}
+          </div>
+
+          <div class="yui-u toggle">
+            {if $viewList|@count gt 1}
+              {foreach from=$viewList item=viewData key=viewLabel}
+                {if !$viewData.selected}<a href="{$viewData.viewUrl|escape}" title="{translate text='Switch view to'} {translate text=$viewData.desc}" >{/if}
+                <img src="{$path}/images/view_{$viewData.viewType}.png" {if $viewData.selected}title="{translate text=$viewData.desc} {translate text='view already selected'}"{/if}/>
+                {if !$viewData.selected}</a>{/if}
+              {/foreach}
+            {/if}<br />
+            <form action="{$path}/Search/SortResults" method="post">
+              <label for="sort">{translate text='Sort'}</label>
+              <select id="sort" name="sort" onChange="document.location.href = this.options[this.selectedIndex].value;">
+                {foreach from=$sortList item=sortData key=sortLabel}
+                  <option value="{$sortData.sortUrl|escape}"{if $sortData.selected} selected{/if}>{translate text=$sortData.desc}</option>
+                {/foreach}
+              </select>
+              <noscript><input type="submit" value="{translate text="Set"}" /></noscript>
+            </form>
+          </div>
+
         </div>
+        {* End Listing Options *}
 
-        {include file="Search/list-list.tpl"}
+        {if $subpage}
+          {include file=$subpage}
+        {else}
+          {$pageContent}
+        {/if}
 
         {if $pageLinks.all}<div class="pagination">{$pageLinks.all}</div>{/if}
   
Index: interface/themes/default/Author/home.tpl
===================================================================
--- interface/themes/default/Author/home.tpl	(revision 3806)
+++ interface/themes/default/Author/home.tpl	(working copy)
@@ -28,16 +28,53 @@
           {/foreach}
         {/if}
 
-        <div class="resulthead">
+      {* Listing Options *}
+      <div class="yui-ge resulthead">
+        <div class="yui-u first">
+        {if $recordCount}
           {translate text="Showing"}
           <b>{$recordStart}</b> - <b>{$recordEnd}</b>
           {translate text='of'} <b>{$recordCount}</b>
-          {translate text='for search'}: <b>'{$authorName|escape:"html"}'</b>,
+          {if $searchType == 'basic'}{translate text='for search'}: <b>'{$lookfor|escape:"html"}'</b>,{/if}
+        {/if}
           {translate text='query time'}: {$qtime}s
+          {if $spellingSuggestions}
+          <br /><br /><div class="correction"><strong>{translate text='spell_suggest'}</strong>:<br/>
+          {foreach from=$spellingSuggestions item=details key=term name=termLoop}
+            {$term|escape} &raquo; {foreach from=$details.suggestions item=data key=word name=suggestLoop}<a href="{$data.replace_url|escape}">{$word|escape}</a>{if $data.expand_url} <a href="{$data.expand_url|escape}"><img src="{$path}/images/silk/expand.png" alt="{translate text='spell_expand_alt'}"/></a> {/if}{if !$smarty.foreach.suggestLoop.last}, {/if}{/foreach}{if !$smarty.foreach.termLoop.last}<br/>{/if}
+          {/foreach}
+          </div>
+          {/if}
         </div>
 
-        {include file=Search/list-list.tpl}
+        <div class="yui-u toggle">
+          {if $viewList|@count gt 1}
+            {foreach from=$viewList item=viewData key=viewLabel}
+              {if !$viewData.selected}<a href="{$viewData.viewUrl|escape}" title="{translate text='Switch view to'} {translate text=$viewData.desc}" >{/if}
+              <img src="{$path}/images/view_{$viewData.viewType}.png" {if $viewData.selected}title="{translate text=$viewData.desc} {translate text='view already selected'}"{/if}/>
+              {if !$viewData.selected}</a>{/if}
+            {/foreach}
+          {/if}<br />
+          <form action="{$path}/Search/SortResults" method="post">
+            <label for="sort">{translate text='Sort'}</label>
+            <select id="sort" name="sort" onChange="document.location.href = this.options[this.selectedIndex].value;">
+              {foreach from=$sortList item=sortData key=sortLabel}
+                <option value="{$sortData.sortUrl|escape}"{if $sortData.selected} selected{/if}>{translate text=$sortData.desc}</option>
+              {/foreach}
+            </select>
+            <noscript><input type="submit" value="{translate text="Set"}" /></noscript>
+          </form>
+        </div>
 
+      </div>
+      {* End Listing Options *}
+
+        {if $subpage}
+          {include file=$subpage}
+        {else}
+          {$pageContent}
+        {/if}
+
         {if $pageLinks.all}<div class="pagination">{$pageLinks.all}</div>{/if}
 
       </div>
Index: interface/themes/blueprint/Search/newitem-list.tpl
===================================================================
--- interface/themes/blueprint/Search/newitem-list.tpl	(revision 3806)
+++ interface/themes/blueprint/Search/newitem-list.tpl	(working copy)
@@ -36,7 +36,11 @@
     </div>
     {* End Listing Options *}
 
-    {include file="Search/list-list.tpl"}
+    {if $subpage}
+      {include file=$subpage}
+    {else}
+      {$pageContent}
+    {/if}
 
     {if $pageLinks.all}<div class="pagination">{$pageLinks.all}</div>{/if}
       
Index: interface/themes/classic/Search/newitem-list.tpl
===================================================================
--- interface/themes/classic/Search/newitem-list.tpl	(revision 3806)
+++ interface/themes/classic/Search/newitem-list.tpl	(working copy)
@@ -38,7 +38,7 @@
         </div>
         {* End Listing Options *}
 
-        {include file="Search/list-list.tpl"}
+        {include file=$subpage}
 
       {if $pageLinks.all}<div class="pagination">{$pageLinks.all}</div>{/if}
       
Index: interface/themes/default/Search/newitem-list.tpl
===================================================================
--- interface/themes/default/Search/newitem-list.tpl	(revision 3806)
+++ interface/themes/default/Search/newitem-list.tpl	(working copy)
@@ -39,7 +39,11 @@
         </div>
         {* End Listing Options *}
 
-        {include file="Search/list-list.tpl"}
+        {if $subpage}
+          {include file=$subpage}
+        {else}
+          {$pageContent}
+        {/if}
 
       {if $pageLinks.all}<div class="pagination">{$pageLinks.all}</div>{/if}