Merchants page, lots of rendering changes