Rework some HTML