Merge shortcode branch...
Pull changes from focus plugin.
Unpin the toolbar at 100px form the bottom.
Hack to resize the toolbars when changing the page layout.