Correct display bugs