restructured menu options (added CALM at top level)