Updated menus and doit specific stuff