Handle cases to auto add new group from 1 to 11 disks

While I'm here fix it to add the group in the first row, if empty.