fix: modified menu and main selection