Review existing menu system in CPS to make it clearer #136