Fixes toolbar bug, adds selector support for element.