Render refactor (with couple of fixes)

Why is this necessary?