UI changes and functionality tweaks