Fixed linting errors
Merge branch 'master' of https://github.com/jbroquist/ui-layout