Tidy up templte layout

Now more closely matches model and views, should be easier to find
stuff.