refactor toolbar methods