Fixed graphical issues