Improved watch view
Merge pull request #131 from squix78/DevBranch

Improved watch view