Review existing menu system in CPS to make it clearer #136
Merge remote-tracking branch 'origin/menu_refactoring_01'