Fixed some display issues