diff --git a/browser/common.py b/browser/common.py
index 3b787c1..5128acb 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -492,7 +492,9 @@ class BaseView(GenericView, I18NView):
                     djConfig='parseOnLoad: true, usePlainJson: true, '
                              #'isDebug: true, '
                              'locale: "%s"' % self.languageInfo.language)
-        jsCall = 'dojo.require("dojo.parser");'
+        jsCall = ('dojo.require("dojo.parser"); '
+                  'dojo.registerModulePath("jocy", "/@@/cybertools.jocy"); '
+                  'dojo.require("jocy.data");')
         cm.register('js-execute', jsCall, jsCall=jsCall)
         cm.register('css', identifier='tundra.css', position=0,
                     resourceName='ajax.dojo/dijit/themes/tundra/tundra.css', media='all')
diff --git a/browser/concept_macros.pt b/browser/concept_macros.pt
index f223696..396f7e6 100644
--- a/browser/concept_macros.pt
+++ b/browser/concept_macros.pt
@@ -101,7 +101,7 @@
                           i18n:translate="">Type</span></td>
                 <td><span tal:replace="related/modified">Type</span></td>
                 <td><span tal:replace="related/creators">Type</span></td>
-                <td style="white-space: nowrap"
+                <td style="white-space: nowrap; text-align: center"
                     tal:define="target nocall:related;
                                 style nothing"
                     tal:condition="view/showObjectActions">
@@ -123,6 +123,7 @@
         <h2 i18n:translate="">Resources</h2>
         <table class="listing">
           <tr>
+            <th tal:condition="view/showCheckboxes|nothing">&nbsp;</th>
             <th i18n:translate="">Title</th>
             <th i18n:translate="">Type</th>
             <th i18n:translate=""
@@ -137,6 +138,8 @@
             <tal:item define="class python: repeat['related'].odd() and 'even' or 'odd';
                               description related/description">
               <tr tal:attributes="class class">
+                <td tal:condition="view/showCheckboxes|nothing"
+                    class="checkbox"><input type="checkbox" /></td>
                 <td valign="top">
                   <a href="#"
                      tal:attributes="href string:${view/url}/.target${related/uniqueId};
@@ -159,7 +162,7 @@
                 </td>
                 <td><span tal:replace="related/modified">2007-03-30</span></td>
                 <td><span tal:replace="related/creators">John</span></td>
-                <td style="white-space: nowrap"
+                <td style="white-space: nowrap; text-align: center"
                     tal:define="target nocall:related;
                                 style nothing"
                     tal:condition="view/showObjectActions">
diff --git a/browser/form_macros.pt b/browser/form_macros.pt
index dc84537..a1cc234 100644
--- a/browser/form_macros.pt
+++ b/browser/form_macros.pt
@@ -181,7 +181,8 @@
       </div>
       <input dojoType="dijit.form.FilteringSelect" store="conceptSearch"
              autoComplete="False" labelAttr="label"
-             name="concept.search.text" id="concept.search.text" />
+             name="concept.search.text" id="concept.search.text"
+             style="height: 1.5em" />
     </td>
     <td>
       <input type="button" value="Select"
diff --git a/browser/loops.css b/browser/loops.css
index c07574d..80ecce3 100644
--- a/browser/loops.css
+++ b/browser/loops.css
@@ -36,6 +36,14 @@ blockquote ul {
 
 table.listing td {
     white-space: normal;
+    vertical-align: middle;
+}
+
+table.listing td.checkbox {
+    text-align: center;
+    width: 10px;
+    padding-left: 2px;
+    padding-right: 2px;
 }
 
 table.listing-details td {
diff --git a/expert/browser/__init__.py b/expert/browser/__init__.py
new file mode 100644
index 0000000..4bc90fb
--- /dev/null
+++ b/expert/browser/__init__.py
@@ -0,0 +1,4 @@
+"""
+$Id$
+"""
+
diff --git a/expert/browser/base.py b/expert/browser/base.py
new file mode 100644
index 0000000..afb4e28
--- /dev/null
+++ b/expert/browser/base.py
@@ -0,0 +1,46 @@
+#
+#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+"""
+Definition of basic view classes and other browser related stuff for the
+loops.expert package.
+
+$Id$
+"""
+
+from zope import interface, component
+from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.cachedescriptors.property import Lazy
+
+from loops.browser.common import BaseView
+from loops.common import adapted
+from loops import util
+from loops.util import _
+
+
+queryTemplate = ViewPageTemplateFile('query.pt')
+
+
+class BaseQueryView(BaseView):
+
+    template = queryTemplate
+
+    @Lazy
+    def macro(self):
+        return template.macros['query']
+
diff --git a/expert/browser/configure.zcml b/expert/browser/configure.zcml
new file mode 100644
index 0000000..a74e4b7
--- /dev/null
+++ b/expert/browser/configure.zcml
@@ -0,0 +1,16 @@
+<!-- $Id$ -->
+
+<configure
+    xmlns:zope="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    i18n_domain="loops">
+
+  <zope:adapter
+      name="query"
+      for="loops.interfaces.IConcept
+           zope.publisher.interfaces.browser.IBrowserRequest"
+      provides="zope.interface.Interface"
+      factory="loops.expert.browser.base.BaseQueryView"
+      permission="zope.View" />
+
+</configure>
diff --git a/expert/browser/query.pt b/expert/browser/query.pt
new file mode 100644
index 0000000..a15b374
--- /dev/null
+++ b/expert/browser/query.pt
@@ -0,0 +1,10 @@
+<metal:query define-macro="query">
+    <div id="query">
+      <h1 tal:attributes="class string:content-$level;
+                          ondblclick item/openEditWindow"
+          tal:content="item/title">
+        Query
+      </h1>
+    </div>
+</metal:query>
+