added mode toggling
Merge remote-tracking branch 'origin/master'
updated mode toggle and added labels
Merge remote-tracking branch 'origin/master'
merged up