Latest changes

Cleaned up front-end styling, templates