Added interative menu and refactored menu