WPBQA-409: switch menu sooner and add side margins.