Improved the items layout