Minor improvements to UX