Fixed Some Graphic issues