menu and indentation updates