minor restructuring of UI classes