Further improvements to website renderer