manage group layout
Merge origin/master