Refactoring code.
Fixed DatePicker to have only 1 button