Merge pull request #1400 from brooksryba/projects/jnap

PageFix
Templated toolbar
Merge branch 'projects/jnap' of github.com:sightmachine/SimpleSeer into projects/jnap