Fixed some display bugs (again)