UI an usability improvements.