Made changes to xml and edited tool tips

Made changes to xml and edited tool tips