Fix display issues