Updated for changes to layout_plugin in issue #2326589 (untested).
Merge pull request #20 from dsnopek/refactor-to-layout-plugin

Updated for changes to layout_plugin in issue #2326589 (untested).