Adding tooltips and few cosmic changes