HTML formatting and bugfixing