Render refactor (with couple of fixes)

Shouldn't this be `fromRectangle()`?