Refactor toolbar into separate class