WPBQA-233 moved the buttons to the right region in the default display