cleaning up watcher, and added dashboard page