more toolbar stuff, added preference