Added tool tip and fixed updating data function