Improves Listing Markup and Conditional Check for Display