Layout with a tray layer, refactoring.