Improve display()
New improvements of the watcher system