Refactor of Router/Main App View