content_collection: reorganize form

Move individual setting tools into the open.
Move the two collapsing fieldsets to a common area.