Change: update methods to use DI array notion
Add/change: merge subNav and mainNav factories into single file
Change: better subnav
New controllers and some new page factories