Fix markup better