[refactor] templates. Improve navigation between pages.  A bit of usability didn't hurt anyone.