Toolbar input, code optimised