Render refactor (with couple of fixes)

Flx?