Move form firlds to partials