Some fixes and start on the display renderer