code clean and UI update for merchant details