Cleaning up the layout, optimizing code for the on/off button.
Merge pull request #377 from tamcap/master

Cleaning up the layout, optimizing code for the on/off button.