Fixed green marker where & moved display order