Fix markup to match previous design