A lot of fixes and added group page