diff --git a/www/ts/html_only.yaws b/www/html_only.yaws
similarity index 100%
rename from www/ts/html_only.yaws
rename to www/html_only.yaws
diff --git a/www/index.yaws b/www/index.yaws
index a0c7d5d..57fc4c4 100644
--- a/www/index.yaws
+++ b/www/index.yaws
@@ -2,23 +2,180 @@
 <html>
 
     <head>
-        <title>TimeStamper - Simple time tracking</title>
+        <title>TimeStamper - Simple Time Tracking</title>
+        <link rel="stylesheet" media="screen" href="/css/dot-luv/jquery-ui-1.8.10.custom.css" type="text/css"/>
+        <link rel="stylesheet" media="screen" href="/css/ts-screen.css" type="text/css"/>
+        <!-- Needed for IE, but I'm not going to support IE with this tool. -->
+        <!--<script type="text/javascript" src="/js/json2.js"></script>-->
+        <script type="text/javascript" src="/js/jquery-1.5.min.js"></script>
+        <script type="text/javascript" src="/js/jquery-ui-1.8.10.custom.min.js"></script>
+        <script type="text/javascript" src="/js/underscore-min.js"></script>
+        <script type="text/javascript" src="/js/ICanHaz.js"></script>
+        <script type="text/javascript" src="/js/ts.js"></script>
+        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+
+        <script id="entry" type="text/html">
+            <div class="entry-bar" id="entry-{{entry_id}}">
+                <div class="entry-display">
+                    <span class="id">{{entry_id}}</span>
+                    <div class="details">
+                        <div class="entry-mark">{{mark}}</div>
+                        <div class="entry-notes">{{notes}}</div>
+                    </div>
+                    <div class="control-links">
+                        <a onclick="$('#entry-{{entry_id}} .entry-display .entry-notes').slideToggle('slow');"
+                            href="#">show notes</a>
+                        <a onclick="toggleEditEntry(event, {{entry_id}})"
+                            href="#">edit</a>
+                        <a onclick="deleteEntry(event, {{entry_id}})"
+                            href="#">del</a>
+                    </div>
+                </div>
+                <div class="entry-edit">
+                    <form action="/ts/update-entry.yaws"
+                        onsubmit="updateEntry(event, {{entry_id}})">
+                        <input type="text" id="entry-{{entry_id}}-id-input"
+                            class="id" value="{{entry_id}}"/>
+                        <div class="details">
+                            <input type="text" id="entry-{{entry_id}}-mark-input"
+                                class="entry-mark" value="{{mark}}"/></br>
+                            <textarea id="entry-{{entry_id}}-notes-input"
+                                class="entry-notes" rows="8" cols="40" >{{notes}}</textarea>
+                        </div>
+                    </form>
+                    <div class="control-links">
+                        <a onclick="$('#entry-{{entry_id}} .entry-edit .entry-notes').slideToggle('slow');"
+                            href="#">show notes</a>
+                        <a onclick="updateEntry(event, {{entry_id}})"
+                            href="#">save changes</a>
+                    </div>
+                </div>
+            </div>
+        </script>
     </head>
 
     <body>
-        <div id="header">
-            <div>
-                <h1>TimeStamper</h1>
-                <h4>Simple time tracking.</h4>
+
+        <div id="user" class="bar">
+            <span id="fullname">Not Logged In</span>
+            <span id="username">- no_user</span>
+            <div class="control-links">
+                <a href="/ts/edit-user.yaws"
+                    onclick="$('#user-info').slideToggle('slow'); return false;">
+                    user info</a>
+                <a href="/ts/logout.yaws" onclick="logout(event)">logout</a>
             </div>
-            <div id="form-panel">
-                <form action="/ts/" method="post">
-                    <label for="uname">username: </label>
-                    <input name="uname" type="text"/>
-                    <label for="pwd">password: </label>
-                    <input name="pwd" type="password"/>
+
+            <div id="user-info">
+                <form action="/ts/update-user.yaws" onsubmit="updateUser(event)">
+                    <div class="form-col">
+                        <label for="fullname-input"><span>name:</span>
+                            <input id="fullname-input" name="fullname"
+                                class="text-input" type="text"/>
+                        </label>
+                        <label for="email-input"><span>email:</span>
+                            <input id="email-input" name="email"
+                                class="text-input" type="text"/>
+                        </label>
+                    </div>
+                    <div class="form-col">
+                       <div id="change-pwd">
+                            <label for="old-pwd-input"><span>password:</span>
+                                <input id="old-pwd-input" name="old-pwd"
+                                    class="text-input" type="password"/>
+                            </label>
+                            <label for="new-pwd-input"><span>new pwd:</span>
+                                <input id="new-pwd-input" name="new-pwd"
+                                    class="text-input" type="password"/>
+                            </label>
+                            <label for="new-pwd-conf-input"><span>confirm:</span>
+                                <input id="new-pwd-conf-input" name="new-pwd-conf"
+                                    class="text-input" type="password"/>
+                            </label>
+                        </div>
+                        <label for="enable-pwd-change-input">
+                            <input name="enable-pwd-change" type="checkbox"
+                                id="enable-pwd-change-input"
+                                onclick="$('#change-pwd').slideToggle('slow');"/>
+                                change password
+                        </label>
+                     </div>
+                     <div class="form-submit">
+                        <div>
+                        <input name="submit-user" type="submit"
+                            value="save changes"/>
+                        </div>
+                     </div>
                 </form>
             </div>
+        </div>
+
+        <div id="timeline" class="bar">
+            <span id="timeline-name">timeline |</span>
+            <span id="timeline-desc">timeline description</span>
+            <div class="control-links">
+                <a href="/ts/edit-timeline.yaws"
+                    onclick="$('#timeline-info').slideToggle('slow'); return false;">
+                    timeline info</a>
+                <a href="/ts/select-timeline.yaws"
+                    onclick="showTimelineMenu(event)">change timelines</a>
+            </div>
+
+            <div id="timeline-info">
+                <form action="/ts/update-timeline.yaws"
+                    onsubmit="updateTimeline(event); false">
+                    <label for="timeline-desc-input"><span>description:</span>
+                        <input id="timeline-desc-input" class="text-input"
+                            name="timeline-desc" type="text"/>
+                    </label>
+                    <div class="form-submit">
+                        <div><input name="submit-timeline" type="submit"
+                            value="save changes"/></div>
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <div id="new-entry" class="bar">
+            <form action="/ts/new-entry.yaws" onsubmit="newEntry(event)">
+                begin a new activity:
+                <input name="new-entry" id="new-entry-input"
+                    class="text-input" type="text"/>
+                <input name="submit-entry" id="submit-entry"
+                    class="form-submit" type="submit" value="create entry"/>
+                <div class="control-links">
+                    <a id="show-notes" href="#"
+                        onclick="$('#add-notes').slideToggle('slow');">
+                        add notes</a>
+                </div>
+                <div id="add-notes" class="form-col">
+                    <label for="new-notes-input">notes:</label>
+                    <textarea name="new-notes" id="new-notes-input"
+                        class="text-input" rows="8" cols="40" ></textarea>
+                </div>
+            </form>
+        </div>
+
+        <div id="more-entries" class="last-bar top-entry">
+            <div>
+                <a href="#" onclick="loadEntries(user, activeTimeline, 'old');event.preventDefault()">load more entries</a>
+            </div>
+        </div>
+
+        <div id="login-dialog" title="Login">
+            <form>
+            <fieldset>
+                <label for="login-name">Username:</label>
+                <input type="text" name="login-name" id="login-name"
+                    class="text ui-widget-content ui-corner-all"></input>
+                <label for="login-password">Password:</label>
+                <input type="password" name="login-password" id="login-password"
+                    class="text ui-widget-content ui-corner-all"></input>
+            </fieldset>
+            </form>
+
+            <p class="validate-tips"></p>
+        </div>
     </body>
 
 </html>
diff --git a/www/ts/index.yaws b/www/ts/index.yaws
deleted file mode 100644
index 57fc4c4..0000000
--- a/www/ts/index.yaws
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-    <head>
-        <title>TimeStamper - Simple Time Tracking</title>
-        <link rel="stylesheet" media="screen" href="/css/dot-luv/jquery-ui-1.8.10.custom.css" type="text/css"/>
-        <link rel="stylesheet" media="screen" href="/css/ts-screen.css" type="text/css"/>
-        <!-- Needed for IE, but I'm not going to support IE with this tool. -->
-        <!--<script type="text/javascript" src="/js/json2.js"></script>-->
-        <script type="text/javascript" src="/js/jquery-1.5.min.js"></script>
-        <script type="text/javascript" src="/js/jquery-ui-1.8.10.custom.min.js"></script>
-        <script type="text/javascript" src="/js/underscore-min.js"></script>
-        <script type="text/javascript" src="/js/ICanHaz.js"></script>
-        <script type="text/javascript" src="/js/ts.js"></script>
-        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-
-        <script id="entry" type="text/html">
-            <div class="entry-bar" id="entry-{{entry_id}}">
-                <div class="entry-display">
-                    <span class="id">{{entry_id}}</span>
-                    <div class="details">
-                        <div class="entry-mark">{{mark}}</div>
-                        <div class="entry-notes">{{notes}}</div>
-                    </div>
-                    <div class="control-links">
-                        <a onclick="$('#entry-{{entry_id}} .entry-display .entry-notes').slideToggle('slow');"
-                            href="#">show notes</a>
-                        <a onclick="toggleEditEntry(event, {{entry_id}})"
-                            href="#">edit</a>
-                        <a onclick="deleteEntry(event, {{entry_id}})"
-                            href="#">del</a>
-                    </div>
-                </div>
-                <div class="entry-edit">
-                    <form action="/ts/update-entry.yaws"
-                        onsubmit="updateEntry(event, {{entry_id}})">
-                        <input type="text" id="entry-{{entry_id}}-id-input"
-                            class="id" value="{{entry_id}}"/>
-                        <div class="details">
-                            <input type="text" id="entry-{{entry_id}}-mark-input"
-                                class="entry-mark" value="{{mark}}"/></br>
-                            <textarea id="entry-{{entry_id}}-notes-input"
-                                class="entry-notes" rows="8" cols="40" >{{notes}}</textarea>
-                        </div>
-                    </form>
-                    <div class="control-links">
-                        <a onclick="$('#entry-{{entry_id}} .entry-edit .entry-notes').slideToggle('slow');"
-                            href="#">show notes</a>
-                        <a onclick="updateEntry(event, {{entry_id}})"
-                            href="#">save changes</a>
-                    </div>
-                </div>
-            </div>
-        </script>
-    </head>
-
-    <body>
-
-        <div id="user" class="bar">
-            <span id="fullname">Not Logged In</span>
-            <span id="username">- no_user</span>
-            <div class="control-links">
-                <a href="/ts/edit-user.yaws"
-                    onclick="$('#user-info').slideToggle('slow'); return false;">
-                    user info</a>
-                <a href="/ts/logout.yaws" onclick="logout(event)">logout</a>
-            </div>
-
-            <div id="user-info">
-                <form action="/ts/update-user.yaws" onsubmit="updateUser(event)">
-                    <div class="form-col">
-                        <label for="fullname-input"><span>name:</span>
-                            <input id="fullname-input" name="fullname"
-                                class="text-input" type="text"/>
-                        </label>
-                        <label for="email-input"><span>email:</span>
-                            <input id="email-input" name="email"
-                                class="text-input" type="text"/>
-                        </label>
-                    </div>
-                    <div class="form-col">
-                       <div id="change-pwd">
-                            <label for="old-pwd-input"><span>password:</span>
-                                <input id="old-pwd-input" name="old-pwd"
-                                    class="text-input" type="password"/>
-                            </label>
-                            <label for="new-pwd-input"><span>new pwd:</span>
-                                <input id="new-pwd-input" name="new-pwd"
-                                    class="text-input" type="password"/>
-                            </label>
-                            <label for="new-pwd-conf-input"><span>confirm:</span>
-                                <input id="new-pwd-conf-input" name="new-pwd-conf"
-                                    class="text-input" type="password"/>
-                            </label>
-                        </div>
-                        <label for="enable-pwd-change-input">
-                            <input name="enable-pwd-change" type="checkbox"
-                                id="enable-pwd-change-input"
-                                onclick="$('#change-pwd').slideToggle('slow');"/>
-                                change password
-                        </label>
-                     </div>
-                     <div class="form-submit">
-                        <div>
-                        <input name="submit-user" type="submit"
-                            value="save changes"/>
-                        </div>
-                     </div>
-                </form>
-            </div>
-        </div>
-
-        <div id="timeline" class="bar">
-            <span id="timeline-name">timeline |</span>
-            <span id="timeline-desc">timeline description</span>
-            <div class="control-links">
-                <a href="/ts/edit-timeline.yaws"
-                    onclick="$('#timeline-info').slideToggle('slow'); return false;">
-                    timeline info</a>
-                <a href="/ts/select-timeline.yaws"
-                    onclick="showTimelineMenu(event)">change timelines</a>
-            </div>
-
-            <div id="timeline-info">
-                <form action="/ts/update-timeline.yaws"
-                    onsubmit="updateTimeline(event); false">
-                    <label for="timeline-desc-input"><span>description:</span>
-                        <input id="timeline-desc-input" class="text-input"
-                            name="timeline-desc" type="text"/>
-                    </label>
-                    <div class="form-submit">
-                        <div><input name="submit-timeline" type="submit"
-                            value="save changes"/></div>
-                    </div>
-                </form>
-            </div>
-        </div>
-
-        <div id="new-entry" class="bar">
-            <form action="/ts/new-entry.yaws" onsubmit="newEntry(event)">
-                begin a new activity:
-                <input name="new-entry" id="new-entry-input"
-                    class="text-input" type="text"/>
-                <input name="submit-entry" id="submit-entry"
-                    class="form-submit" type="submit" value="create entry"/>
-                <div class="control-links">
-                    <a id="show-notes" href="#"
-                        onclick="$('#add-notes').slideToggle('slow');">
-                        add notes</a>
-                </div>
-                <div id="add-notes" class="form-col">
-                    <label for="new-notes-input">notes:</label>
-                    <textarea name="new-notes" id="new-notes-input"
-                        class="text-input" rows="8" cols="40" ></textarea>
-                </div>
-            </form>
-        </div>
-
-        <div id="more-entries" class="last-bar top-entry">
-            <div>
-                <a href="#" onclick="loadEntries(user, activeTimeline, 'old');event.preventDefault()">load more entries</a>
-            </div>
-        </div>
-
-        <div id="login-dialog" title="Login">
-            <form>
-            <fieldset>
-                <label for="login-name">Username:</label>
-                <input type="text" name="login-name" id="login-name"
-                    class="text ui-widget-content ui-corner-all"></input>
-                <label for="login-password">Password:</label>
-                <input type="password" name="login-password" id="login-password"
-                    class="text ui-widget-content ui-corner-all"></input>
-            </fieldset>
-            </form>
-
-            <p class="validate-tips"></p>
-        </div>
-    </body>
-
-</html>
