Change markup structure a bit.