Final tweaks to UI