diff --git a/chrome/chromeFiles/content/scholar/itemPane.xul b/chrome/chromeFiles/content/scholar/itemPane.xul
index 72ddf1597..934b36c27 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.xul
+++ b/chrome/chromeFiles/content/scholar/itemPane.xul
@@ -9,6 +9,8 @@
 		<tabs>
 			<tab label="Notes"/>
 			<tab label="Info"/>
+			<tab label="Tags"/>
+			<tab label="Files"/>
 		</tabs>
 		<tabpanels flex="1">
 			<vbox>
@@ -42,6 +44,12 @@
 					</rows>
 				</grid>
 			</vbox>
+			<vbox align="center" pack="center">
+				<label value="Coming soon"/>
+			</vbox>
+			<vbox align="center" pack="center">
+				<label value="Coming soon"/>
+			</vbox>
 		</tabpanels>
 	</tabbox>
 </overlay>
\ No newline at end of file
diff --git a/chrome/chromeFiles/content/scholar/overlay.js b/chrome/chromeFiles/content/scholar/overlay.js
index 9f507645d..ab2500c54 100644
--- a/chrome/chromeFiles/content/scholar/overlay.js
+++ b/chrome/chromeFiles/content/scholar/overlay.js
@@ -99,6 +99,7 @@ var ScholarPane = new function()
 			itemsView.unregister();
 		
 		document.getElementById('tb-search').value = "";
+		document.getElementById('scholar-search-options').hidden = true;
 			
 		if(collectionsView.selection.count == 1 && collectionsView.selection.currentIndex != -1)
 		{
@@ -169,7 +170,16 @@ var ScholarPane = new function()
 	function search()
 	{
 		if(itemsView)
-			itemsView.searchText(document.getElementById('tb-search').value);
+		{
+			searchVal = document.getElementById('tb-search').value;
+			itemsView.searchText(searchVal);
+			
+			//do something about granularity
+			//document.getElementById('scholar-search-options').getElementsByAttribute('checked','true')[0].label
+			
+			document.getElementById('scholar-search-options').hidden = searchVal == "";
+		}
+		
 	}
 	
 	function getCollectionsView()
diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul
index d6dfe0145..2cccbad89 100644
--- a/chrome/chromeFiles/content/scholar/overlay.xul
+++ b/chrome/chromeFiles/content/scholar/overlay.xul
@@ -70,8 +70,19 @@
 						</toolbarbutton>
 						<spacer flex="1"/>
 						<label value="&toolbar.search.label;" control="tb-search"/>
-						<textbox id="tb-search" type="timed" timeout="500" command="cmd_scholar_search"/>
+						<textbox id="tb-search" type="timed" timeout="250" command="cmd_scholar_search"/>
 					</toolbar>
+					<hbox id="scholar-search-options" hidden="true">
+						<hbox>
+							<toolbarbutton type="checkbox" label="Entire Item" checked="true" onclick="var b = this.parentNode.getElementsByAttribute('checked','true'); b[0].checked = false;" command="cmd_scholar_search"/>
+							<toolbarbutton type="checkbox" label="Info" onclick="var b = this.parentNode.getElementsByAttribute('checked','true'); b[0].checked = false;" command="cmd_scholar_search"/>
+							<toolbarbutton type="checkbox" label="Notes" onclick="var b = this.parentNode.getElementsByAttribute('checked','true'); b[0].checked = false;" command="cmd_scholar_search"/>
+							<toolbarbutton type="checkbox" label="Files" onclick="var b = this.parentNode.getElementsByAttribute('checked','true'); b[0].checked = false;" command="cmd_scholar_search"/>
+						</hbox>
+						<spacer flex="1"/>
+						<toolbarbutton label="Save"/>
+						<toolbarbutton label="+"/>
+					</hbox>
 					<tree 
 						id="items-tree" context="scholar-itemmenu"
 						enableColumnDrag="true" onkeypress="if(event.keyCode == event.DOM_VK_BACK_SPACE || event.keyCode == event.DOM_VK_DELETE){ ScholarPane.deleteSelectedItem(); return false; }"
@@ -127,7 +138,7 @@
 				</vbox>
 				<splitter id="scholar-view-splitter" collapse="after" persist="state"><grippy/></splitter>
 				<box width="300" style="min-width: 300px;" pack="center" align="center">
-					<label id="scholar-view-selected-label" style="text-align: center;"/>
+					<label id="scholar-view-selected-label"/>
 					<tabbox id="scholar-view-item" hidden="true" flex="1"/>
 				</box>
 			</hbox>
diff --git a/chrome/chromeFiles/skin/default/scholar/overlay.css b/chrome/chromeFiles/skin/default/scholar/overlay.css
index 1703ad8a1..93709aeb1 100644
--- a/chrome/chromeFiles/skin/default/scholar/overlay.css
+++ b/chrome/chromeFiles/skin/default/scholar/overlay.css
@@ -87,6 +87,11 @@ tree #items-tree
 	-moz-user-focus: ignore;
 }
 
+#scholar-view-item tabpanels
+{
+	padding: 8px 0px 0px 0px;
+}
+
 #scholar-view-item .clicky
 {	
 	-moz-border-radius: 6px;