Improved html rendering for 1-...