Merge branch 'gh-pages'
Merge branch 'gh-pages'
Layout Improvements

Improved Layout
Switched On<>Off
Switched Hue and Button Controls
Merge branch 'master' into gh-pages