Small user experience changes

User experience improvement.