Improved UI behavior.