diff --git a/templates/ProductCategories/select.php b/templates/ProductCategories/select.php
index 4b02952..7caf27c 100644
--- a/templates/ProductCategories/select.php
+++ b/templates/ProductCategories/select.php
@@ -7,7 +7,7 @@
 $this->setLayout('ajax');
 
 ?>
-    <option value="">Select a parent (optional)</option>
+    <option value="">Select a <?= strpos($this->getRequest()->referer(), 'products/add') ? 'Category ' : 'parent '; ?>(optional)</option>
 <?php foreach ($productCategories as $productCategoryId => $productCategoryName): ?>
     <option value="<?= $productCategoryId; ?>" <?= $this->request->getQuery('category_id') == $productCategoryId ? 'selected="selected"' : ''; ?>><?= $productCategoryName; ?></option>
 <?php endforeach; ?>
\ No newline at end of file
diff --git a/templates/ProductCategoryAttributes/form.php b/templates/ProductCategoryAttributes/form.php
new file mode 100644
index 0000000..fbe2921
--- /dev/null
+++ b/templates/ProductCategoryAttributes/form.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @var \App\View\AppView $this
+ * @var \Cake\Datasource\EntityInterface $productCategoryAttribute
+ */
+?>
+<div class="row">
+    <aside class="column">
+        <div class="side-nav">
+            <h4 class="heading"><?= __('Actions') ?></h4>
+            <?= $this->Html->link(__('Edit Product Category Attribute'), ['action' => 'edit', $productCategoryAttribute->id], ['class' => 'side-nav-item']) ?>
+            <?= $this->Form->postLink(__('Delete Product Category Attribute'), ['action' => 'delete', $productCategoryAttribute->id], ['confirm' => __('Are you sure you want to delete # {0}?', $productCategoryAttribute->id), 'class' => 'side-nav-item']) ?>
+            <?= $this->Html->link(__('List Product Category Attributes'), ['action' => 'index'], ['class' => 'side-nav-item']) ?>
+            <?= $this->Html->link(__('New Product Category Attribute'), ['action' => 'add'], ['class' => 'side-nav-item']) ?>
+        </div>
+    </aside>
+    <div class="column column-80">
+        <div class="productCategoryAttributes view content">
+            <h3><?= h($productCategoryAttribute->name) ?></h3>
+            <table>
+                <tr>
+                    <th><?= __('Name') ?></th>
+                    <td><?= h($productCategoryAttribute->name) ?></td>
+                </tr>
+                <tr>
+                    <th><?= __('Product Category') ?></th>
+                    <td><?= $productCategoryAttribute->hasValue('product_category') ? $this->Html->link($productCategoryAttribute->product_category->name, ['controller' => 'ProductCategories', 'action' => 'view', $productCategoryAttribute->product_category->id]) : '' ?></td>
+                </tr>
+                <tr>
+                    <th><?= __('Enabled') ?></th>
+                    <td><?= $productCategoryAttribute->enabled ? __('Yes') : __('No'); ?></td>
+                </tr>
+            </table>
+            <div class="related">
+                <h4><?= __('Related Product Category Attribute Options') ?></h4>
+                <?php if (!empty($productCategoryAttribute->product_category_attribute_options)) : ?>
+                <div class="table-responsive">
+                    <table>
+                        <tr>
+                            <th><?= __('Attribute Value') ?></th>
+                            <th><?= __('Attribute Label') ?></th>
+                            <th><?= __('Enabled') ?></th>
+                            <th class="actions"><?= __('Actions') ?></th>
+                        </tr>
+                        <?php foreach ($productCategoryAttribute->product_category_attribute_options as $productCategoryAttributeOptions) : ?>
+                        <tr>
+                            <td><?= h($productCategoryAttributeOptions->attribute_value) ?></td>
+                            <td><?= h($productCategoryAttributeOptions->attribute_label) ?></td>
+                            <td><?= h($productCategoryAttributeOptions->enabled) ?></td>
+                            <td class="actions">
+                                <?= $this->Html->link(__('View'), ['controller' => 'ProductCategoryAttributeOptions', 'action' => 'view', $productCategoryAttributeOptions->id]) ?>
+                                <?= $this->Html->link(__('Edit'), ['controller' => 'ProductCategoryAttributeOptions', 'action' => 'edit', $productCategoryAttributeOptions->id]) ?>
+                                <?= $this->Form->postLink(__('Delete'), ['controller' => 'ProductCategoryAttributeOptions', 'action' => 'delete', $productCategoryAttributeOptions->id], ['confirm' => __('Are you sure you want to delete # {0}?', $productCategoryAttributeOptions->id)]) ?>
+                            </td>
+                        </tr>
+                        <?php endforeach; ?>
+                    </table>
+                </div>
+                <?php endif; ?>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/templates/element/Products/form.php b/templates/element/Products/form.php
index fefd293..815c31a 100644
--- a/templates/element/Products/form.php
+++ b/templates/element/Products/form.php
@@ -12,8 +12,9 @@
 <?php
 echo $this->Form->control('name');
 echo $this->Form->control('product_catalog_id', [
+        'empty' => 'Select a Catalog',
     'options' => $productCatalogs,
-    'hx-trigger' => 'change, load delay:1s',
+    'hx-trigger' => 'change, load delay:500ms',
     'hx-get' => $this->Url->build([
         'controller' => 'ProductCategories',
         'action' => 'select',
@@ -22,9 +23,16 @@ echo $this->Form->control('product_catalog_id', [
     'hx-target' => '#product_category_id',
 ]);
 echo $this->Form->control('product_category_id', [
-    'options' => $productCategories ?? [],
+    'options' => [],
     'empty' => true,
     'id' => 'product_category_id',
+    'hx-trigger' => 'change, load delay:1s',
+    'hx-get' => $this->Url->build([
+        'controller' => 'ProductCategoryAttributes',
+        'action' => 'form',
+        0 => $productCategory ? $productCategory->product_catalog_id : '',
+    ]),
+    'hx-target' => '#product-attributes-container',
 ]);
 echo $this->Form->control('product_type_id');
 ?>