More UI tweaks based on user feedback