Improve layout of items