UI tweaks, finishing touches, error handling