Fixed some display errors