Better integration into group layout