Add functionality for change month and refactor