UX improvement, small bug fixes.