Version with tooltip and improvements on style