Added item renderers and cleaned up a bit