Modified menu flow