Render refactor (with couple of fixes)

:+1: