Enhancement: forgot about the watch lines
Enhancement: put the button in a group
Enhancement: Removed debug line