More usability changes.