Tweak templating and display; tidy it up