Modify router and view initialize
Merge pull request #18 from MSchip/feature-branch

Modify router and view initialize