Updated markup and added jquery ui datepicker