cleaned up ui and menu structure