diff --git a/Model/Model.class.php b/Model/Model.class.php
index e1daac2..47ee154 100644
--- a/Model/Model.class.php
+++ b/Model/Model.class.php
@@ -437,7 +437,8 @@ public function getOneResult($key, $val) {
 										$nc = new Model($table);
 										$this->$table = $nc;
 									}
-									$this->$table->$matches[2] = $val;
+									$tc = $matches[2];
+									$this->$table->$tc = $val;
 								}
 							}
 						}
diff --git a/admin/Template.class.php b/admin/Template.class.php
index 2c3e663..034b80b 100644
--- a/admin/Template.class.php
+++ b/admin/Template.class.php
@@ -72,13 +72,19 @@ public function loadTemplate() {
 		}
 		if(property_exists($this->page, 'css') && count($this->page->css)) {
 			$replacement = '';
-			foreach($this->page->css AS $script) $replacement .= '		<link rel="stylesheet" href="' . $adminFolder . $script . '" />' . PHP_EOL;
+			foreach($this->page->css AS $script) {
+				$scriptFolder = (strpos($script, 'Module/') !== 0)?$adminFolder:_FOLDER_URL_;
+				$replacement .= '		<link rel="stylesheet" href="' . $scriptFolder . $script . '" />' . PHP_EOL;
+			}
 			$pos = strripos($this->template, "\t</body>");
 			$this->template = substr_replace($this->template, $replacement, $pos, 0);
 		}
 		if(property_exists($this->page, 'js') && count($this->page->js)) {
 			$replacement = '';
-			foreach($this->page->js AS $script) $replacement .= '		<script src="' . $adminFolder . $script . '"></script>' . PHP_EOL;
+			foreach($this->page->js AS $script) {
+				$scriptFolder = (strpos($script, 'Module/') !== 0)?$adminFolder:_FOLDER_URL_;
+				$replacement .= '		<script src="' . $scriptFolder . $script . '"></script>' . PHP_EOL;
+			}
 			$pos = strripos($this->template, "\t</body>");
 			$this->template = substr_replace($this->template, $replacement, $pos, 0);
 		}