Fixes #332 Will make a new ticket for replacing datepicker with something more user friendly