Added interactive menu - refactored code