Bug fixing display issues