Improve groups page structure