Improve "layout".