Add menu activity and refactoring