WPBQA-215: adjust order of widgets.