UX/UI cleanup - second of many ;-)