Messy toolbar code added