Some fixes and drawing the title