Layout changes part3.