UI and error handling tweaks