Refactor fields into a partial. This will make adding custom fields more managable