Fix group selection spinner, refactor