Add a watch item button to view page (much refactoring needed.)
Cleanup