Fixed several display bugs