Tightened up front end stuff
Merge pull request #7 from guardian/adam-is-awesome

Tightened up front end stuff