I thought the modern view of natural selection is that it occurs at multiple levels - gene, individual organism, group selection, etc.
The question of population-level selection (what you've called group selection) is more contentious, although it shouldn't be. The grandpa of our field, E.O. Wilson, whom we all adore and wish we could constantly hug, loves the idea. Sadly, evidence doesn't love it. Like, there's basically none. There's no real theoretical underpinnings that would make it possible, either, because there's just too much gene flow between demes (...partially isolated breeding populations) to allow selection to happen.