fix the displaying issues