Restructured the views