Listing model and page tweaks