Render refactor (with couple of fixes)

Should be `Reversed` here as well.