Fix bottom margin for layer control
Merge branch 'master' into gh-pages