Added labels to the watch toggle, more swiping work