Cleanup and overhaul
Drop multi method approach in rendering an item

Due to problems with rerendering the right method on state change.