Clean up work and solved the rendering issue with Backbone