new uri modal in angular, with overall refactoring and fixes in the
codebase