Merge. Improving home layout change.