fixed draw and display