UI cleanup, phase 2 (partially cosmetic)