UX improvements, 3 level menu and code cleanup