Add fieldsets to make things a little clearer.