Improve rendering