Refactor to use ng routing