Added some tool tips