add groups, change menu code