Display order fix