#26 Usability improvements