Additional usability improvements