Fix nav and cleanup form
Merge branch 'master' into front-end-updates
Cleanup
Merge pull request #24 from theonion/front-end-updates

Front end updates