improve watcher-view and list-view