Fixed some grafics bugs