Simplify the setup
Only show fields that have been filled