menu and tutorials re-organization