Simplified and enhanced the listing UI