Refactors router and views
Merge branch 'dev'