2 Usability improvements (Updated)