fix calender and add district area