Cleaned up
Added a cancel-Button for the Datepicker