18_Part11 Modification1

Switching of buttons.
Merge branch 'Tutorial-Parts'