Improve layout