WP-4611: Rearrange fields on content pane edit form. Fix problem with class not removed on body when overlay is closed on save.