Fixed more display issues