Small tweaks of the UI