Fixing graphical issues