Added date-time picker and fixed wording on titles