Clean Up and Tweaks

Cleaned up front-end styling, templates
Merge pull request #1 from sbaydakov/master

Latest changes