working
Merge branch 'remove-router-and-do-all-the-view-switching-with-hide-and-show-templates--O'