Fixed some display problems