diff --git a/classes/Display/Smarty.php b/classes/Display/Smarty.php
index 6641fd8..b72448e 100644
--- a/classes/Display/Smarty.php
+++ b/classes/Display/Smarty.php
@@ -95,9 +95,10 @@ class Display_Smarty extends Display_Common {
 
 		if (!file_exists($template)) {
 			$shared_template = PICKLES_PATH . 'common/templates/' . ($this->shared_module_filename == false ? $this->module_filename : $this->shared_module_filename) . '.tpl';
-			
+			// $shared_template = PICKLES_PATH . 'common/templates/' . ($this->shared_filname == false ? $this->module_filename : $this->shared_filename) . '.tpl';
+
 			// @todo SUPER HACKINSHIT
-			if ($this->module_filename == 'store/admin') {
+			if (strstr($this->module_filename, 'store/admin')) {
 				$shared_template = PICKLES_PATH . 'common/templates/store/admin.tpl';
 			}
 
diff --git a/common/templates/store/admin/discounts/edit.tpl b/common/templates/store/admin/discounts/edit.tpl
index d00d787..be88f48 100644
--- a/common/templates/store/admin/discounts/edit.tpl
+++ b/common/templates/store/admin/discounts/edit.tpl
@@ -95,6 +95,9 @@
 				to
 				{html_select_date prefix='valid_to_'}
 			</dd>
+			<dt>
+				
+			</dt>
 		</dl>
 	</div>
 	<br style="clear: left" />
diff --git a/common/templates/store/admin/home.tpl b/common/templates/store/admin/home.tpl
index c6ba455..269b83d 100644
--- a/common/templates/store/admin/home.tpl
+++ b/common/templates/store/admin/home.tpl
@@ -11,13 +11,13 @@
 	<img src="/static/contrib/silk/icons/package.png" style="float: left; padding-right: 10px" />
 	<ol style="float: left">
 		<li><h3><a href="/store/admin/orders">Orders</a></h3></li>
-		<li>&nbsp; <a href="/store/admin/orders/pending">Pending</a></li>
-		<li>&nbsp; <a href="/store/admin/orders/approved">Approved</a></li>
-		<li>&nbsp; <a href="/store/admin/orders/partially-shipped">Partially Shipped</a></li>
-		<li>&nbsp; <a href="/store/admin/orders/shipped/completed">Shipped/Completed</a></li>
-		<li>&nbsp; <a href="/store/admin/orders/backorder">Backorder</a></li>
-		<li>&nbsp; <a href="/store/admin/orders/declined">Declined</a></li>
-		<li>&nbsp; <a href="/store/admin/orders/void">Void</a></li>
+		<li>&nbsp; <a href="/store/admin/orders/filter/pending">Pending</a></li>
+		<li>&nbsp; <a href="/store/admin/orders/filter/approved">Approved</a></li>
+		<li>&nbsp; <a href="/store/admin/orders/filter/partially-shipped">Partially Shipped</a></li>
+		<li>&nbsp; <a href="/store/admin/orders/filter/shipped/completed">Shipped/Completed</a></li>
+		<li>&nbsp; <a href="/store/admin/orders/filter/backorder">Backorder</a></li>
+		<li>&nbsp; <a href="/store/admin/orders/filter/declined">Declined</a></li>
+		<li>&nbsp; <a href="/store/admin/orders/filter/void">Void</a></li>
 	</ol>
 </div>
 <div style="float: left">