refactor toolbar continues