rearrange components to fix date picker