various HTML/template/etc fixes from UI review

A few fixes I could squeeze in tonight.