Minor changes: deleting unnecessary adds
Minor changes: templating new views
Minor changes: renaming old views for reference