Markup restructure