Moved settings to a modal
Working on modal/datepicker