Updated code with full menu