Added UI to change aggregation_type
Merge branch 'feature/ui'