Head tidy and Moderniser

Tidy up code, add moderniser js