Gopal, Shashank | #107 | Changed behavior of menu selection.