Add fields to edit page
Split field types