Break fields out into their own partial for added clarity