Improved the layout of entries.