First round of changes after usability test.