First version of group management and improved styling