Merge pull request #15 from daveology/layout1

Slider issues, hopefully corrected.
Merge pull request #16 from daveology/master

Merge pull request #15 from daveology/layout1