Merging my toolbar stuff