cosmetic fixes from theme upgrade