Use relative urls in nav
Initial clean up of single template, lots of legacy crap floating about