Add group selection spinner
Fix group selection spinner, refactor