Bug fixes and UX tweaks