diff --git a/src/Controller/ItemPricingController.php b/src/Controller/ItemPricingController.php
index ac093e82..f5e2a532 100644
--- a/src/Controller/ItemPricingController.php
+++ b/src/Controller/ItemPricingController.php
@@ -20,6 +20,7 @@ use App\Entity\PriceTier;
 use App\Entity\Battery;
 use App\Entity\ServiceOffering;
 use App\Entity\ItemType;
+use App\Entity\ItemPrice;
 
 class ItemPricingController extends Controller
 {
@@ -39,12 +40,16 @@ class ItemPricingController extends Controller
         // load only batteries upon initial loading
         $items = $this->getBatteries($em);
 
+        // set the default item type to battery
+        $default_it = $em->getRepository(ItemType::class)->findOneBy(['code' => 'battery']);
+
         $params = [
             'sets' => [
                 'price_tiers' => $price_tiers,
                 'item_types' => $item_types,
             ],
             'items' => $items,
+            'default_item_type_id' => $default_it->getID(),
         ];
 
         return $this->render('item-pricing/form.html.twig', $params);
@@ -97,7 +102,7 @@ class ItemPricingController extends Controller
             // get the price tier
             $price_tier = $em->getRepository(PriceTier::class)->find($pt_id);
 
-            $item_prices = $price_tier->getItems();
+            $item_prices = $price_tier->getItemPrices();
 
             // clear the tier's item prices
             foreach ($item_prices as $ip)
@@ -118,7 +123,7 @@ class ItemPricingController extends Controller
 
                 if (isset($prices[$item_id]))
                 {
-                    $item_price->setPrice($price[$item_id] * 100);
+                    $item_price->setPrice($prices[$item_id] * 100);
                 }
                 else
                 {
@@ -153,10 +158,11 @@ class ItemPricingController extends Controller
 
             // get the items under the price tier
             $pt_items = $pt->getItemPrices();
+
             foreach ($pt_items as $pt_item)
             {
                 // make item price hash
-                $pt_prices[$pt_item->getID()] = $pt_item->getPrice();
+                $pt_prices[$pt_item->getItemID()] = $pt_item->getPrice();
             }
         }
 
@@ -192,10 +198,10 @@ class ItemPricingController extends Controller
             // check if tier has price for item
             if (isset($pt_prices[$item_id]))
             {
-                $price = $pt_prices[$item_id];
+                $pt_price = $pt_prices[$item_id];
 
                 // actual price
-                $actual_price = number_format($price / 100, 2, '.', '');
+                $price = number_format($pt_price / 100, 2, '.', '');
             }
 
             $actual_price = $price;
diff --git a/src/Entity/ItemPrice.php b/src/Entity/ItemPrice.php
index 143833ee..48130468 100644
--- a/src/Entity/ItemPrice.php
+++ b/src/Entity/ItemPrice.php
@@ -6,7 +6,7 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
- * @ORM\Table(name="item")
+ * @ORM\Table(name="item_price")
  */
 
 class ItemPrice
diff --git a/templates/item-pricing/form.html.twig b/templates/item-pricing/form.html.twig
index 0afd23e3..4572a46a 100644
--- a/templates/item-pricing/form.html.twig
+++ b/templates/item-pricing/form.html.twig
@@ -51,7 +51,7 @@
                     </div>
                     <form id="row-form" class="m-form m-form--fit m-form--label-align-right" method="post" action="{{ url('item_pricing_update') }}">
                         <input id="price-tier-id" type="hidden" name="price_tier_id" value="0">
-                        <input id="item-type-id" type="hidden" name="item_type_id" value="0">
+                        <input id="item-type-id" type="hidden" name="item_type_id" value="{{ default_item_type_id }}">
                         <div style="padding-left: 25px; padding-right: 25px;">
                             <table class="table">
                                 <thead>
@@ -118,6 +118,7 @@ function init_item_type_dropdown() {
 }
 
 function load_prices(price_tier_id, item_type_id) {
+    console.log('loading prices');
     var req = new XMLHttpRequest();
     req.onreadystatechange = function() {
         // process response