Added option buttons to aggregate buttons