added menus and improved workflow