More work on the menus and UI