Made some usability changes