Switching over search and toolbar buttons to use angular