Removed "hidden" menu buttons, adv options cleanup