Fix layout class handling