diff -rN -u old-ucw_ajax/src/admin/admin.lisp new-ucw_ajax/src/admin/admin.lisp
--- old-ucw_ajax/src/admin/admin.lisp	2009-04-15 18:05:15.000000000 +0200
+++ new-ucw_ajax/src/admin/admin.lisp	2009-04-15 18:05:15.000000000 +0200
@@ -4,7 +4,7 @@
 
 (defvar *admin-application*
   (make-instance 'standard-application
-                 :url-prefix "/ucw/"
+                 :url-prefix "/admin/"
                  :tal-generator (make-instance 'yaclml:file-system-generator
                                                :cachep t
                                                :root-directories (make-standard-ucw-tal-dir-list))
@@ -18,7 +18,7 @@
   ((body :initarg :body
          :accessor admin-app.body
          :component admin-login))
-  (:default-initargs :title "UCW Administration" :stylesheet "/admin/ucw/ucw.css"))
+  (:default-initargs :title "UCW Administration" :stylesheet '("/static/ucw/ucw.css")))
 
 (defmethod render-html-body ((app admin-app))
   (<:h1 "UCW Administration.")
@@ -123,7 +123,7 @@
                                                    :rows 10
                                                    :cols 60))
    (form-value :accessor admin-repl.form-value :initarg :form-value :initform nil))
-  (:default-initargs :template-name "ucw/admin/admin-repl.tal"))
+  (:default-initargs :template-name "../admin/admin-repl.tal"))
 
 (defun admin-do-eval (repl)
   "Evaluate FORM in PACKAGE. We can't do this directly from the
diff -rN -u old-ucw_ajax/src/backend/httpd.lisp new-ucw_ajax/src/backend/httpd.lisp
--- old-ucw_ajax/src/backend/httpd.lisp	2009-04-15 18:05:15.000000000 +0200
+++ new-ucw_ajax/src/backend/httpd.lisp	2009-04-15 18:05:15.000000000 +0200
@@ -60,7 +60,7 @@
 of the available-workers for handling request."))
 
 ;; so we may get called with :host nil :port nil still meaning the default
-(def constructor httpd-backend
+(defmethod initialize-instance :after ((self httpd-backend) &key)
   (unless (host self)
     (setf (host self) "0.0.0.0"))
   (unless (port self)
diff -rN -u old-ucw_ajax/src/backend/message-queue.lisp new-ucw_ajax/src/backend/message-queue.lisp
--- old-ucw_ajax/src/backend/message-queue.lisp	2009-04-15 18:05:15.000000000 +0200
+++ new-ucw_ajax/src/backend/message-queue.lisp	2009-04-15 18:05:15.000000000 +0200
@@ -22,7 +22,7 @@
     :initform (make-condition-variable)
     :accessor message-received-condition-of)))
 
-(def constructor message-queue
+(defmethod initialize-instance :after ((self message-queue) &key &allow-other-keys)
   (setf (lock-of self) (make-lock (format nil "Lock for ~S" (name-of self)))))
 
 (defun make-message-queue (&rest initargs)
diff -rN -u old-ucw_ajax/src/components/ajax.lisp new-ucw_ajax/src/components/ajax.lisp
--- old-ucw_ajax/src/components/ajax.lisp	2009-04-15 18:05:15.000000000 +0200
+++ new-ucw_ajax/src/components/ajax.lisp	2009-04-15 18:05:15.000000000 +0200
@@ -62,7 +62,7 @@
 
 (defun call-in-restored-rendering-environment (component trunk)
   (let ((parents))
-    (iter (for parent :first (parent component) :then (parent parent))
+    (iter (for parent :first component :then (parent parent))
           (while parent)
           (push parent parents))
     (labels ((restorer ()
diff -rN -u old-ucw_ajax/src/components/container.lisp new-ucw_ajax/src/components/container.lisp
--- old-ucw_ajax/src/components/container.lisp	2009-04-15 18:05:15.000000000 +0200
+++ new-ucw_ajax/src/components/container.lisp	2009-04-15 18:05:15.000000000 +0200
@@ -289,15 +289,6 @@
             (funcall func (car comp-spec) (cdr comp-spec)))
           (container.contents container)))
 
-;; TODO this is bullshit, what about dojo-tab-container inheriting from it?
-(defmethod css-style ((self switching-container))
-  (let ((rest (call-next-method)))
-    (if (client-side-p self)
-        (if rest
-            (concatenate 'string "display: none; " rest)
-            "display: none;")
-        rest)))
-
 (defmethod render ((container switching-container))
   (if (client-side-p container)
       (progn
@@ -323,9 +314,7 @@
                     (render component))
                 (<ucw:script (if selectedp
                                  `(dojo.html.show ,(dom-id component))
-                                 `(dojo.html.hide ,(dom-id component)))))
-          ;; only show the main div when all the non-visible clients were hidden
-          (<ucw:script `(dojo.html.show ,(dom-id container))))
+                                 `(dojo.html.hide ,(dom-id component))))))
         (when (remember-selected-child-p container)
           (<ucw:script `(let ((container ($ ,(dom-id container))))
                          (setf container.ucw-remember-selected-child-p t)
diff -rN -u old-ucw_ajax/src/components/ucw-inspector.lisp new-ucw_ajax/src/components/ucw-inspector.lisp
--- old-ucw_ajax/src/components/ucw-inspector.lisp	2009-04-15 18:05:15.000000000 +0200
+++ new-ucw_ajax/src/components/ucw-inspector.lisp	2009-04-15 18:05:15.000000000 +0200
@@ -23,10 +23,9 @@
     (inspect-anchor from datum)))
 
 (defmethod render ((insp ucw-inspector))
-  (multiple-value-bind (title content)
-      (swank::inspect-for-emacs (slot-value insp 'datum)
-                                (swank::make-default-inspector))
-    (<:h2 (<:as-html title))
+  (multiple-value-bind (content)
+      (swank::emacs-inspect (slot-value insp 'datum))
+    (<:h2 (prin1-to-string (slot-value insp 'datum)))
     (dolist (part content)
       (etypecase part
         (null nil)
diff -rN -u old-ucw_ajax/src/rerl/rerl-utils.lisp new-ucw_ajax/src/rerl/rerl-utils.lisp
--- old-ucw_ajax/src/rerl/rerl-utils.lisp	2009-04-15 18:05:15.000000000 +0200
+++ new-ucw_ajax/src/rerl/rerl-utils.lisp	2009-04-15 18:05:15.000000000 +0200
@@ -27,20 +27,20 @@
       (progn
         (ucw.rerl.threads.dribble "Entering with-lock-held-on-server for server ~S in thread ~S" server (current-thread))
         (with-recursive-lock-held ((lock-of server))
-          -body-))
+          (-body-)))
     (ucw.rerl.threads.dribble "Leaving with-lock-held-on-server for server ~S in thread ~S" server (current-thread))))
 
 (def with-macro with-lock-held-on-application (application)
   ;; TODO KLUDGE this is a concurrent access itself and should be wrapped in a (debug-only* ...)
   (iter (for (nil session) :in-hashtable (application.session-table application))
-        (assert (not (session-lock-held-p session)) ()
+        #+nil (assert (not (session-lock-held-p session)) ()
                 "You are trying to lock the application ~A while one of its session ~A is locked by you"
                 application session))
   (multiple-value-prog1
       (progn
         (ucw.rerl.threads.dribble "Entering with-lock-held-on-application for app ~S in thread ~S" application (current-thread))
         (with-recursive-lock-held ((lock-of application))
-          -body-))
+          (-body-)))
     (ucw.rerl.threads.dribble "Leaving with-lock-held-on-application for app ~S in thread ~S" application (current-thread))))
 
 (def with-macro with-lock-held-on-session (session)
@@ -48,7 +48,7 @@
       (progn
         (ucw.rerl.threads.dribble "Entering with-lock-held-on-session for ~S in thread ~S" session (current-thread))
         (with-recursive-lock-held ((lock-of session))
-          -body-))
+          (-body-)))
     (ucw.rerl.threads.dribble "Leaving with-lock-held-on-session for ~S in thread ~S" session (current-thread))))
 
 (defmacro with-session-variables ((&rest names) &body body)