Consolidate views into a single view (new)
Consolidate controllers