Refactor and improve how fields are displayed