tidy up menus in demo