Class name changes and ends

- Added in id ends
- Changed class names for groups