Aesthetic tweaks and improved selection behavior after replacing typo