improved html rendering quite a lot