Even more fixes to rendering
Even more work on the site