various HTML/template/etc fixes from UI review