Even some more HTML cleanups #2