Add Date picker and fixes