Improve layout consistency