Added sorted display and make the list modelling better