Render refactor (with couple of fixes)

+1 for Flx, I don't like the prefix, but I like consistency more.