Item display tweaks and potential fix for potential duplication issue.