Some changes

* Removed some legacy code
* Added ajax-spinner on watch page