Revert "Cleaned up HTML a bit more"

This reverts commit a9dee8caf444cca9623337e8d165cf6bfe151025.
Revert "Revert "Cleaned up HTML a bit more""

This reverts commit f556266c80bfdabfab49febc120c70ef50f040f5.