added calendar and map
added calendar and map