diff --git a/browser/common.py b/browser/common.py
index 5128acb..dde524e 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -122,6 +122,10 @@ class BaseView(GenericView, I18NView):
         except ForbiddenAttribute:  # ignore when testing
             pass
 
+    @Lazy
+    def conceptMacros(self):
+        return concept_macros.macros
+
     @Lazy
     def name(self):
         return getName(self.context)
diff --git a/browser/concept.py b/browser/concept.py
index 3ccfad5..d47b143 100644
--- a/browser/concept.py
+++ b/browser/concept.py
@@ -49,7 +49,7 @@ from cybertools.composer.interfaces import IInstance
 from cybertools.composer.schema.interfaces import ISchemaFactory
 from cybertools.typology.interfaces import IType, ITypeManager
 from cybertools.util.jeep import Jeep
-from loops.browser.common import EditForm, BaseView, LoopsTerms, conceptMacrosTemplate
+from loops.browser.common import EditForm, BaseView, LoopsTerms, concept_macros
 from loops.common import adapted
 from loops.concept import Concept, ConceptTypeSourceList, PredicateSourceList
 from loops.i18n.browser import I18NView
@@ -187,17 +187,13 @@ class ConceptRelationView(BaseView):
 
 class ConceptView(BaseView):
 
-    template = ViewPageTemplateFile('concept_macros.pt')
+    template = concept_macros
     childViewFactory = ConceptRelationView
 
     @Lazy
     def macro(self):
         return self.template.macros['conceptdata']
 
-    @Lazy
-    def conceptMacros(self):
-        return conceptMacrosTemplate.macros
-
     def __init__(self, context, request):
         super(ConceptView, self).__init__(context, request)
         cont = self.controller
diff --git a/media/browser/asset.pt b/media/browser/asset.pt
index 90c4f5a..f3a427f 100644
--- a/media/browser/asset.pt
+++ b/media/browser/asset.pt
@@ -1,16 +1,13 @@
 <!-- ZPT macros for demo view -->
 
 <metal:block define-macro="asset">
-    <h1 tal:content="item/adapted/title">Title</h1>
-    <div tal:define="descr item/adapted/description" tal:condition="descr">
-      <h2>Description</h2>
-      <p tal:content="item/adapted/description">Description</p>
-    </div>
-
+  <div tal:attributes="class string:content-$level;">
+    <metal:title use-macro="item/conceptMacros/concepttitle" />
     <p tal:define="url python: view.getUrlForTarget(item)">
       <a href="#"
          tal:attributes="href string:${url}/view"><img
             tal:attributes="src string:${url}/@@mediaasset.html?v=medium" /></a>
     </p>
+  </div>
 </metal:block>
 
diff --git a/organize/stateful/quality.py b/organize/stateful/quality.py
index f78955b..3cbd600 100644
--- a/organize/stateful/quality.py
+++ b/organize/stateful/quality.py
@@ -27,7 +27,6 @@ from zope.component import adapter
 from zope.interface import implementer
 from zope.traversing.api import getName
 
-from cybertools.stateful.definition import registerStatesDefinition
 from cybertools.stateful.definition import StatesDefinition
 from cybertools.stateful.definition import State, Transition
 from cybertools.stateful.interfaces import IStatesDefinition, IStateful