Improve window rendering