Toolbar: Heeding review comments