Added all appropriate fields and made optional ones only display if they have a value set