More UI band-aids