LPS-29762

Made some changes, please re-test on the main browsers. Thanks.