Fix tooltip and add different supplier sections