Fix graphic issues