improved layout passthrough