AD: added calendar, fixed mockups