user groups ui done
merged dist conflicts