#41 Added tool tips