various small changes working on templates

Minimal changes with some extra commentary.  I want to add the login
system tomorrow.