diff --git a/chrome/chromeFiles/content/scholar/editpane.js b/chrome/chromeFiles/content/scholar/editpane.js
index a33ee200a4..958f171146 100644
--- a/chrome/chromeFiles/content/scholar/editpane.js
+++ b/chrome/chromeFiles/content/scholar/editpane.js
@@ -31,7 +31,7 @@ Scholar.EditPane = new function()
 					  promptService.BUTTON_TITLE_DONT_SAVE * promptService.BUTTON_POS_2;
 					  
 			var response = promptService.confirmEx(window,"",
-								  "One or more files have not been saved.",
+								  "Do you want to save the changes to '"+_itemBeingEdited.getField("title")+"'?",
 								  flags, null, null, null, null, {});
 			if(response == 1)
 				return;
diff --git a/chrome/chromeFiles/content/scholar/scholar-main.js b/chrome/chromeFiles/content/scholar/scholar-main.js
new file mode 100644
index 0000000000..b9b24d64aa
--- /dev/null
+++ b/chrome/chromeFiles/content/scholar/scholar-main.js
@@ -0,0 +1,4 @@
+function init()
+{
+	//
+}
\ No newline at end of file
diff --git a/chrome/chromeFiles/content/scholar/scholar-main.xul b/chrome/chromeFiles/content/scholar/scholar-main.xul
new file mode 100644
index 0000000000..b207e8236b
--- /dev/null
+++ b/chrome/chromeFiles/content/scholar/scholar-main.xul
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://scholar/locale/scholar.dtd">
+
+<window
+    id="scholar-window"
+    title="Scholar"
+    orient="vertical"
+    width="800"
+    height="600"
+    onload="init()"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    
+    <script src="scholar-main.js"/>
+    <script src="treeView.js"/>
+    
+	<toolbar>
+		<toolbarbutton label="Add Folder..."/>
+		<spacer flex="1"/>
+		<toolbarbutton label="New Item..." type="menu">
+			<menupopup>
+				<menuitem label="Book"/>
+				<menuitem label="Journal Article"/>
+			</menupopup>
+		</toolbarbutton>
+	</toolbar>
+	<hbox flex="1">
+		<vbox id="folders-pane" flex="1">
+			<tree id="folders-tree" flex="1">
+				<treecols>
+					<treecol
+						id="name_column"
+						label="Name"
+						flex="1"/>
+				</treecols>
+				<treechildren/>
+			</tree>
+		</vbox>
+		<splitter collapse="before" resizebefore="closest" resizeafter="closest">
+			<grippy/>
+		</splitter>
+		<vbox flex="3">
+			<tree 
+				id="items-tree" 
+				enablecolumndrag="true"
+				flex="1">
+				
+				<treecols>
+					<treecol
+						id="title_column"
+						label="&sidebar.items.title_column;"
+						flex="2"/>
+					<splitter class="tree-splitter"/>
+					<treecol
+						id="creator_column"
+						label="&sidebar.items.creator_column;"
+						flex="1"/>
+					<splitter class="tree-splitter"/>
+					<treecol
+						id="source_column"
+						label="&sidebar.items.source_column;"
+						flex="1"/>
+				</treecols>
+		
+				<treechildren/>
+			</tree>
+			<splitter collapse="after" resizebefore="closest" resizeafter="closest">
+				<grippy/>
+			</splitter>
+			<tree id="edit-pane" flex="2"/>
+		</vbox>
+	</hbox>
+</window>
\ No newline at end of file
diff --git a/chrome/chromeFiles/content/scholar/scholar.xul b/chrome/chromeFiles/content/scholar/scholar.xul
index 69a74a04ed..67ddd6006b 100644
--- a/chrome/chromeFiles/content/scholar/scholar.xul
+++ b/chrome/chromeFiles/content/scholar/scholar.xul
@@ -20,11 +20,17 @@
 	</statusbar>
 	
 	<menupopup id="viewSidebarMenu">
-		<menuitem key="key_openScholarSidebar" observes="viewScholarSidebar"  />
+		<menuitem observes="viewScholarSidebar"  />
+	</menupopup>
+	
+	<menupopup id="menu_ToolsPopup">
+		<menuitem id="tools-scholar"
+			oncommand="open('chrome://scholar/content/scholar-main.xul','scholar-window','chrome, resizable');" label="Scholar"
+			key="key_openScholar"/>
 	</menupopup>
   
 	<keyset id="mainKeyset">
-		<key id="key_openScholarSidebar" command="viewScholarSidebar"
+		<key id="key_openScholar"
 			 key="S" 
 			 modifiers="shift accel" />
 	</keyset>
@@ -39,4 +45,4 @@
 					sidebartitle="Scholar"
 					oncommand="toggleSidebar('viewScholarSidebar');" />
 	</broadcasterset>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/chrome/chromeFiles/content/scholar/treeView.js b/chrome/chromeFiles/content/scholar/treeView.js
new file mode 100644
index 0000000000..e69de29bb2