diff --git a/e107_plugins/page/css/page.navigation.css b/e107_plugins/page/css/page.navigation.css
new file mode 100644
index 000000000..8063b5a6e
--- /dev/null
+++ b/e107_plugins/page/css/page.navigation.css
@@ -0,0 +1,45 @@
+
+/********************/
+/* EXPANDABLE LIST  */
+/********************/
+
+ul.page-nav {
+	margin-left:5px;
+}
+
+ul.page-nav  p {
+   
+    display:block;
+}
+
+ul.page-nav  li {
+    line-height:150%;
+	cursor: pointer;
+    background-position: 1px 6px;
+    background-repeat: no-repeat;
+}
+
+/* Collapsed state for list element */
+ul.page-nav .collapsed {
+	list-style: none;
+	padding-left: 15px;
+	 text-indent:0px;
+	margin:0;
+	margin-left:5px;
+    background-image: url(../img/collapsed.png);
+}
+/* Expanded state for list element
+/* NOTE: This class must be located UNDER the collapsed one */
+ul.page-nav .expanded {
+	list-style: none;
+	padding-left: 15px;
+	text-indent:0px;
+	margin:0;
+	margin-left:5px;
+    background-image: url(../img/expanded.png);
+}
+
+ul.page-nav {
+    clear: both;
+}
+
diff --git a/e107_plugins/page/img/collapsed.png b/e107_plugins/page/img/collapsed.png
new file mode 100644
index 000000000..8f2d0efa4
Binary files /dev/null and b/e107_plugins/page/img/collapsed.png differ
diff --git a/e107_plugins/page/img/expanded.png b/e107_plugins/page/img/expanded.png
new file mode 100644
index 000000000..c5fb718e5
Binary files /dev/null and b/e107_plugins/page/img/expanded.png differ
diff --git a/e107_plugins/page/js/jquery.page.navigation.js b/e107_plugins/page/js/jquery.page.navigation.js
new file mode 100644
index 000000000..a9527e327
--- /dev/null
+++ b/e107_plugins/page/js/jquery.page.navigation.js
@@ -0,0 +1,47 @@
+/**************************************************************/
+/* Prepares the cv to be dynamically expandable/collapsible   */
+/**************************************************************/
+function pageNavList() {
+	
+	$('ul.page-nav').find('li:has(ul)').attr('title', 'Expand/Collapse');;
+	
+    $('ul.page-nav').find('li:has(ul)')
+    .click( function(event) {
+  
+        if (this == event.target) {
+            $(this).toggleClass('expanded');
+            $(this).children('ul').toggle('medium');
+         
+        }
+        return false;
+    })
+    .addClass('collapsed')
+    .children('ul').hide();
+
+    //Create the button funtionality
+    $('#page-nav-expand')
+    .unbind('click')
+    .click( function() {
+        $('.collapsed').addClass('expanded');
+        $('.collapsed').children().show('medium');
+        
+    });
+    
+    //FIXME - Collapses too many items, it should leave the primary <li> items visible. 
+    $('#page-nav-collapse')
+    .unbind('click')
+    .click( function() {
+        $('.collapsed').removeClass('expanded');
+        $('.collapsed').children().hide('medium');
+    });
+    
+};
+
+
+/**************************************************************/
+/* Functions to execute on loading the document               */
+/**************************************************************/
+$(document).ready( function() 
+{
+    pageNavList();
+});
\ No newline at end of file
diff --git a/e107_plugins/page/page_navigation_menu.php b/e107_plugins/page/page_navigation_menu.php
index 0c81fedc5..29557c3f3 100644
--- a/e107_plugins/page/page_navigation_menu.php
+++ b/e107_plugins/page/page_navigation_menu.php
@@ -11,6 +11,8 @@
 if (!defined('e107_INIT')) { exit; }
 
 
+
+
 //FIXME XXX - This menu should call the {PAGE_NAVIGATION} shortcode instead of duplicating its code and automatically display all links.  
 
 $parm = eHelper::scParams($parm);
@@ -40,6 +42,8 @@ if($request && is_array($request))
 	}
 }
 
+$expandable = vartrue($parm['expandable']);
+
 if($parm) $parm = http_build_query($parm, null, '&');
 else $parm = '';
 
@@ -56,6 +60,18 @@ if(isset($data['title']) && !vartrue($template['noAutoTitle']))
 if(empty($data)) return;
 $text = e107::getNav()->render($data, $template) ;
 
+/**
+ * Expandable menu support. 
+ * @see jquery.page.navigation.js . activate with expandable=1 in the page-navigation menu. 
+ * For best results include: e107::css('page', 'css/page.navigation.css', 'jquery'); in theme.php 
+ */
+if($expandable) 
+{
+	e107::js('page','js/jquery.page.navigation.js','jquery');
+	$template['caption'] .= "<span class='btn-group pull-right'><a class='btn btn-mini' id='page-nav-expand'>+</a><a class='btn btn-mini' id='page-nav-collapse'>-</a></span>";
+}
+
+
 ### Render
 e107::getRender()->tablerender($template['caption'], $text, 'page-navigation-menu');
 
diff --git a/e107_themes/bootstrap/theme.php b/e107_themes/bootstrap/theme.php
index a73e140fb..8c80de200 100644
--- a/e107_themes/bootstrap/theme.php
+++ b/e107_themes/bootstrap/theme.php
@@ -47,6 +47,7 @@ e107::css('url', "//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.
 
 e107::css('theme', 'js/google-code-prettify/prettify.css');
 e107::js('theme', "js/google-code-prettify/prettify.js");
+e107::css('page', 'css/page.navigation.css', 'jquery');