updated structure of views and rendering