added the date picker and a couple of other lines as well