Better Layout Management
Fix um alten Layoutpicker zu restoren