Toolbar input improved (closes #34).