Added spinner and datepicker