Index: trunk/grails-app/views/inventoryItemDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/create.gsp	(revision 388)
+++ trunk/grails-app/views/inventoryItemDetailed/create.gsp	(revision 392)
@@ -51,5 +51,6 @@
                                     <g:select optionKey="id"
                                                         from="${ InventoryLocation.list().sort { p1, p2 -> p1.toString().compareToIgnoreCase(p2.toString()) } }"
-                                                        name="inventoryLocation.id" value="${inventoryItemInstance?.inventoryLocation?.id}" >
+                                                        name="inventoryLocation.id" value="${inventoryItemInstance?.inventoryLocation?.id}"
+                                                        optionValue="${{it.name+ ' in ' + it.inventoryStore}}">
                                     </g:select>
 
Index: trunk/grails-app/views/inventoryItemDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/edit.gsp	(revision 388)
+++ trunk/grails-app/views/inventoryItemDetailed/edit.gsp	(revision 392)
@@ -83,5 +83,6 @@
                                                         from="${ InventoryLocation.list().sort { p1, p2 -> p1.toString().compareToIgnoreCase(p2.toString()) } }"
                                                         name="inventoryLocation.id"
-                                                        value="${inventoryItemInstance?.inventoryLocation?.id}" >
+                                                        value="${inventoryItemInstance?.inventoryLocation?.id}"
+                                                        optionValue="${{it.name+ ' in ' + it.inventoryStore}}">
                                     </g:select>
                                 </td>
Index: trunk/grails-app/views/inventoryItemDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/search.gsp	(revision 388)
+++ trunk/grails-app/views/inventoryItemDetailed/search.gsp	(revision 392)
@@ -9,4 +9,5 @@
         <g:render template="/shared/pictureHead" />
         <filterpane:includes />
+        <export:resource />
     </head>
     <body>
@@ -26,9 +27,53 @@
 
             <div class="paginateButtons">
+                Results: ${inventoryItemInstanceList.size()} / ${inventoryItemInstanceTotal}
                 <span class="searchButtons">
                     <filterpane:filterButton text="Search" appliedText="Change Search" />
                 </span>
-                Results:${inventoryItemInstanceTotal}
             </div>
+
+            <jsUtil:toggleControl toggleId="options"
+                                                    imageId="optionsImg"
+                                                    closedImgUrl="${resource(dir:'images/skin',file:'bullet_arrow_right.png')}"
+                                                    openImgUrl="${resource(dir:'images/skin',file:'bullet_arrow_down.png')}"
+                                                    text="${g.message(code: 'default.options.text')}"
+                                                    />
+
+            <div id="options" style="display:none;">
+                <g:form method="post" >
+                    <g:hiddenField name="params" value="${filterParams}" />
+                    <div class="dialog">
+                        <table>
+                            <tbody>
+
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="max">Results per page:</label>
+                                    </td>
+                                    <td valign="top" class="value">
+                                        <input type="text" maxlength="4" id="description" name="newMax" value="${params.max}"/>
+
+                                        <span class="buttons">
+                                            <g:actionSubmit action="setSearchParamsMax" class="go" value="Update" />
+                                        </span>
+                                    </td>
+                                </tr>
+
+                            </tbody>
+                        </table>
+                    </div>
+                </g:form>
+                <export:formats  params="${filterParams}" formats="['csv', 'excel', 'pdf', 'rtf']"/>
+            </div>
+
+            <br />
+
+            <g:if test="${inventoryItemInstanceList.size() > 10}">
+                <g:if test="${inventoryItemInstanceTotal > inventoryItemInstanceList.size()}">
+                    <div class="paginateButtons">
+                        <g:paginate total="${inventoryItemInstanceTotal}" params="${filterParams}" />
+                    </div>
+                </g:if>
+            </g:if>
 
             <div class="list">
Index: trunk/grails-app/views/inventoryItemDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/show.gsp	(revision 388)
+++ trunk/grails-app/views/inventoryItemDetailed/show.gsp	(revision 392)
@@ -133,4 +133,5 @@
                                                 ${inventoryItemInstance.inventoryLocation?.encodeAsHTML()}
                                             </g:link>
+                                                in ${inventoryItemInstance.inventoryLocation?.inventoryStore.encodeAsHTML()}
                                         </td>
                                     </tr>
