Some slight adjustments + extra tooltip