Yet more shifting of view logic.
Merge branch 'master' of https://github.com/alcinnz/WyWeb
Finished shifting view logic to templates.