diff --git a/lib/zin/wg/treeeditor/v1.php b/lib/zin/wg/treeeditor/v1.php
index 211106ccc2..6d2989b27a 100644
--- a/lib/zin/wg/treeeditor/v1.php
+++ b/lib/zin/wg/treeeditor/v1.php
@@ -25,9 +25,11 @@ class treeEditor extends wg
     {
         $this->setProp('items', $this->buildTree($this->prop('items')));
         $treeProps = $this->props->pick(array('items', 'activeClass', 'activeIcon', 'activeKey', 'onClickItem', 'defaultNestedShow', 'changeActiveKey', 'isDropdownMenu', 'collapsedIcon', 'expandedIcon', 'normalIcon', 'id', 'itemActions', 'hover', 'onClick'));
+        $idProps   = $treeProps['id'] ? array('id' => $treeProps['id']) : null;
         return zui::tree
         (
             set::_tag('ul'),
+            set::props($idProps),
             set($treeProps)
         );
     }
diff --git a/module/store/control.php b/module/store/control.php
index cbcb864516..9feac76718 100644
--- a/module/store/control.php
+++ b/module/store/control.php
@@ -49,7 +49,7 @@ class store extends control
     {
         if(!commonModel::hasPriv('space', 'browse')) $this->loadModel('common')->deny('space', 'browse', false);
         global $config;
-        if(empty($recPerPage)) $recPerPage = $this->cookie->pagerStoreBrowse ? $this->cookie->pagerStoreBrowse : 24;
+        if(empty($recPerPage)) $recPerPage = $this->cookie->pagerStoreBrowse ? $this->cookie->pagerStoreBrowse : 12;
         if(in_array( $channel, array('stable', 'test')))
         {
             $config->CNE->api->channel   = $channel;
diff --git a/module/store/ui/browse.html.php b/module/store/ui/browse.html.php
index e69a5dd88a..dc3955d287 100644
--- a/module/store/ui/browse.html.php
+++ b/module/store/ui/browse.html.php
@@ -118,7 +118,6 @@ div
                 set::control(array
                 (
                     'type'        => 'inputControl',
-                    'prefix'      => icon('search'),
                     'prefixWidth' => 'icon',
                     'placeholder' => $lang->store->searchApp,
                     'value'       => $keyword,
@@ -128,24 +127,24 @@ div
     ),
 
     div(...$groups),
-    pager(
-        setID('storePager'),
+    count($cloudApps) ? pager(
+        set::props(array('id' => 'storePager')),
         set::page($setting['page']),
         set::recTotal($setting['recTotal']),
         set::recPerPage($setting['recPerPage']),
         set::linkCreator($setting['linkCreator']),
         set::items($setting['items']),
         set::gap($setting['gap']),
-    ),
+    ) : null,
 );
 
-sidebar
+count($cloudApps) ? sidebar
 (
-    tree
+    treeEditor
     (
-        set::id('storeTree'),
+        setID('storeTree'),
         set::items($tree),
         set::canSplit(false),
         set::onClickItem(jsRaw('window.treeClick')),
     )
-);
+) : null;