made changes with ui and class relationships
made changes with ui and class relationships