Sorting only selected items if any, some UI fixes