Improve rendering mechanism