Issue #5 - Transfering layout updates from issue 9