Minor UI changes
Prepare to getting group metrics