Restructured the views quite a bit