Render refactor (with couple of fixes)

yes, it could be removed