Major revision to listings model, minor UI updates