Fixed the grouping on overview page and added tooltip