Move some fields around