Render refactor acomplished