Ironed out some display issues