Small tweaks to the UI