Tweak UI and fix sorting bug