Fix markup again