Modification of menu and CG calculator