WPBQA-283: add margin for border.