more menu items, tidying workflow