Changes to stop button and color v2
Merge remote-tracking branch 'origin/master'