Menu is changed and refactored