Fixed minor display bugs