* Refactoring AdvancedLayout