Template retest page & views, reworked nav, fluid layout

Also tidied some htmls/js