Modifications to Calendar

- Replaced the existing calendar with a more modular one
- Fixed an issue with toggling the dates in the calendar