UX/UI cleanup - 3rd of many ;-)