Some usability changes after feedback from taw: