Improved UI and sorted listing