Updated the demo markup and some grid settings
Merge remote-tracking branch 'origin/elements' into gh-pages