Copy and refactor

indicator-view