Reorganized order of markup