Navigation improvements

Made some tweaks to the templates behind the site (better navigation). Still could do more but will get there eventually...