WP-4736 re-order modal categories
WP-4736 move few sections