Improve the view watching options. Now can control more