Fixed some issues with the display