Toolbox: Small usability changes