SONAR-4927 Merge new QG widget with old one, update layout