Updates to view pages and some changes to parsing scripts
Changes to views and parsing