Render refactor (with couple of fixes)

```Reversed``` here as well