UX/UI cleanup - first of many ;-)