HSM-2680 - Adv Menu Development