--- a/TODO	Sat Oct 18 00:56:42 2003 -0400
+++ b/TODO	Fri Oct 24 14:19:30 2003 -0400
@@ -10,3 +10,5 @@
 * Better unicode handling.
 * Selection based bookmark manipulation.
 * More user preferences.
+* Clean up of all the code.  This is a real mess currently!
+* Optimization of some code part.

--- a/folders.tmpl	Sat Oct 18 00:56:42 2003 -0400
+++ b/folders.tmpl	Fri Oct 24 14:19:30 2003 -0400
@@ -29,17 +29,7 @@
 	<button name="action" value="add">Add</button>
     </form>
     <hr>
-    <div class="bookmarks">
-    <dl>
-    <TMPL_LOOP Bookmarks>
-      <dt>
-        <a href="<TMPL_VAR url>"><TMPL_VAR name></a>
-	<a href="edit.py?id=<TMPL_VAR id>">edit</a>
-      </dt>
-      <dd><p><TMPL_VAR desc></p></dd>
-    </TMPL_LOOP>
-    </dl>
-    </div>
+    <TMPL_INCLUDE NAME="bkmarks.tmpl">
     <hr>
   </body>
 </html>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inc/bkmarks.tmpl	Fri Oct 24 14:19:30 2003 -0400
@@ -0,0 +1,27 @@
+<dl>
+  <TMPL_LOOP Bookmarks>
+  <dt>
+    <a href="<TMPL_VAR url>"><TMPL_VAR name></a>
+    <a href="edit.py?id=<TMPL_VAR id>">edit</a>
+  </dt>
+  <dd><p><TMPL_VAR desc></p></dd>
+  </TMPL_LOOP>
+</dl>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-namecase-general:t
+sgml-general-insert-case:lower
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:nil
+sgml-parent-document:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vi: syntax=html
+-->

--- a/index.tmpl	Sat Oct 18 00:56:42 2003 -0400
+++ b/index.tmpl	Fri Oct 24 14:19:30 2003 -0400
@@ -28,17 +28,10 @@
 	<button>Lookup</button>
       </fieldset>
     </form>
-    <dl>
-    <TMPL_LOOP Bookmarks>
-      <dt>
-        <a href="<TMPL_VAR url>"><TMPL_VAR name></a>
-	<a href="edit.py?id=<TMPL_VAR id>">edit</a>
-      </dt>
-      <dd><p><TMPL_VAR desc></p></dd>
-    </TMPL_LOOP>
-    </ul>
+    <TMPL_INCLUDE NAME="bkmarks.tmpl">
     <hr/>
     <p><a href="add.py">Add new bookmark</a>.<br/>
+    <a href="folders.py">Switch to folder view</a>.<br/>
     <a href="import.py">Import a XBEL file</a>.<br/>
     <a href="edit_kw.py">Edit keywords</a>.<br/>
     <a href="prefs.py">Edit User Preferences</a>.</p>