Changes views to general views. Some fixes for rendering