diff --git a/.gitignore b/.gitignore
index c75dc7c..4cf8dd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-logs/*
+logs/*
\ No newline at end of file
diff --git a/demos/storage.html b/demos/storage.html
index 4758e54..1979a74 100644
--- a/demos/storage.html
+++ b/demos/storage.html
@@ -31,6 +31,11 @@
 </article>
 <script>
 
+function getVals(){
+  getStorage('session');
+  getStorage('local');
+}
+
 function getStorage(type) {
   var storage = window[type + 'Storage'],
     delta = 0,
@@ -49,17 +54,23 @@
   document.querySelector('#previous').appendChild(li);
 }
 
-getStorage('session');
-getStorage('local');
+function updateList(){
+  document.querySelector('#previous').innerHTML = '';
+  getVals();
+}
+
+getVals();
 
 addEvent(document.querySelector('#session'), 'keyup', function () {
   sessionStorage.setItem('value', this.value);
   sessionStorage.setItem('timestamp', (new Date()).getTime());
+  updateList();
 });
 
 addEvent(document.querySelector('#local'), 'keyup', function () {
   localStorage.setItem('value', this.value);
   localStorage.setItem('timestamp', (new Date()).getTime());
+  updateList();
 });
 
 addEvent(document.querySelector('#clear'), 'click', function () {
diff --git a/page.php b/page.php
index 56650f8..788e64b 100644
--- a/page.php
+++ b/page.php
@@ -1,22 +1,32 @@
 <?php
-$request = preg_replace('/[^0-9a-z-_]/', '', preg_replace('/^\//', '', preg_replace('/\/$/', '', preg_replace('/\?.*$/', '', $_SERVER['REQUEST_URI']))));
-if (file_exists('demos/' . $request . '.html')) {
-  $file = file_get_contents('demos/' . $request . '.html');
-  preg_match('/<title>(.*)<\/title>/', $file, $matches);
-  $file = preg_replace('/<title>(.*?)<\/title>/', '', $file);
-  $title = $matches[1];
+// $request = preg_replace('/[^0-9a-z-_]/', '', preg_replace('/^\//', '', preg_replace('/\/$/', '', preg_replace('/\?.*$/', '', $_SERVER['REQUEST_URI']))));
 
-  $manifest = '';
-  if ($request == 'offlineapp') { // specific change to support <html manifest=xyz>
-    $manifest = ' manifest="html5demo.appcache"';
+// Above method caused issues when repo is in a subfolder.
+// Replaced with "end" function below.
+// Added simple if-else
+
+if($request= end((explode('/', $_SERVER['REQUEST_URI']))))
+{
+  if (file_exists('demos/' . $request . '.html')) {
+    $file = file_get_contents('demos/' . $request . '.html');
+    preg_match('/<title>(.*)<\/title>/', $file, $matches);
+    $file = preg_replace('/<title>(.*?)<\/title>/', '', $file);
+    $title = $matches[1];
+
+    $manifest = '';
+    if ($request == 'offlineapp') { // specific change to support <html manifest=xyz>
+      $manifest = ' manifest="html5demo.appcache"';
+    }
+    
+    include('includes/header.php');
+    echo $file;
+    include('includes/footer.php');
+  } else {
+    header("HTTP/1.0 404 Not Found");
+    echo 'File not found';
   }
-  
-  include('includes/header.php');
-  echo $file;
-  include('includes/footer.php');
 } else {
-  header("HTTP/1.0 404 Not Found");
-  echo 'File not found';
+  echo "Invalid Request";
 }
 
 ?>
