Adding tooltip and some other changes