Next layout improvements.