Pimping watch view
Merge pull request #173 from squix78/DevBranch

Pimping watch view