Improve layout section.