Adding workspace and datepicker