fixing the display issues here