UI updates by @pslh (Paul Henshaw)

Various UI updates to templates.

Replaces #319 
I would add a `style=` instead of `<br/>`