cleaned up css a little
fixed merge conflicts
Merge pull request #26 from inoda/show-group-page

cleaned up css a little