Render refactor (with couple of fixes)

i don't like it