Make Groups panel consistent with others