Some tweaks to Cheetah menu

CLUB-764 #resolve