improve layout