Render refactor (with couple of fixes)

Minor issue.