added calendar, better ui