Fixes: #2731 Adding back sortableListing, fixing tabs