Refactoring

* Better naming

* render_item now handles either type of item