Fix markup to render correctly