Added wrap around for date picker