diff --git a/modules/product/src/Form/ProductVariationTypeForm.php b/modules/product/src/Form/ProductVariationTypeForm.php
index b6d952f..b14f096 100644
--- a/modules/product/src/Form/ProductVariationTypeForm.php
+++ b/modules/product/src/Form/ProductVariationTypeForm.php
@@ -103,8 +103,7 @@ class ProductVariationTypeForm extends CommerceBundleEntityFormBase {
     $attributes = $this->entityTypeManager->getStorage('commerce_product_attribute')->loadMultiple();
     $attribute_options = array_map(function ($attribute) {
       /** @var \Drupal\commerce_product\Entity\ProductAttributeInterface $attribute */
-      return $attribute->label();
-    }, $attributes);
+      return $this->t('%label => <a href=":href" target="_blank">@id</a>', ['%label' => $attribute->label(), ':href' => $attribute->url(), '@id' => $attribute->id()]);
 
     $form['original_attributes'] = [
       '#type' => 'value',
diff --git a/modules/product/src/ProductAttributeListBuilder.php b/modules/product/src/ProductAttributeListBuilder.php
index 327afa3..cd9080f 100644
--- a/modules/product/src/ProductAttributeListBuilder.php
+++ b/modules/product/src/ProductAttributeListBuilder.php
@@ -4,6 +4,7 @@ namespace Drupal\commerce_product;
 
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Render\Markup;
 
 /**
  * Defines the list builder for product attributes.
@@ -14,7 +15,8 @@ class ProductAttributeListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function buildHeader() {
-    $header['label'] = $this->t('Attribute name');
+    $header['label_id'] = $this->t('Attribute name => ID');
+    $header['values'] = $this->t('Values');
     return $header + parent::buildHeader();
   }
 
@@ -22,7 +24,25 @@ class ProductAttributeListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    $row['label'] = $entity->label();
+    $values = [];
+    $i = 0;
+    foreach ($entity->getValues() as $attribute_value) {
+      if ($i < 100) {
+        $value = $attribute_value->getName();
+        $values[] = strlen($value) > 10 ? substr_replace($value, '...', 7) : $value;
+      }
+      $i++;
+    }
+    if (($count = count($values)) && $i > $count) {
+      $more = Markup::create('<strong> (' . ($i - $count) . ' ' . $this->t('more values') . ' ...)</strong>');
+      $values = $this->t('@values @more', ['@values' => implode(', ', $values), '@more' => $more]);
+    }
+    else {
+      $values = implode(', ', $values);
+    }
+    $row['label_id'] = Markup::create('<em>' . $entity->label() . ' </em><br />=> ' . $entity->id());
+    $row['values'] = $values;
+
     return $row + parent::buildRow($entity);
   }