Merchant UI changes fixes
Merchant UI changes fixes