Fixed some graphical issues