Graphic fixes after client revision