UI updates by @pslh (Paul Henshaw)

Various UI updates to templates.

Replaces #319 
Bad html: `&` must be replaced with `&amp;`