Updated list with better tooltips