Refactoring, layout subscription