with menu items and other minor additions