More styling
Changed to includ id in groups
Fixed the first draft of new table