Render refactor (with couple of fixes)

Good inline :+1: