Added Interactive Menu and Refactored