fixed routing error and angular upgrade