Complete user groups, use cases and make some formatting changes