Removed extra markup
Fixed datepicker