refactor for new topology view
14 files changed