Issue #223 layout modification