Bug fix of Change Layout keyword