Clean Up and Tweaks

Cleaned up front-end styling, templates