Fixed some minor display bugs