Various functionality & UX tweaks.