Simplified dispatching, refactoring home enter views, error controller and router
resolve merge conflict