Modified interactive menu option and other minor changes