Improved item layout