Graphic fixes and changes