UI and functionality tweaks