Fixed date picker, still a few things to make work on it