Some HTML bugfixes