diff --git a/geonode/static/geonode/css/base.css b/geonode/static/geonode/css/base.css
diff --git a/geonode/static/lib/img/geonode_icon.png → geonode/static/geonode/img/geonode_icon.png b/geonode/static/lib/img/geonode_icon.png → geonode/static/geonode/img/geonode_icon.png
diff --git a/geonode/static/geonode/js/search/search.js b/geonode/static/geonode/js/search/search.js
@@ -55,7 +55,7 @@
   module.load_group_categories = function ($http, $rootScope, $location){
         var params = typeof FILTER_TYPE == 'undefined' ? {} : {'type': FILTER_TYPE};
         $http.get(GROUP_CATEGORIES_ENDPOINT, {params: params}).then(successCallback, errorCallback);
-        
+
         function successCallback(data) {
           //success code
           $rootScope.groupCategories = data.data.objects;
@@ -75,7 +75,7 @@
           params['title__icontains'] = $location.search()['title__icontains'];
         }
         $http.get(KEYWORDS_ENDPOINT, {params: params}).then(successCallback, errorCallback);
-        
+
         function successCallback(data) {
           //success code
           debugger;
@@ -94,10 +94,11 @@
         };
     }
 
+
   module.load_h_keywords = function($http, $rootScope, $location){
     var params = typeof FILTER_TYPE == 'undefined' ? {} : {'type': FILTER_TYPE};
     $http.get(H_KEYWORDS_ENDPOINT, {params: params}).then(successCallback, errorCallback);
-        
+
     function successCallback(data) {
       //success code
       $('#treeview').treeview({
@@ -134,7 +135,7 @@
       params['title__icontains'] = $location.search()['title__icontains'];
     }
     $http.get(T_KEYWORDS_ENDPOINT, {params: params}).then(successCallback, errorCallback);
-    
+
     function successCallback(data) {
       //success code
       if($location.search().hasOwnProperty('tkeywords__id__in')){
@@ -158,7 +159,7 @@
       params['title__icontains'] = $location.search()['title__icontains'];
     }
     $http.get(REGIONS_ENDPOINT, {params: params}).then(successCallback, errorCallback);
-    
+
     function successCallback(data) {
         //success code
         if($location.search().hasOwnProperty('regions__name__in')){
@@ -179,7 +180,7 @@
     module.load_groups = function ($http, $rootScope, $location){
       var params = typeof FILTER_TYPE == 'undefined' ? {} : {'type': FILTER_TYPE};
       $http.get(GROUPS_ENDPOINT, {params: params}).then(successCallback, errorCallback);
-      
+
       function successCallback(data) {
         //success code
         $rootScope.groups = data.data.objects;
@@ -199,7 +200,7 @@
           params['title__icontains'] = $location.search()['title__icontains'];
       }
       $http.get(OWNERS_ENDPOINT, {params: params}).then(successCallback, errorCallback);
-      
+
       function successCallback(data) {
         //success code
         if($location.search().hasOwnProperty('owner__username__in')){
@@ -355,7 +356,7 @@
     //Get data from apis and make them available to the page
     function query_api(data){
       $http.get(Configs.url, {params: data || {}}).then(successCallback, errorCallback);
-      
+
       function successCallback(data) {
         //success code
         setTimeout(function(){$('[ng-controller="CartList"] [data-toggle="tooltip"]').tooltip();},0);

diff --git a/geonode/static/geonode/less/base.less b/geonode/static/geonode/less/base.less
@@ -657,6 +657,26 @@ article.tab-pane {
 .controls > textarea {
   width: 320px;
 }
+
+/* treeview component */
+
+.treeview .list-group-item {
+    cursor: pointer;
+    word-break: break-all;
+    padding-left: 0px;
+    padding-left: 35px;
+}
+
+.treeview span.icon {
+    margin-right: 5px;
+    margin-left: -18px;
+}
+
+span.icon.node-icon:before {
+    font-family: FontAwesome;
+    content: "\f07b";
+}
+
 /* Maps
 ----------------------- */
 .map-actions {
@@ -1473,4 +1493,4 @@ form-inline {
 #missing-values {
   color: @red-dark;
   font-style: italic;
-}
+}
diff --git a/geonode/static/geonode/less/bootstrap.less b/geonode/static/geonode/less/bootstrap.less
@@ -6,51 +6,51 @@
 
 // Core variables and mixins
 @import "variables.less";
-@import "bootstrap/mixins.less";
+@import "../../node_modules/bootstrap/less/mixins.less";
 
 // Reset and dependencies
-@import "bootstrap/normalize.less";
-@import "bootstrap/print.less";
-@import "bootstrap/glyphicons.less";
+@import "../../node_modules/bootstrap/less/normalize.less";
+@import "../../node_modules/bootstrap/less/print.less";
+@import "../../node_modules/bootstrap/less/glyphicons.less";
 
 // Core CSS
-@import "bootstrap/scaffolding.less";
-@import "bootstrap/type.less";
-@import "bootstrap/code.less";
-@import "bootstrap/grid.less";
-@import "bootstrap/tables.less";
-@import "bootstrap/forms.less";
-@import "bootstrap/buttons.less";
+@import "../../node_modules/bootstrap/less/scaffolding.less";
+@import "../../node_modules/bootstrap/less/type.less";
+@import "../../node_modules/bootstrap/less/code.less";
+@import "../../node_modules/bootstrap/less/grid.less";
+@import "../../node_modules/bootstrap/less/tables.less";
+@import "../../node_modules/bootstrap/less/forms.less";
+@import "../../node_modules/bootstrap/less/buttons.less";
 
 // Components
-@import "bootstrap/component-animations.less";
-@import "bootstrap/dropdowns.less";
-@import "bootstrap/button-groups.less";
-@import "bootstrap/input-groups.less";
-@import "bootstrap/navs.less";
-@import "bootstrap/navbar.less";
-@import "bootstrap/breadcrumbs.less";
-@import "bootstrap/pagination.less";
-@import "bootstrap/pager.less";
-@import "bootstrap/labels.less";
-@import "bootstrap/badges.less";
-@import "bootstrap/jumbotron.less";
-@import "bootstrap/thumbnails.less";
-@import "bootstrap/alerts.less";
-@import "bootstrap/progress-bars.less";
-@import "bootstrap/media.less";
-@import "bootstrap/list-group.less";
-@import "bootstrap/panels.less";
-@import "bootstrap/responsive-embed.less";
-@import "bootstrap/wells.less";
-@import "bootstrap/close.less";
+@import "../../node_modules/bootstrap/less/component-animations.less";
+@import "../../node_modules/bootstrap/less/dropdowns.less";
+@import "../../node_modules/bootstrap/less/button-groups.less";
+@import "../../node_modules/bootstrap/less/input-groups.less";
+@import "../../node_modules/bootstrap/less/navs.less";
+@import "../../node_modules/bootstrap/less/navbar.less";
+@import "../../node_modules/bootstrap/less/breadcrumbs.less";
+@import "../../node_modules/bootstrap/less/pagination.less";
+@import "../../node_modules/bootstrap/less/pager.less";
+@import "../../node_modules/bootstrap/less/labels.less";
+@import "../../node_modules/bootstrap/less/badges.less";
+@import "../../node_modules/bootstrap/less/jumbotron.less";
+@import "../../node_modules/bootstrap/less/thumbnails.less";
+@import "../../node_modules/bootstrap/less/alerts.less";
+@import "../../node_modules/bootstrap/less/progress-bars.less";
+@import "../../node_modules/bootstrap/less/media.less";
+@import "../../node_modules/bootstrap/less/list-group.less";
+@import "../../node_modules/bootstrap/less/panels.less";
+@import "../../node_modules/bootstrap/less/responsive-embed.less";
+@import "../../node_modules/bootstrap/less/wells.less";
+@import "../../node_modules/bootstrap/less/close.less";
 
 // Components w/ JavaScript
-@import "bootstrap/modals.less";
-@import "bootstrap/tooltip.less";
-@import "bootstrap/popovers.less";
-@import "bootstrap/carousel.less";
+@import "../../node_modules/bootstrap/less/modals.less";
+@import "../../node_modules/bootstrap/less/tooltip.less";
+@import "../../node_modules/bootstrap/less/popovers.less";
+@import "../../node_modules/bootstrap/less/carousel.less";
 
 // Utility classes
-@import "bootstrap/utilities.less";
-@import "bootstrap/responsive-utilities.less";
+@import "../../node_modules/bootstrap/less/utilities.less";
+@import "../../node_modules/bootstrap/less/responsive-utilities.less";
diff --git a/geonode/static/geonode/less/bootstrap/alerts.less b/geonode/static/geonode/less/bootstrap/alerts.less
diff --git a/geonode/static/geonode/less/bootstrap/badges.less b/geonode/static/geonode/less/bootstrap/badges.less
diff --git a/geonode/static/geonode/less/bootstrap/bootstrap.less b/geonode/static/geonode/less/bootstrap/bootstrap.less
diff --git a/geonode/static/geonode/less/bootstrap/breadcrumbs.less b/geonode/static/geonode/less/bootstrap/breadcrumbs.less
diff --git a/geonode/static/geonode/less/bootstrap/button-groups.less b/geonode/static/geonode/less/bootstrap/button-groups.less
diff --git a/geonode/static/geonode/less/bootstrap/buttons.less b/geonode/static/geonode/less/bootstrap/buttons.less
diff --git a/geonode/static/geonode/less/bootstrap/carousel.less b/geonode/static/geonode/less/bootstrap/carousel.less
diff --git a/geonode/static/geonode/less/bootstrap/close.less b/geonode/static/geonode/less/bootstrap/close.less
diff --git a/geonode/static/geonode/less/bootstrap/code.less b/geonode/static/geonode/less/bootstrap/code.less
diff --git a/geonode/static/geonode/less/bootstrap/component-animations.less b/geonode/static/geonode/less/bootstrap/component-animations.less
diff --git a/geonode/static/geonode/less/bootstrap/dropdowns.less b/geonode/static/geonode/less/bootstrap/dropdowns.less
diff --git a/geonode/static/geonode/less/bootstrap/forms.less b/geonode/static/geonode/less/bootstrap/forms.less
diff --git a/geonode/static/geonode/less/bootstrap/glyphicons.less b/geonode/static/geonode/less/bootstrap/glyphicons.less
diff --git a/geonode/static/geonode/less/bootstrap/grid.less b/geonode/static/geonode/less/bootstrap/grid.less
diff --git a/geonode/static/geonode/less/bootstrap/input-groups.less b/geonode/static/geonode/less/bootstrap/input-groups.less
diff --git a/geonode/static/geonode/less/bootstrap/jumbotron.less b/geonode/static/geonode/less/bootstrap/jumbotron.less
diff --git a/geonode/static/geonode/less/bootstrap/labels.less b/geonode/static/geonode/less/bootstrap/labels.less
diff --git a/geonode/static/geonode/less/bootstrap/list-group.less b/geonode/static/geonode/less/bootstrap/list-group.less
diff --git a/geonode/static/geonode/less/bootstrap/media.less b/geonode/static/geonode/less/bootstrap/media.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins.less b/geonode/static/geonode/less/bootstrap/mixins.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/alerts.less b/geonode/static/geonode/less/bootstrap/mixins/alerts.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/background-variant.less b/geonode/static/geonode/less/bootstrap/mixins/background-variant.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/border-radius.less b/geonode/static/geonode/less/bootstrap/mixins/border-radius.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/buttons.less b/geonode/static/geonode/less/bootstrap/mixins/buttons.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/center-block.less b/geonode/static/geonode/less/bootstrap/mixins/center-block.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/clearfix.less b/geonode/static/geonode/less/bootstrap/mixins/clearfix.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/forms.less b/geonode/static/geonode/less/bootstrap/mixins/forms.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/gradients.less b/geonode/static/geonode/less/bootstrap/mixins/gradients.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/grid-framework.less b/geonode/static/geonode/less/bootstrap/mixins/grid-framework.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/grid.less b/geonode/static/geonode/less/bootstrap/mixins/grid.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/hide-text.less b/geonode/static/geonode/less/bootstrap/mixins/hide-text.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/image.less b/geonode/static/geonode/less/bootstrap/mixins/image.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/labels.less b/geonode/static/geonode/less/bootstrap/mixins/labels.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/list-group.less b/geonode/static/geonode/less/bootstrap/mixins/list-group.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/nav-divider.less b/geonode/static/geonode/less/bootstrap/mixins/nav-divider.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/nav-vertical-align.less b/geonode/static/geonode/less/bootstrap/mixins/nav-vertical-align.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/opacity.less b/geonode/static/geonode/less/bootstrap/mixins/opacity.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/pagination.less b/geonode/static/geonode/less/bootstrap/mixins/pagination.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/panels.less b/geonode/static/geonode/less/bootstrap/mixins/panels.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/progress-bar.less b/geonode/static/geonode/less/bootstrap/mixins/progress-bar.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/reset-filter.less b/geonode/static/geonode/less/bootstrap/mixins/reset-filter.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/reset-text.less b/geonode/static/geonode/less/bootstrap/mixins/reset-text.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/resize.less b/geonode/static/geonode/less/bootstrap/mixins/resize.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/responsive-visibility.less b/geonode/static/geonode/less/bootstrap/mixins/responsive-visibility.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/size.less b/geonode/static/geonode/less/bootstrap/mixins/size.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/tab-focus.less b/geonode/static/geonode/less/bootstrap/mixins/tab-focus.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/table-row.less b/geonode/static/geonode/less/bootstrap/mixins/table-row.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/text-emphasis.less b/geonode/static/geonode/less/bootstrap/mixins/text-emphasis.less
diff --git a/geonode/static/geonode/less/bootstrap/mixins/text-overflow.less b/geonode/static/geonode/less/bootstrap/mixins/text-overflow.less