Updates to Calendar Window and Mapwindow