Usability improvements suggested by Marcos