Sorting and re-design UI