Fixing display issues