better menu logic