minor cleanup
Change from individual html into routing
Merge branch 'angular'