Fixing date picker and such