Small fixes to the templates and overall layout and usability