small changes to date pickers and a bit of organizing