add more angular/ refactor routing