More UI tweaks and sorting