Cleaning up menus and routing