Render refactor (with couple of fixes)

How about using an enum then?