I9: Fixed small button clss
I9: Unfinished fix: Add group