sync layout change with latest