Toolbar moved out of edit state to its own class.