Last min fixes

Fixed date picker, fixes CG-CamSys/Backlog#46