Fix to date picker showing up in wrong place