diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1f242bcfc70e9c1f640ef08de90fc97f22392c7..6817020fcabf4b7551e264709fc89cc487e4f0a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,7 +87,7 @@ build-testenv:
   timeout: 3 h
   only:
     - web
-    - shedules
+    - schedules
   script: 
     - cd test/docker
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
@@ -102,18 +102,13 @@ build-testenv:
 #   stage: deploy
 
 # Special job for serving a static website. See https://docs.gitlab.com/ee/ci/yaml/README.html#pages
-pages:
-  tags: [ docker ]
+pages_prepare: &pages_prepare
+  tags: [ cached-dind ]
   stage: deploy
   only:
     refs:
       - /^release-.*$/i
-      - master
-    variables:
-      # run pages only on gitlab.com
-      - $CI_SERVER_HOST == "gitlab.com"
   script:
-      # TODO is this a good location here?
     - npm install jsdoc
     - npm install jsdoc-sphinx
     - echo "Deploying"
@@ -122,3 +117,8 @@ pages:
   artifacts:
     paths:
       - public
+pages:
+  <<: *pages_prepare
+  only:
+    refs:
+      - main
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 153552a63e2e31ee2937d59b535f26c2687fbd59..57472cad21ba770edb8f7a2eb0894936d1be0ed8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   the module documentation for more information.
 - Added a menu/toc for the tour
 - Added a previous and next buttons for pages in the tour
+- Added warnings to inform about minimum width when accessing tour and
+  edit mode on small screens.
+- Added a tutorial for the edit mode to the documentation
 
 ### Changed (for changes in existing functionality)
 - The heading attributes datatype, path, checksum and size are now placed 
@@ -28,13 +31,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   used for versioning functionality before the native versioning was
   implemented. Also, the `BUILD_MODULE_EXT_REVISIONS` is no longer used and can
   be removed from the config files in `build.properties.d/`
+* `#subnav` element from navbar which was previously used for spacing
+* `caosdb.form.ready` event
 
 ### Fixed
 
+* #214 - Paging panel is hidden.
 * #156 - Edit mode for Safari 11
 * #160 - Entity preview for Safari 11
 * Several minor cosmetic flaws
 * Fixed edit mode for Safari 11.
+* Displaying issues with long lists in property values
+* An issue whereby a grey container would appear above the map when
+  changing the map view.
 
 ### Security (in case of vulnerabilities)
 
diff --git a/Makefile b/Makefile
index 730f8d31a686bfa725e10c758da791f1ae0559f2..2c12ee4e67becfd7713ae305c4ab7432bda84391 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ LIBS_DIR = $(abspath libs)
 TEST_CORE_DIR = $(abspath test/core/)
 TEST_EXT_DIR = $(abspath test/ext)
 TEST_SSS_DIR =$(abspath test/server_side_scripting)
-LIBS = css/bootstrap.css  js/state-machine.js js/jquery.js js/showdown.js js/dropzone.js css/dropzone.css js/loglevel.js js/leaflet.js css/leaflet.css css/images js/leaflet-latlng-graticule.js js/proj4.js js/proj4leaflet.js js/leaflet-coordinates.js css/leaflet-coordinates.css js/leaflet-graticule.js js/bootstrap-select.js css/bootstrap-select.css js/bootstrap-autocomplete.min.js js/plotly.js js/pako.js js/utif.js js/bootstrap.bundle.min.js
+LIBS = fonts css/fonts css/bootstrap.css css/bootstrap-icons.css js/state-machine.js js/jquery.js js/showdown.js js/dropzone.js css/dropzone.css js/loglevel.js js/leaflet.js css/leaflet.css css/images js/leaflet-latlng-graticule.js js/proj4.js js/proj4leaflet.js js/leaflet-coordinates.js css/leaflet-coordinates.css js/leaflet-graticule.js js/bootstrap-select.js css/bootstrap-select.css js/bootstrap-autocomplete.min.js js/plotly.js js/pako.js js/utif.js js/bootstrap.bundle.min.js
 
 TEST_LIBS = $(LIBS) js/qunit.js css/qunit.css $(subst $(TEST_CORE_DIR)/,,$(shell find $(TEST_CORE_DIR)/))
 
@@ -52,9 +52,9 @@ LIBS_SUBDIRS = $(addprefix $(LIBS_DIR)/, js css fonts)
 
 ALL: install
 
-install: clean install-sss cp-src cp-ext cp-conf $(addprefix $(PUBLIC_DIR)/, $(LIBS)) build_properties merge_xsl
+install: clean-ignore-zips install-sss cp-src cp-ext cp-conf $(addprefix $(PUBLIC_DIR)/, $(LIBS)) build_properties merge_xsl merge_js
 
-test: clean install-sss cp-src cp-ext cp-ext-test cp-conf $(addprefix $(PUBLIC_DIR)/, $(TEST_LIBS)) build_properties merge_xsl
+test: clean-ignore-zips install-sss cp-src cp-ext cp-ext-test cp-conf $(addprefix $(PUBLIC_DIR)/, $(TEST_LIBS)) build_properties merge_xsl merge_js
 	@for f in $(shell find $(TEST_EXT_DIR) -type f -iname *.js) ; do \
 		sed -i "/EXTENSIONS/a \<script src=\"$${f#$(TEST_EXT_DIR)/}\" ></script>" $(PUBLIC_DIR)/index.html ; \
 		echo include $$f; \
@@ -67,6 +67,10 @@ test: clean install-sss cp-src cp-ext cp-ext-test cp-conf $(addprefix $(PUBLIC_D
 merge_xsl:
 	misc/merge_xsl.sh
 
+merge_js:
+	for f in ${BUILDFILELIST} ; do source "$$f" ; done ; \
+	misc/merge_js.sh $${MODULE_DEPENDENCIES[*]}
+
 EXCLUDE_EXPR = %~ %.backup
 BUILDFILELIST = $(filter-out $(EXCLUDE_EXPR),$(wildcard build.properties.d/*))
 build_properties:
@@ -210,12 +214,18 @@ $(PUBLIC_DIR)/%: $(TEST_CORE_DIR)/%
 $(PUBLIC_DIR)/%: $(TEST_EXT_DIR)/%
 	cp -r $< $@
 
+$(LIBS_DIR)/fonts: unzip
+	ln -s $(LIBS_DIR)/bootstrap-icons-1.4.1/fonts/ $@
+
 $(LIBS_DIR)/js/bootstrap.js: unzip $(LIBS_DIR)/js
 	ln -s $(LIBS_DIR)/bootstrap-5.0.0-beta3-dist/js/bootstrap.min.js $@
 
 $(LIBS_DIR)/css/bootstrap.css: unzip $(LIBS_DIR)/css
 	ln -s $(LIBS_DIR)/bootstrap-5.0.0-beta3-dist/css/bootstrap.min.css $@
 
+$(LIBS_DIR)/css/bootstrap-icons.css: unzip $(LIBS_DIR)/css
+	ln -s $(LIBS_DIR)/bootstrap-icons-1.4.1/bootstrap-icons.css $@
+
 $(LIBS_DIR)/js/bootstrap-select.js: unzip $(LIBS_DIR)/js
 	ln -s $(LIBS_DIR)/bootstrap-select-1.14.0-beta2/js/bootstrap-select.min.js $@
 
@@ -223,7 +233,7 @@ $(LIBS_DIR)/css/bootstrap-select.css: unzip $(LIBS_DIR)/css
 	ln -s $(LIBS_DIR)/bootstrap-select-1.14.0-beta2/css/bootstrap-select.min.css $@
 
 $(LIBS_DIR)/js/jquery.js: unzip $(LIBS_DIR)/js
-	ln -s $(LIBS_DIR)/jquery-3.5.1/jquery-3.5.1.min.js $@
+	ln -s $(LIBS_DIR)/jquery-3.6.0.min.js $@
 
 $(LIBS_DIR)/js/showdown.js: unzip $(LIBS_DIR)/js
 	ln -s $(LIBS_DIR)/showdown-1.8.6/dist/showdown.min.js $@
@@ -292,17 +302,23 @@ $(LIBS_DIR)/js/utif.js: unzip $(LIBS_DIR)/js
 $(addprefix $(LIBS_DIR)/, js css):
 	mkdir $@ || true
 
-.PHONY: clean
-clean:
+$(LIBS_DIR)/css/fonts: $(LIBS_DIR)/css
+	ln -s $(LIBS_DIR)/fonts/ $(LIBS_DIR)/css/fonts
+
+.PHONY: clean-ignore-zips
+clean-ignore-zips:
 	$(RM) -r $(SSS_BIN_DIR)
 	$(RM) -r $(PUBLIC_DIR)
 	for f in $(LIBS_SUBDIRS); do unlink $$f || $(RM) -r $$f || true; done
-	for f in $(patsubst %.zip,%/,$(LIBS_ZIP)); do $(RM) -r $$f; done
 	$(RM) .server_done
 
+.PHONY: clean
+clean: clean-ignore-zips
+	for f in $(patsubst %.zip,%/,$(LIBS_ZIP)); do $(RM) -r $$f; done
+
 .PHONY: unzip
 unzip:
-	for f in $(LIBS_ZIP); do unzip -q -o -d libs $$f; done
+	for f in $(LIBS_ZIP); do echo "unzip $$f" ; unzip -u -q -o -d libs $$f; done
 
 
 PYLINT ?= pylint
diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md
index ce69c0fc24e2ea754589ffe4dd4b8bf2a2fadfaf..1dc6d11a442b9f095d7e80b02a3a9542e62b8e98 100644
--- a/RELEASE_GUIDELINES.md
+++ b/RELEASE_GUIDELINES.md
@@ -18,10 +18,10 @@ guidelines of the CaosDB Project
 
 2. Check all general prerequisites.
 
-3. Merge the release branch into the master branch.
+3. Merge the release branch into the main branch.
 
-4. Tag the latest commit of the master branch with `v<VERSION>`.
+4. Tag the latest commit of the main branch with `v<VERSION>`.
 
 5. Delete the release branch.
 
-6. Merge the master branch back into the dev branch.
+6. Merge the main branch back into the dev branch.
diff --git a/build.properties.d/00_default.properties b/build.properties.d/00_default.properties
index 482913473a8d2620a4484b69424aab82e52e48f3..36d296789f6058d106b450f405af726bf0273b9d 100644
--- a/build.properties.d/00_default.properties
+++ b/build.properties.d/00_default.properties
@@ -90,3 +90,48 @@ BUILD_CUSTOM_IMPRINT='<p> Put an imprint note here </p>'
 # ext_trigger_crawler_form properties
 ##############################################################################
 BUILD_MODULE_EXT_TRIGGER_CRAWLER_FORM_TOOLBOX="Tools"
+
+##############################################################################
+# Module dependencies
+# Override or extend to specify the order of js files in the resulting
+# bundled js file
+##############################################################################
+MODULE_DEPENDENCIES=(
+    jquery.js
+    bootstrap.bundle.min.js
+    bootstrap-autocomplete.min.js
+    bootstrap-select.js
+    state-machine.js
+    showdown.js
+    dropzone.js
+    loglevel.js
+    plotly.js
+    webcaosdb.js
+    pako.js
+    utif.js
+    caosdb.js
+    form_elements.js
+    ext_autocomplete.js
+    preview.js
+    ext_references.js
+    ext_table_preview.js
+    ext_xls_download.js
+    query_shortcuts.js
+    ext_jupyterdrag.js
+    annotation.js
+    edit_mode.js
+    ext_entity_state.js
+    ext_file_download.js
+    leaflet.js
+    leaflet-graticule.js
+    leaflet-latlng-graticule.js
+    leaflet-coordinates.js
+    proj4.js
+    proj4leaflet.js
+    ext_map.js
+    tour.js
+    ext_bottom_line.js
+    ext_sss_markdown.js
+    ext_trigger_crawler_form.js
+    ext_bookmarks.js
+)
diff --git a/libs/bootstrap-icons-1.4.1.zip b/libs/bootstrap-icons-1.4.1.zip
new file mode 100644
index 0000000000000000000000000000000000000000..dc9398e6d6e6ce3c96e01b4734a29a37432f43b1
Binary files /dev/null and b/libs/bootstrap-icons-1.4.1.zip differ
diff --git a/libs/jquery-3.5.1.zip b/libs/jquery-3.5.1.zip
deleted file mode 100644
index c554bbf416786da9c18bef62061cba932646f996..0000000000000000000000000000000000000000
Binary files a/libs/jquery-3.5.1.zip and /dev/null differ
diff --git a/libs/jquery-3.6.0.min.js b/libs/jquery-3.6.0.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..c4c6022f2982e8dae64cebd6b9a2b59f2547faad
--- /dev/null
+++ b/libs/jquery-3.6.0.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),j=function(e,t){return e===t&&(l=!0),0},D={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&D.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(j),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(j).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var D,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^([^.]*)(?:\.(.+)|)/;function we(){return!0}function Te(){return!1}function Ce(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ee(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ee(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Te;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Se(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n&&n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,we)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=be.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=be.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click",we),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?we:Te,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Te,isPropagationStopped:Te,isImmediatePropagationStopped:Te,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=we,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=we,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=we,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Se(this,e,Ce),!1},trigger:function(){return Se(this,e),!0},_default:function(){return!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return Ee(this,e,t,n,r)},one:function(e,t,n,r){return Ee(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Te),this.each(function(){S.event.remove(this,e,n,t)})}});var ke=/<script|<style|<link/i,Ae=/checked\s*(?:[^=]|=\s*.checked.)/i,Ne=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function He(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Ae.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),He(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),De)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,qe),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(Ne,""),u,l))}return n}function Oe(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Le(o[r],a[r]);else Le(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Oe(this,e,!0)},remove:function(e){return Oe(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return He(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||je(this,e).appendChild(e)})},prepend:function(){return He(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=je(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!ke.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return He(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Pe=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Re=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Me=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Ie=new RegExp(ne.join("|"),"i");function We(e,t,n){var r,i,o,a,s=e.style;return(n=n||Re(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Pe.test(a)&&Ie.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function Fe(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,re.removeChild(e)),a}}))}();var Be=["Webkit","Moz","ms"],$e=E.createElement("div").style,_e={};function ze(e){var t=S.cssProps[e]||_e[e];return t||(e in $e?e:_e[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Be.length;while(n--)if((e=Be[n]+t)in $e)return e}(e)||e)}var Ue=/^(none|table(?!-c[ea]).+)/,Xe=/^--/,Ve={position:"absolute",visibility:"hidden",display:"block"},Ge={letterSpacing:"0",fontWeight:"400"};function Ye(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Qe(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Je(e,t,n){var r=Re(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=We(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Pe.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Qe(e,t,n||(i?"border":"content"),o,r,a)+"px"}function Ke(e,t,n,r,i){return new Ke.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=We(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Xe.test(t),l=e.style;if(u||(t=ze(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Xe.test(t)||(t=ze(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=We(e,t,r)),"normal"===i&&t in Ge&&(i=Ge[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ue.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Je(e,u,n):Me(e,Ve,function(){return Je(e,u,n)})},set:function(e,t,n){var r,i=Re(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Qe(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Qe(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Ye(0,t,s)}}}),S.cssHooks.marginLeft=Fe(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(We(e,"marginLeft"))||e.getBoundingClientRect().left-Me(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Ye)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Re(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=Ke).prototype={constructor:Ke,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=Ke.propHooks[this.prop];return e&&e.get?e.get(this):Ke.propHooks._default.get(this)},run:function(e){var t,n=Ke.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Ke.propHooks._default.set(this),this}}).init.prototype=Ke.prototype,(Ke.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[ze(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=Ke.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=Ke.prototype.init,S.fx.step={};var Ze,et,tt,nt,rt=/^(?:toggle|show|hide)$/,it=/queueHooks$/;function ot(){et&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(ot):C.setTimeout(ot,S.fx.interval),S.fx.tick())}function at(){return C.setTimeout(function(){Ze=void 0}),Ze=Date.now()}function st(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ut(e,t,n){for(var r,i=(lt.tweeners[t]||[]).concat(lt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function lt(o,e,t){var n,a,r=0,i=lt.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=Ze||at(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:Ze||at(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=lt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ut,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(lt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],lt.tweeners[n]=lt.tweeners[n]||[],lt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],rt.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ut(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?lt.prefilters.unshift(e):lt.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=lt(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&it.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(st(r,!0),e,t,n)}}),S.each({slideDown:st("show"),slideUp:st("hide"),slideToggle:st("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(Ze=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),Ze=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){et||(et=!0,ot())},S.fx.stop=function(){et=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},tt=E.createElement("input"),nt=E.createElement("select").appendChild(E.createElement("option")),tt.type="checkbox",y.checkOn=""!==tt.value,y.optSelected=nt.selected,(tt=E.createElement("input")).value="t",tt.type="radio",y.radioValue="t"===tt.value;var ct,ft=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?ct:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ct={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=ft[t]||S.find.attr;ft[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=ft[o],ft[o]=r,r=null!=a(e,t,n)?o:null,ft[o]=i),r}});var pt=/^(?:input|select|textarea|button)$/i,dt=/^(?:a|area)$/i;function ht(e){return(e.match(P)||[]).join(" ")}function gt(e){return e.getAttribute&&e.getAttribute("class")||""}function vt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):pt.test(e.nodeName)||dt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,gt(this)))});if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,gt(this)))});if(!arguments.length)return this.attr("class","");if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,gt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=vt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=gt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+ht(gt(n))+" ").indexOf(t))return!0;return!1}});var yt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(yt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:ht(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var mt=/^(?:focusinfocus|focusoutblur)$/,xt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!mt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,mt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,xt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,xt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var bt=C.location,wt={guid:Date.now()},Tt=/\?/;S.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||S.error("Invalid XML: "+(n?S.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var Ct=/\[\]$/,Et=/\r?\n/g,St=/^(?:submit|button|image|reset|file)$/i,kt=/^(?:input|select|textarea|keygen)/i;function At(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||Ct.test(n)?i(n,t):At(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)At(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)At(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&kt.test(this.nodeName)&&!St.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(Et,"\r\n")}}):{name:t.name,value:n.replace(Et,"\r\n")}}).get()}});var Nt=/%20/g,jt=/#.*$/,Dt=/([?&])_=[^&]*/,qt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Lt=/^(?:GET|HEAD)$/,Ht=/^\/\//,Ot={},Pt={},Rt="*/".concat("*"),Mt=E.createElement("a");function It(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Wt(t,i,o,a){var s={},u=t===Pt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Ft(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Mt.href=bt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:bt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(bt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Rt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Ft(Ft(e,S.ajaxSettings),t):Ft(S.ajaxSettings,e)},ajaxPrefilter:It(Ot),ajaxTransport:It(Pt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=qt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||bt.href)+"").replace(Ht,bt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Mt.protocol+"//"+Mt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Wt(Ot,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Lt.test(v.type),f=v.url.replace(jt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Nt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Tt.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Dt,"$1"),o=(Tt.test(f)?"&":"?")+"_="+wt.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+Rt+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Wt(Pt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&S.inArray("json",v.dataTypes)<0&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Bt={0:200,1223:204},$t=S.ajaxSettings.xhr();y.cors=!!$t&&"withCredentials"in $t,y.ajax=$t=!!$t,S.ajaxTransport(function(i){var o,a;if(y.cors||$t&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Bt[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=ht(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Xt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Xt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Vt=C.jQuery,Gt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Gt),e&&C.jQuery===S&&(C.jQuery=Vt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/misc/merge_js.sh b/misc/merge_js.sh
new file mode 100755
index 0000000000000000000000000000000000000000..375529fe472a05caafb12981a6fb17aef0ae8db9
--- /dev/null
+++ b/misc/merge_js.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+#
+# ** header v3.0
+# This file is a part of the CaosDB Project.
+#
+# Copyright (C) 2021 IndiScale GmbH
+# Copyright (C) 2021 Timm Fitschen <t.fitschen@indiscale.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+# ** end header
+
+# This file can be used to merge js files together.
+#
+# call: `./merge_js.sh [JS_FILE]*`
+#     where the JS_FILE are the files which will be merged into the resulting
+#     `public/webcaosdb.dist.js` in the order they appear in the command line
+#     call. See `Makefile` for an example.
+#
+# All other files in `public/js` are appended to the resulting file in no
+# particular order.
+
+
+CORE_MODULES=$@
+SOURCE_DIR=public/js/
+TARGET=public/webcaosdb.dist.js
+
+function _merge () {
+    _SOURCE=$2
+    _TARGET=$3
+
+    echo "merging $1 module ${_SOURCE} into ${_TARGET}"
+
+
+    echo "//COPIED FROM ${_SOURCE} (START)" >> ${_TARGET}
+    cat ${_SOURCE} >> ${_TARGET}
+    echo "//COPIED FROM ${_SOURCE} (END)" >> ${_TARGET}
+
+    rm ${_SOURCE}
+}
+
+# clean up old
+rm $TARGET || true
+touch $TARGET
+
+for _SOURCE in ${CORE_MODULES[@]} ; do
+    _merge "core" "${SOURCE_DIR}${_SOURCE}" $TARGET
+done
+
+# load other js files but exclude any subdirectory
+for _SOURCE in $(find ${SOURCE_DIR}* -prune -iname "*.js") ; do
+    _merge "extension" ${_SOURCE} $TARGET
+done
+
+# for `make test`
+for _SOURCE in $(find ${SOURCE_DIR} -ipath "${SOURCE_DIR}modules/*.js") ; do
+    _merge "extension" ${_SOURCE} $TARGET
+done
+
diff --git a/src/core/css/tour.css b/src/core/css/tour.css
index 5809ded823d945516ab91df0f1c12c3fde46b01a..beec314ff8f8aa944e1fbb1fd9efd20e1fb17aa5 100644
--- a/src/core/css/tour.css
+++ b/src/core/css/tour.css
@@ -237,3 +237,21 @@ div.caosdb-v-tour-toc-show {
     border: none;
     z-index: 100000;
 }
+
+.caosdb-v-tour-toc-detour {
+    font-size: 0.875em;
+    padding-left: 1em;
+}
+
+.caosdb-v-tour-toc-cur {
+    border: 1px dashed #e1eff0;
+}
+
+.caosdb-v-tour-toc-active-item.caosdb-v-tour-toc-cur {
+    border: none;
+}
+
+/* For elements in popovers which are not for clicking but only illustrative. */
+.caosdb-v-tour-unclickable {
+    cursor: text !important;
+}
diff --git a/src/core/css/webcaosdb.css b/src/core/css/webcaosdb.css
index 780534f4ad4e1c92f9be04b24d087b466263c455..fb86c816a22ebfcf22a865f0b86d840d80e26b1f 100644
--- a/src/core/css/webcaosdb.css
+++ b/src/core/css/webcaosdb.css
@@ -27,15 +27,24 @@ main {
 }
 
 body {
-   display: flex;
-   min-height: 100vh;
-   flex-direction: column;
-   justify-content: space-between;
+    background-color: lightgrey;
+}
+
+.background {
+    background-color: #1a4548;
+    min-height: 60vh;
 }
 
+@media screen and (min-height: 1150px) {
+    .background {
+        min-height: 80vh;
+    }
+}
+
+
 footer {
-    height: 400px;
-    width: 100%;
+    background-color: lightgrey;
+    width:100%;
 }
 
 .caosdb-v-server-message strong {
@@ -70,12 +79,6 @@ tbody:not(:hover) tr .caosdb-v-entity-version-hint-cur {
     color: unset;
 }
 
-#top-navbar>ul>li>a {
-    margin: 8px 0px;
-    padding: 6px 12px;
-    display: inline-block;
-}
-
 .caosdb-v-state-model-label .caosdb-v-state-label {
     margin-left: .6em; font-size: 100%;
 }
@@ -158,6 +161,7 @@ tbody:not(:hover) tr .caosdb-v-entity-version-hint-cur {
 * .caosdb-v-property-text-value */
 .caosdb-property-text-value {
     white-space: pre-line;
+    background-color: transparent !important;
 }
 
 .caosdb-clickable:hover {
@@ -182,13 +186,10 @@ tbody:not(:hover) tr .caosdb-v-entity-version-hint-cur {
 
 .caosdb-show-preview-button, .caosdb-hide-preview-button {
     position: absolute;
-    left: -0.9em;
+    left: -0.65rem;
     padding-left: 0;
     padding-right: 0;
-}
-
-.caosdb-entity-heading-attr {
-    overflow-x: auto;
+    background-color: transparent !important;
 }
 
 a.label.caosdb-id-button:hover {
@@ -199,6 +200,14 @@ h5 {
     margin: auto;
 }
 
+.caosdb-f-main-entities {
+    max-width: 100%;
+}
+
+.caosdb-f-main-entities-edit {
+    max-width: calc(100% - 240px);
+}
+
 .caosdb-entity-preview .caosdb-entity-panel-body {
     overflow-y: auto;
     max-height: 250px;
@@ -232,6 +241,17 @@ h5 {
     text-decoration: none;
 }
 
+.caosdb-v-property-left-col {
+    min-height: 30px;
+    display: inline-block;
+}
+
+.caosdb-v-property-left-col > * {
+    margin-top: 3px;
+    margin-bottom: 3px;
+    display: inline-block;
+}
+
 .caosdb-property-name {
     font-weight: bold;
 }
@@ -297,18 +317,18 @@ h5 {
 
 /* single boolean values */
 .caosdb-boolean-true {
-	font-weight: bold;
-	font-size: 90%;
-	border: 1px solid #bbb;
-	padding: 2px 8px;
-	border-radius: 8px;
+    font-weight: bold;
+    font-size: 90%;
+    border: 1px solid #bbb;
+    padding: 0 5px;
+    border-radius: 8px;
 }
 
 .caosdb-boolean-false {
     font-weight: bold;
     font-size: 90%;
     border: 1px solid #bbb;
-    padding: 2px 8px;
+    padding: 0 5px;
     border-radius: 8px;
 }
 
@@ -317,8 +337,14 @@ h5 {
     border-bottom-right-radius: 3px;  
 }
 
+.coasdb-entity-version-attr,
+.caosdb-entity-heading-attr {
+    overflow-x: auto;
+}
+
+.coasdb-entity-version-attr-name,
 .caosdb-entity-heading-attr-name {
-	color: #6c6c6c;
+    color: #6c6c6c;
     font-size: 90%;
     margin-right: 0.3em; 
 }
@@ -353,10 +379,6 @@ h5 {
     overflow-y: auto;
 }
 
-.caosdb-f-show-paging-panel .caosdb-v-edit-panel {
-    margin-top: 39px;
-}
-
 .caosdb-v-editmode-btngroup {
     padding-bottom: 15px;
 }
@@ -387,22 +409,22 @@ h5 {
 
 .caosdb-label-record {
     background-color: #F92108;
+    border: 1px solid #F92108;
 }
 
 .caosdb-label-recordtype {
     background-color: #00A32E;
+    border: 1px solid #00A32E;
 }
 
 .caosdb-label-property {
     background-color: #496DAB;
+    border: 1px solid #496DAB;
 }
 
 .caosdb-label-file {
     background-color: #C92E86;
-}
-
-.label.caosdb-id-button {
-    background-color: #4E5752;
+    border: 1px solid #C92E86;
 }
 
 .caosdb-parents-heading {
@@ -421,7 +443,6 @@ h5 {
 
 .caosdb-parent-item {
     border: 1px solid #666;
-    margin: 0 0.5em;
     color: black;
     text-decoration: none;
 }
@@ -437,46 +458,10 @@ h5 {
     margin-left: 0.3em;
 }
 
-.navbar-brand {
-    display: flex;
-    align-items: center;
-}
-
-.navbar-brand>img {
-    padding: 0px 0px;
-    height: 100%
-}
-
 .caosdb-fs-cwd::before {
     content: " > ";
 }
 
-/*
-.caosdb-fs-dir>.boostrap-icon::before {
-    content: "\e117";
-}
-
-.caosdb-fs-dir>.boostrap-icon {
-    margin-right: 8px;
-}
-
-.caosdb-fs-dir:hover>.boostrap-icon::before {
-    content: "\e118";
-}
-
-.caosdb-fs-file>.boostrap-icon::before {
-    content: "\e022";
-}
-
-.caosdb-fs-file>.boostrap-icon {
-    margin-right: 8px;
-}
-
-.caosdb-fs-file:hover>.boostrap-icon::before {
-    content: "\e025";
-}
-*/
-
 .caosdb-fs-btn-file {
     padding: 0px;
     background-color: transparent;
@@ -525,7 +510,7 @@ h5 {
 
 .caosdb-v-property-row {
     animation: appear 0.5s 1;
-    padding-left: 2rem;
+    padding-left: 2.4rem;
     padding-right: 1rem;
     padding-top: 0.3ex;
     padding-bottom: 0.3ex;
@@ -575,8 +560,10 @@ input[type="file"] {
     text-align: center;
     color: #69c2df;
     border: 2px dashed #69c2df;
-    padding: 25px 0px;
-    margin: 25px 0px;
+    padding: 25px 0;
+    margin: 1rem;
+    margin-top: 20px;
+    margin-bottom: 0px;
 }
 
 .caosdb-v-edit-mode-property-dropzone:hover {
@@ -626,18 +613,8 @@ input[type="file"] {
 }
 
 .caosdb-v-property-other-inputs {
-    margin-top: 10px;
-    margin-bottom: 10px;
-}
-
-footer {
-    background-color: lightgrey;
-    padding: 0.5em;
-    width:100%;
-}
-
-.caosdb-footer-element {
-    margin: 1em;
+    margin-top: 6px;
+    margin-bottom: 6px;
 }
 
 .caosdb-bulletsep {
@@ -665,6 +642,10 @@ details summary > * {
     display: inline;
 }
 
+details p {
+    margin-bottom: 0.2rem;
+}
+
 .caosdb-v-tour-overview-entry-page a {
   text-decoration: none;
   padding: .1875rem .5rem;
@@ -684,10 +665,12 @@ details summary > * {
 
 .caosdb-f-paging-panel {
     display: none;
+    height: 31px;
 }
 
 .caosdb-f-show-paging-panel .caosdb-f-paging-panel {
-    display: block;
+    display: flex;
+    justify-content: space-between;
 }
 
 .caosdb-properties {
@@ -717,20 +700,45 @@ details summary > * {
 
 .caosdb-f-property-value {
     position: relative;
+    margin-top: auto;
+    margin-bottom: auto;
 }
 
-@media screen and (min-width: 576px) {
-    .caosdb-f-edit {
-        display: none;
-        position: relative;
-        width: 240px;
-        flex-shrink: 0;
-    }
+.caosdb-f-reference-value {
+    background-color: white;
+    padding: 0.2rem 0.5rem;
+}
 
-    .caosdb-v-edit-panel {
-        padding: 0px;
-        height: min-content;
-        position: fixed;
-        width: 240px;
-    }
+.caosdb-f-edit {
+    display: none;
+    position: relative;
+    width: 240px;
+    flex-shrink: 0;
+}
+
+.caosdb-v-edit-panel {
+    padding: 0px;
+    height: min-content;
+    position: fixed;
+    width: 240px;
+}
+
+.caosdb-f-show-paging-panel .caosdb-v-edit-panel {
+    margin-top: 39px;
+}
+
+.caosdb-query-response.card .card-header {
+    border: none;
+}
+
+.caosdb-f-entity-state-transition-button:hover {
+    filter: brightness(110%);
+}
+
+.caosdb-f-entity-state-transition-button {
+    border: none;
+}
+
+.caosdb-f-map-panel .leaflet-container {
+    height: 500px;
 }
diff --git a/src/core/js/annotation.js b/src/core/js/annotation.js
index 2ddb8ab2ccb61af3980ee59f6e51c6bdf8aada6c..dd75a81180d2081fd992d168ff3e1b5f43492f06 100644
--- a/src/core/js/annotation.js
+++ b/src/core/js/annotation.js
@@ -390,13 +390,14 @@ this.annotation = new function() {
     }
 
     this.loadComments = async function(annotationSection) {
-        var entityId = annotation.getEntityId(annotationSection);
-        var annotations = await annotation.getAnnotationsForEntity(entityId, annotation.queryAnnotation, annotation.loadAnnotationXsl(connection.getBasePath()));
+        const entityId = annotation.getEntityId(annotationSection);
+        const annotations = await annotation.getAnnotationsForEntity(entityId, annotation.queryAnnotation, annotation.loadAnnotationXsl(connection.getBasePath()));
         const len = annotations.length;
         $(annotationSection).append(annotations);
-        const badge = $(`#${entityId} .caosdb-v-entity-header-buttons-list .caosdb-v-entity-comment-badge`);
         if (len > 0) {
-            badge.prepend(`<span class="caosdb-v-entity-number-of-comments">${len}</div>`);
+            const button = $(`#${entityId} .caosdb-v-entity-header-buttons-list .caosdb-v-entity-comment-badge`);
+            button.empty();
+            button.append(`<span class="badge bg-dark caosdb-v-entity-number-of-comments">${len}<i class="bi-chat-left-fill ms-1"></i></span>`);
         }
     }
 
diff --git a/src/core/js/edit_mode.js b/src/core/js/edit_mode.js
index 91fdc5d82bbe1d78ed108b0625be22bfe835fe10..8644fff20894cc775919c8dfe76f49cec96460fb 100644
--- a/src/core/js/edit_mode.js
+++ b/src/core/js/edit_mode.js
@@ -63,20 +63,31 @@ var edit_mode = new function() {
      */
     this.property_data_type_changed = new Event("caosdb.edit_mode.property_data_type_changed");
 
+    /**
+     * Initialize this module
+     */
     this.init = function() {
         if (isAuthenticated()) {
-            var target = $("#top-navbar").find("ul").first();
-            this.add_edit_mode_button(target, edit_mode.toggle_edit_mode);
-            if (this.is_edit_mode()) {
-                edit_mode.enter_edit_mode();
-                edit_mode.toggle_edit_panel();
-            }
-            $('.caosdb-f-edit').css("transition", "top 1s");
+            this._init();
         } else {
             window.localStorage.removeItem("edit_mode");
         }
     }
 
+    this._init = function () {
+        var target = $("#top-navbar").find("ul").first();
+        this.add_edit_mode_button(target, edit_mode.toggle_edit_mode);
+        if (this.is_edit_mode()) {
+            edit_mode.enter_edit_mode();
+            edit_mode.toggle_edit_panel();
+            // This is for the very specific case of reloading the
+            // page while the edit mode is active on small screens
+            $(".caosdb-edit-min-width-warning").removeClass("d-none");
+            $(".caosdb-edit-min-width-warning").addClass("d-block");
+        }
+        $('.caosdb-f-edit').css("transition", "top 1s");
+    }
+
 
     this.dragstart = function(e) {
         e.dataTransfer.setData("text/plain", e.target.id);
@@ -157,12 +168,6 @@ var edit_mode = new function() {
             var dragged_rt = str2xml('<Response><RecordType id="' + prop_id + '" name="' + name + '"></RecordType></Response>');
             transformation.transformParent(dragged_rt).then(new_prop => {
                 parent_list.appendChild(new_prop);
-                /*
-                edit_mode.add_one_delete_button(
-                    parent_list.children[parent_list.children.length-1],
-                    is_parent=true
-                );
-                */
                 edit_mode.add_parent_delete_buttons(entity);
             }, edit_mode.handle_error);
 
@@ -320,7 +325,7 @@ var edit_mode = new function() {
      * @return {undefined}
      */
     this.add_trash_button = function(appendable, deletable, className, callback = undefined, title = undefined) {
-        var button = $('<button class="btn btn-link ' + className + ' caosdb-f-entity-trash-button"><i class="bi-trash"></i></button>');
+        var button = $('<button class="btn btn-link p-0 ' + className + ' caosdb-f-entity-trash-button"><i class="bi-trash"></i></button>');
         if(title) {
             button.attr("title", title);
         }
@@ -537,6 +542,9 @@ var edit_mode = new function() {
         $(target).append(edit_mode_li);
         $(".caosdb-f-btn-toggle-edit-mode").click(toggle_function);
 
+        var min_width_warning = $('<div class="alert alert-warning caosdb-edit-min-width-warning d-lg-none d-none" role="alert"><strong>Warning</strong> The edit mode is optimized for screens wider than 992px. If you have trouble using it, please	try accessing it on a larger screen.</div>');
+        $(".navbar").append(min_width_warning);
+
         return edit_mode_li[0];
     }
 
@@ -827,11 +835,10 @@ var edit_mode = new function() {
                 .make_checkbox_input(list_checkbox_config);
 
         // styling
-        $(list_checkbox).children().toggleClass("col-sm-3",false).toggleClass("col-sm-9", false).toggleClass("col-sm-1", true);
-
-        const form_group = $('<div class="form-control">').append([datatype_selector, ref_selector, list_checkbox]);
-        form_group.find(".form-control").toggleClass("form-control", false);
-        form_group.find(".col-sm-3").toggleClass("col-sm-2", true).toggleClass("col-sm-3", false);
+        //$(list_checkbox).children().toggleClass("col-sm-3",false).toggleClass("col-sm-9", false).toggleClass("col-sm-1", true);
+        $(list_checkbox).find(".caosdb-f-property-value").toggleClass("my-auto",true)
+        const form_group = $('<div class="">').append([datatype_selector, ref_selector, list_checkbox]);
+        form_group.find(".col-sm-3").toggleClass("text-end", true).toggleClass("col-sm-2", true).toggleClass("col-sm-3", false);
         form_group.find(".col-sm-9").toggleClass("col-sm-3", true).toggleClass("col-sm-9", false);
 
 
@@ -1738,8 +1745,17 @@ var edit_mode = new function() {
 
     this.toggle_edit_panel = function() {
         //$(".caosdb-f-main").toggleClass("container-fluid").toggleClass("container");
-        //$(".caosdb-f-main-entities").toggleClass("col-xs-8");
+        $(".caosdb-f-main-entities").toggleClass("caosdb-f-main-entities-edit");
         $(".caosdb-f-edit").toggle();//.toggleClass("col-xs-4");
+        this._toggle_min_width_warning();
+    }
+
+    this._toggle_min_width_warning = function() {
+        // Somewhat counter-intuitive, but when we're not in edit mode
+        // and toggle the panel, we're entering and the warning should
+        // be shown on small screens and vice-versa.
+        $(".caosdb-edit-min-width-warning").toggleClass("d-none", edit_mode.is_edit_mode());
+        $(".caosdb-edit-min-width-warning").toggleClass("d-block", !(edit_mode.is_edit_mode()));
     }
 
     this.leave_edit_mode_template = function(app) {
diff --git a/src/core/js/ext_bottom_line.js b/src/core/js/ext_bottom_line.js
index cc763d43ea5348a50605bc78f4b6db840e68ab96..2f40cd5c822c7153ef9fe8c40e7b06ffe70a3996 100644
--- a/src/core/js/ext_bottom_line.js
+++ b/src/core/js/ext_bottom_line.js
@@ -257,6 +257,7 @@ var ext_bottom_line = function($, logger, is_in_view_port, load_config, getEntit
 
     const previewShownEvent = new Event("ext_bottom_line.preview.shown");
     const previewReadyEvent = new Event("ext_bottom_line.preview.ready");
+    const previewHiddenEvent = new Event("ext_bottom_line.preview.hidden");
 
     const _css_class_preview_container = "caosdb-f-ext_bottom_line-container";
     const _css_class_preview_container_resolvable = "caosdb-f-ext_bottom_line-container-resolvable";
@@ -395,14 +396,13 @@ var ext_bottom_line = function($, logger, is_in_view_port, load_config, getEntit
      * @return {HTMLElement} the newly created container.
      */
     var add_preview_container = function(entity) {
-        const button_show = $('<button class="btn btn-sm card-footer"><span class="glyphicon glyphicon-menu-down"/> Show Preview</button>')
+        const button_show = $('<button class="btn btn-sm card-footer"><i class="bi bi-chevron-down"></i> Show Preview</button>')
             .css({
                 width: "100%",
                 padding: "0",
             })
             .addClass(_css_class_preview_container_button)
-            .hide();
-        const button_hide = $('<button class="btn btn-sm card-footer"><span class="glyphicon glyphicon-menu-up"/> Hide Preview</button>')
+        const button_hide = $('<button class="btn btn-sm card-footer"><i class="bi bi-chevron-up"></i> Hide Preview</button>')
             .css({
                 width: "100%",
                 padding: "0",
@@ -431,6 +431,9 @@ var ext_bottom_line = function($, logger, is_in_view_port, load_config, getEntit
         container.on("shown.bs.collapse", () => {
             container[0].dispatchEvent(previewShownEvent);
         });
+        container.on("hidden.bs.collapse", () => {
+            container[0].dispatchEvent(previewHiddenEvent);
+        });
         $(entity).append(container);
         $(entity).append(button_show);
         $(entity).append(button_hide);
diff --git a/src/core/js/ext_entity_state.js b/src/core/js/ext_entity_state.js
index b4f2e04eb1702636ebe45042e4e3f382efbdd1c4..101c3800fc16632f2e36778a9e0468feae43f677 100644
--- a/src/core/js/ext_entity_state.js
+++ b/src/core/js/ext_entity_state.js
@@ -158,6 +158,8 @@ const ext_entity_state = function ($, logger, edit_mode, update_state, getEntity
       $(updated_entity).find(".alert-warning, .alert-info").remove();
       edit_mode.smooth_replace(entity, updated_entity[0]);
       updated_entity[0].dispatchEvent(entity_state_transition_ready_event);
+      resolve_references.init();
+      preview.init();
     }
   }
 
diff --git a/src/core/js/ext_map.js b/src/core/js/ext_map.js
index ed4c5846468699a3d1dd6f21e95f2a39205f85fc..719d4f77943fdfca562961838dc02d95d5fd5cb1 100644
--- a/src/core/js/ext_map.js
+++ b/src/core/js/ext_map.js
@@ -749,13 +749,7 @@ var caosdb_map = new function () {
             panel.toggleClass("caosdb-f-map-panel", true);
 
             // for centered and responsive display
-            panel.toggleClass("container", true);
-
-            // TODO move to css file
-            $(panel).css({
-                "height": "500px"
-            });
-
+            panel.toggleClass(["container", "mb-2"], true);
 
             return panel[0];
         }
@@ -804,7 +798,9 @@ var caosdb_map = new function () {
                     config.tileLayer.type);
             }
 
-            var map = L.map(container, config);
+            const wrapped = $("<div/>");
+            $(container).append(wrapped);
+            var map = L.map(wrapped[0], config);
             map._crs = config.crs;
             tileLayer.addTo(map);
 
@@ -874,6 +870,13 @@ var caosdb_map = new function () {
         }
 
 
+        this.show_map = function () {
+            logger.trace("enter show_map");
+            $(".caosdb-f-map-panel").show(900, () => this
+                ._toggle_cb());
+        }
+
+
         /**
          * To be called after the map panel has been toggled.
          */
@@ -987,6 +990,7 @@ var caosdb_map = new function () {
                 // TODO split in smaller pieces and move callback to separate function
                 this.change_map_view = (view) => {
                     if (this._map) {
+			this._map._container.remove();
                         this._map.remove();
                     }
 
@@ -1473,7 +1477,7 @@ var caosdb_map = new function () {
             const link_title = entity_on_page ? "Jump to this entity." : "Browse to this entity.";
             const link = $(`<a title="${link_title}" href="${href}"/>`)
                 .addClass("pull-right")
-                .append(`<i class="bi-link"></i></a>`);
+                .append(`<i class="bi bi-box-arrow-up-right"></i></a>`);
 
             const name_label = $('<div/>')
                 // TODO move to global css
@@ -1680,7 +1684,7 @@ var caosdb_map = new function () {
                 // TODO refactor and extract function for map controls and
                 // merge with similar code from the select_handler.
                 var button = L.DomUtil.create("div",
-                    "leaflet-bar leaflet-control leaflet-control-custom"
+                    "leaflet-bar leaflet-control leaflet-control-custom caosdb-f-map-change-view-btn"
                 );
                 button.title = "Change the view";
                 // TODO move to css
@@ -1690,7 +1694,7 @@ var caosdb_map = new function () {
                 button.style.textAlign = "center";
                 button.style.marginTop = "2px";
                 button.innerHTML =
-                    '<i style="margin-top: 5px; font-size: 15px" class="bi-three-dots-vertical"></i>';
+                    '<i style="font-size: 20px" class="bi-three-dots-vertical"></i>';
 
                 button.addEventListener("click", click);
                 $(button).prepend(view_menu);
diff --git a/src/core/js/footer.js b/src/core/js/footer.js
deleted file mode 100644
index c48c5cf19c405aea326b36aba2868008466a8329..0000000000000000000000000000000000000000
--- a/src/core/js/footer.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * ** header v3.0
- * This file is a part of the CaosDB Project.
- *
- * Copyright (C) 2019 IndiScale GmbH (info@indiscale.com)
- * Copyright (C) 2019 Daniel Hornung (d.hornung@indiscale.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
- * ** end header
- */
-'use strict';
-
-/**
- * Call initially.
- * 
- * TODO refactor to async function for better readability.
- * @return something
- */
-function footer_initOnDocumentReady() {
-
-    var xhr = new XMLHttpRequest()
-
-    // TODO Refactor and use transformation.retrieveXsltScript, 
-    //
-    // Event better use the transformation module for injecting an entry point,
-    // because this implementation does not allow for non-HTML content in the
-    // caosdb-footer template.
-    xhr.open("GET", "/webinterface/${BUILD_NUMBER}/xsl/footer.xsl");
-    xhr.addEventListener('load', function() {
-        if (this.status != 200) {
-            // TODO use proper logging framework (log.getLogger("footer.js");)
-            console.log(this.status);
-            return;
-        }
-        var footer_xsl = this.responseXML;
-
-        var foot_content = $('[name = "caosdb-footer"]', footer_xsl)[0];
-        var fragment = document.createRange().createContextualFragment(
-            foot_content.innerHTML);
-        var footer = $("footer")[0];
-        footer.appendChild(fragment);
-
-    });
-    xhr.send();
-
-}
-
-$(document).ready(footer_initOnDocumentReady);
diff --git a/src/core/js/form_elements.js b/src/core/js/form_elements.js
index db2d78bc7ced3b6deeeafcda476b07c7820651d3..94607ab01a906ded9999bbfef00340d5818838f4 100644
--- a/src/core/js/form_elements.js
+++ b/src/core/js/form_elements.js
@@ -560,10 +560,8 @@ var form_elements = new function () {
             select_picker_options["liveSearchPlaceholder"] = "search...";
         }
         console.log(select)
-        // TODO find out how to use the selectpicker function or 
-      // use attributes to set options https://developer.snapappointments.com/bootstrap-select/options/
-        //$(select).selectpicker(select_picker_options);
-        //$(select).selectpicker("val", value);
+        $(select).selectpicker(select_picker_options);
+        $(select).selectpicker("val", value);
         this.init_actions_box(field);
     }
 
@@ -804,18 +802,16 @@ var form_elements = new function () {
 
 
     this.add_help = function (field, config) {
-        var help_button = $('<i data-trigger="click focus" data-bs-toggle="popover" class="caosdb-f-form-help pull-right bi-info-circle-fill"></i>')
+        var help_button = $('<a tabindex="0" role="button" data-bs-trigger="focus" data-bs-toggle="popover"><i class="caosdb-f-form-help pull-right bi-info-circle-fill"></i></a>')
             .css({
                 "cursor": "pointer"
             });
 
         if (typeof config === "string" || config instanceof String) {
-            help_button.attr("data-content", config);
-            //TODO this needs to be fixed
-            //help_button.popover();
+            help_button.attr("data-bs-content", config);
+            help_button.popover();
         } else {
-            //TODO this needs to be fixed
-            //help_button.popover(config);
+            help_button.popover(config);
         }
 
 
@@ -1301,10 +1297,7 @@ var form_elements = new function () {
      */
     this._make_field_wrapper = function (name) {
         caosdb_utils.assert_string(name, "param `name`");
-        return $('<div class="row caosdb-f-field" data-field-name="' + name + '" />')
-            .css({
-                "padding": "0"
-            })[0];
+        return $('<div class="row caosdb-f-field" data-field-name="' + name + '" />')[0];
     }
 
     /**
diff --git a/src/core/js/preview.js b/src/core/js/preview.js
index 3e45165f716de450733a02d049b52a867dee395e..c5b7752b5070796ab01fb3d007065d2a4fc6b425 100644
--- a/src/core/js/preview.js
+++ b/src/core/js/preview.js
@@ -274,6 +274,7 @@ var preview = new function() {
      * @return {HTMLElement} parameter `ref_property_elem`
      */
     this.addShowPreviewButton = function(ref_property_elem, button_elem) {
+        caosdb_utils.assert_html_element(button_elem, "param `button_elem`");
         $(ref_property_elem.getElementsByClassName("caosdb-f-property-value")[0]).prepend(button_elem);
         return ref_property_elem;
     }
@@ -414,7 +415,7 @@ var preview = new function() {
             inner.children[slide_id].appendChild(preview.preparePreviewEntity(entity));
         });
 
-        let mainDiv = $('<div class="carousel slide"></div>')[0];
+        let mainDiv = $('<div data-bs-interval="false" class="carousel slide"></div>')[0];
         mainDiv.appendChild(nav);
         mainDiv.appendChild(inner);
         mainDiv.id = carouselId;
@@ -433,7 +434,7 @@ var preview = new function() {
      * @return {jQuery} A collection of selector buttons.
      */
     this.getSelectorButtons = function(refLinksContainer) {
-        return $(refLinksContainer).find('[data-bs-slide-to]').addBack('[data-bs-slide-to]');
+        return $(refLinksContainer).find('[data-bs-slide-to]');
     }
 
     /**
@@ -511,7 +512,7 @@ var preview = new function() {
         // resolvable-reference class but did not resolve it yet.
 
         $(selectors).show();
-        $(selectors).find('a,button,.btn').each((index, button) => {
+        $(selectors).find('a.caosdb-f-reference-value').each((index, button) => {
             $(button).toggleClass("active", index === 0);
             button.removeAttribute("href");
             button.setAttribute("data-bs-slide-to", index);
@@ -744,8 +745,11 @@ var preview = new function() {
      * @return {HTMLElement[]} A collection of links.
      */
     this.getReferenceLinks = function(refLinksContainer) {
-        return $(refLinksContainer)
-            .find('a').addBack('a').has('.caosdb-id').toArray();
+        var cont = $(refLinksContainer);
+        if (cont.is("a.caosdb-f-reference-value")) {
+            return cont.toArray();
+        }
+        return cont.find('a.caosdb-f-reference-value').toArray();
     }
 };
 
diff --git a/src/core/js/query_shortcuts.js b/src/core/js/query_shortcuts.js
index b2304e6cb760b9e3e13bb9e330e72230dd8f6a29..af75516767b7a354562d7fdea744bc458047e500 100644
--- a/src/core/js/query_shortcuts.js
+++ b/src/core/js/query_shortcuts.js
@@ -162,17 +162,6 @@ var query_shortcuts = new function() {
             $("#caosdb-query-panel").append(shortcuts_panel);
         }
 
-        //TODO still necessary?
-        /*
-        header.find("span.caosdb-f-shortcuts-panel-header-title")
-            .prepend(toggle_button);
-
-        // initially hide panel or restore old visibility
-        if(sessionStorage[this._cache_visibility_key] !== "true") {
-            toggle_button.click();
-        }
-        */
-
         return shortcuts_panel[0];
 
     }
@@ -532,12 +521,7 @@ var query_shortcuts = new function() {
 
         // show results in query panel
         form.addEventListener("caosdb.form.success", function(e) {
-            form.addEventListener("caosdb.form.cancel", function(e) {
-                // reset shortcuts
-                query_panel.show();
-                query_shortcuts.reset();
-            }, true);
-
+            query_panel.show();
         }, true);
 
         form.addEventListener("caosdb.form.submit", function(e) {
@@ -625,7 +609,6 @@ var query_shortcuts = new function() {
         var ret = $(
             `<div class="alert alert-` + type + ` alert-dismissible" role="alert">
               <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
               </button>
             </div>`);
         ret.append(content);
diff --git a/src/core/js/tour.js b/src/core/js/tour.js
index 7c84a30b5a6b454d2f4c090c9e0903ee9049f487..b8ee39732eb0542e74ca4bced38a9203469b5aea 100644
--- a/src/core/js/tour.js
+++ b/src/core/js/tour.js
@@ -125,9 +125,11 @@ var tour = new function () {
 
             this.id = config.id || parent_set.id + "-psid-" + idx;
 
-            for (const element of config.elements) {
-                const next = tour.add_tour_element(element, this, this._elements.length);
-                this._elements.push(next);
+            if (config.elements) {
+                for (const element of config.elements) {
+                    const next = tour.add_tour_element(element, this, this._elements.length);
+                    this._elements.push(next);
+                }
             }
 
             // set some defaults
@@ -145,6 +147,10 @@ var tour = new function () {
             }
         }
 
+        _tour_active () {
+            return this.parent_set._tour_active();
+        }
+
         _activate_by_id(id) {
             this.parent_set._activate_by_id(id);
         }
@@ -181,7 +187,7 @@ var tour = new function () {
          */
         create_menu_entry() {
             var menuid = 'tour-submenu-' + this.name.replace(/ /g, "");
-            var page_set_entry = $("<li class='mb-1 caosdb-f-tour-overview-entry caosdb-v-tour-overview-entry-pageset'/><button class='caosdb-v-tour-toc-pageset btn' data-bs-toggle='collapse' data-bs-target='#" + menuid + "' aria-expanded='false'>" + this.name + "</button><div id='" + menuid + "'class='collapse'><ul class='btn-toggle-nav list-unstyled fw-normal pb-1 small'></ul></div></li>");
+            var page_set_entry = $("<li class='mb-1 caosdb-f-tour-overview-entry caosdb-v-tour-overview-entry-pageset'/><button class='caosdb-v-tour-toc-pageset btn' data-bs-toggle='collapse' data-bs-target='#" + menuid + "' aria-expanded='false'>" + this.name + "</button><div id='" + menuid + "'class='collapse'><ul class='btn-toggle-nav list-unstyled fw-normal pb-1'></ul></div></li>");
             var elements_list = page_set_entry.find("ul")[0];
 
             // store menu_entry for highlightng opened pages/chapters.
@@ -189,7 +195,9 @@ var tour = new function () {
 
             for (const element of this.elements) {
                 const next = element.create_menu_entry();
-                elements_list.append(next);
+                if (next) {
+                    elements_list.append(next);
+                }
             }
             return page_set_entry;
         }
@@ -365,7 +373,7 @@ var tour = new function () {
         _on_popover_open() {
             caosdb_utils.assert_not_undefined(this.popover, "this.popover");
             caosdb_utils.assert_not_undefined(this.popover.tip, "this.popover.tip");
-            //this._scroll_into_view(this.popover.tip);
+            this._scroll_into_view(this.popover.tip);
 
             // initialize close button
             const cb = $(this.popover.tip).find(".caosdb-f-tour-popover-close-button")
@@ -406,7 +414,7 @@ var tour = new function () {
             if (this.get_next()) {
                 if (this.config.force_manual_action){
                     nb.toggleClass("disabled", true);
-                    nb.attr("title","Manual action required!")
+                    nb.parent().attr("title","Manual action required!")
                 } else {
                     nb.on("click", (e) => {
                         const pn = this.get_next()
@@ -461,6 +469,10 @@ var tour = new function () {
                         final_target.removeEventListener(ev, call_init, true);
                     }
                     this._init(button, config);
+                    if (this.config.init["open"]) {
+                        // open immediately
+                        sessionStorage["tour-page-open-next"] = this.config.id;
+                    }
                     if (this.active && sessionStorage["tour-page-open-next"] == this.config.id) {
                         if (this.config.show_button){
                             $(this.button).show();
@@ -482,8 +494,8 @@ var tour = new function () {
                 // now set up the triggering of the deinitialization
                 const ev = config.deinit["event"];
 
-                var final_target = this._get_body_or_target(config.deinit["target"])
-                var call_init = () => {
+                const final_target = this._get_body_or_target(config.deinit["target"])
+                const call_init = () => {
                     this._deinit(button, config);
                     $(this.button).hide();
                     if (this.popover){
@@ -497,20 +509,19 @@ var tour = new function () {
         }
 
         /*
-         * returns the document body if target is undefined, jquery object of
+         * returns the document body if target is undefined, HTMLElement of
          * target otherwise
          */
         _get_body_or_target(target){
-            var final_target = document.body;
-            if (typeof target != "undefined") {
-                target = $(target);
-                if (target.length > 0) {
-                    final_target = target[0];
-                } else {
-                    throw new Error("could not find the init target");
-                }
+            if (typeof target == "undefined") {
+                return document.body;
             }
-            return final_target
+
+            const final_target = $(target);
+            if (final_target.length < 1) {
+                throw new Error("could not find the target");
+            }
+            return final_target[0];
         }
 
         /**
@@ -547,11 +558,18 @@ var tour = new function () {
         /** create_menu_enrty for a Page */
         create_menu_entry() {
             const id_anchor = `#${this.config.id}`;
-            var detour = ""
+
+            if (this.config.do_not_show_in_toc) {
+                return;
+            }
+            var classes = ""
             if (this.config.detour){
-                detour = " bg-warning"
+                classes = " caosdb-v-tour-toc-detour"
+            }
+            if (sessionStorage["tour-page-open-cur"] == this.config.id) {
+                classes = classes + " caosdb-v-tour-toc-cur";
             }
-            var entry = $("<li class='caosdb-f-tour-overview-entry caosdb-v-tour-overview-entry-page"+detour+"' />");
+            var entry = $("<li class='caosdb-f-tour-overview-entry caosdb-v-tour-overview-entry-page" + classes + "' />");
             var link = $("<a href='" + this.config.href + id_anchor + "'>" + this.name + "</a>")[0];
 
             $(link).click((e) => {
@@ -611,6 +629,7 @@ var tour = new function () {
 
         _highlight_menu() {
             $(".caosdb-v-tour-toc-active-item").toggleClass("caosdb-v-tour-toc-active-item", false);
+            $(".caosdb-v-tour-toc-cur").toggleClass("caosdb-v-tour-toc-cur", false);
             $(this.menu_entry).toggleClass("caosdb-v-tour-toc-active-item", true);
         }
 
@@ -640,6 +659,19 @@ var tour = new function () {
                 // not initialized yet.
                 this.popover = new bootstrap.Popover(target, this.popover_options);
 
+                const events = [
+                  "ext_bottom_line.preview.ready",
+                  "caosdb.preview.ready",
+                  "caosdb.preview.show",
+                  "caosdb.preview.hide",
+                  "shown.bs.collapse",
+                  "hidden.bs.collapse",
+                ];
+                for (let ev of events) {
+                    document.body.addEventListener(ev, () => {
+                        this.popover.update();
+                    }, true);
+                }
                 target.addEventListener("shown.bs.popover", (e) => {
                     if (this.active){
                         this._on_popover_open();
@@ -655,9 +687,18 @@ var tour = new function () {
             return this.popover;
         }
 
+        _before_open() {
+            if (this.config["before_open"]) {
+                const f = new Function(this.config["before_open"]);
+                f();
+            }
+        }
+
         _open() {
+            this._before_open();
             const button = $(this.button);
             const target = $(this.config["target"])
+            sessionStorage["tour-page-open-cur"] = this.config.id;
             if (button.is(".caosdb-f-tour-open-page")) {
                 return; // already open
             }
@@ -665,8 +706,10 @@ var tour = new function () {
                 return; // element to attach to not available; can't open
             }
             if (this.get_next()) {
-                logger.debug(`Set next page in session store to `, this.get_next().config.id);
-                sessionStorage["tour-page-open-next"] = this.get_next().config.id
+                if ($(`#${this.get_next().config.id}`).length == 0) {
+                    logger.debug(`Set next page in session store to `, this.get_next().config.id);
+                    sessionStorage["tour-page-open-next"] = this.get_next().config.id
+                }
             }
             target.on('hidden.bs.popover', (e) => {
                 button[0].dispatchEvent(tour.close_page_event);
@@ -775,6 +818,10 @@ var tour = new function () {
             }
         }
 
+        _tour_active () {
+            return this.parent_set._tour_active();
+        }
+
         /**
          * Hook the button to (de)activation events.
          */
@@ -794,8 +841,10 @@ var tour = new function () {
                                 target.addEventListener(
                                     act.event,
                                     (e) => {
-                                        logger.debug("Activate", this.config.id, "due to ", act.event)
-                                        this.activate();
+                                        if (this._tour_active()) {
+                                            logger.debug("Activate", this.config.id, "due to ", act.event)
+                                            this.activate();
+                                        }
                                     }
                                 );
                             }
@@ -1012,7 +1061,7 @@ var tour = new function () {
             }
             let popover_template = '<div class="popover" role="tooltip" style="z-index:20000; ' +
                 popover_style +
-                '"><div class="popover-arrow"></div><button class="btn btn-close caosdb-f-tour-popover-close-button caosdb-v-tour-popover-close-button"></button><h3 class="popover-header"></h3><div class="popover-body popover-content"></div><div class="p-3 pt-0" style="display:flex;"><button class="btn btn-sm btn-secondary caosdb-v-tour-pn-btn me-auto" data-role="prev">Previous</button><button class="btn btn-sm btn-secondary caosdb-v-tour-pn-btn" data-role="next">Next</button></div></div>';
+                '"><div class="popover-arrow"></div><button class="btn btn-close caosdb-f-tour-popover-close-button caosdb-v-tour-popover-close-button"></button><h3 class="popover-header"></h3><div class="popover-body popover-content"></div><div class="p-3 pt-0 d-flex justify-content-between" ><span><button class="btn btn-sm btn-secondary caosdb-v-tour-pn-btn me-auto" data-role="prev">Previous</button></span><span><button class="btn btn-sm btn-secondary caosdb-v-tour-pn-btn" data-role="next">Next</button></span></div></div>';
 
             button.attr("title", title);
 
@@ -1124,6 +1173,11 @@ var tour = new function () {
                 globalError(error);
             }
         }
+
+        // reset if build number changed
+        if (config && config.tour && config.tour._build_number != "${BUILD_NUMBER}") {
+            config = undefined;
+        }
         if (!config || config.length == 0 || config.tour.length == 0) {
             logger.info("No old tour state in the localStorage.");
             // try to fetch 
@@ -1136,6 +1190,8 @@ var tour = new function () {
             return;
         }
 
+        // store build number in tour config
+        config.tour._build_number = "${BUILD_NUMBER}";
         tour.configure(config.tour);
     }
 
@@ -1143,31 +1199,41 @@ var tour = new function () {
         if (element.page_set) {
             // it's a page_set
             return tour.add_tour_page_set(element, parent_set, idx);
+        } else if (typeof element.separator != "undefined") {
+            // it's a separator
+            return tour.add_tour_menu_separator();
         } else {
             // it's a page
             return tour.add_tour_page(element, parent_set, idx);
         }
     }
 
-
     this.add_tour_page_set = function (config, parent_set, idx) {
         return new tour.PageSet(parent_set, config, idx);
     }
 
+    this.add_tour_menu_separator = function (element) {
+        return {
+            create_menu_entry: () => $("<hr>")[0],
+            init_activation: function() {},
+            _deactivate: function() {},
+        }
+    }
+
     this.Tour = class {
         constructor(config) {
             this.full_name = "Tour";
             this.id = config.id || "tour0";
             this.config = config;
             this.elements = new Array();
-            this.start_tour_button = $('<a class="dropdown-item" id="caosdb-tour-start-btn">Start Tour</a>');
-            this.leave_tour_button = $('<a class="dropdown-item disabled caosdb-f-leave-tour" id="caosdb-tour-leave-btn">Leave Tour</a>');
-            this.reset_tour_button = $('<a class="dropdown-item disabled" id="caosdb-tour-reset-btn">Reset Tour</a>');
             this.active = false;
 
-            var menuitem = $(' <li class="dropdown" id="caosdb-navbar-tour"> <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"> Tour <span class="caret"></span></a><ul class="dropdown-menu"></ul></li>')
+            var menuitem = $('<li class="nav-item" id="caosdb-navbar-tour"><a href="#" class="d-none nav-link caosdb-f-start-tour-btn" title="Start a Tour">Tour</a><a href="#" title="Leave the Tour" class="d-none caosdb-f-leave-tour-btn nav-link">Tour</a></li>')
             $(".caosdb-navbar").append(menuitem);
 
+            var min_width_warning = $('<div class="alert alert-warning caosdb-tour-min-width-warning d-lg-none" role="alert"><strong>Warning</strong> This tour is optimized for screens wider than 992px. If you have trouble displaying elements of this tour, please try accessing it on a larger screen.</div>');
+            $(".navbar").append(min_width_warning);
+
             for (const element of this.config.elements) {
                 const next = tour.add_tour_element(element, this, this.elements.length);
                 this.elements.push(next);
@@ -1185,24 +1251,11 @@ var tour = new function () {
                 this.config.deactivate_other = true;
             }
 
-            menuitem.find("ul").append($(' <li> </li>').append(this.start_tour_button));
-            menuitem.find("ul").append($(' <li> </li>').append(this.reset_tour_button));
-            menuitem.find("ul").append($(' <li> </li>').append(this.leave_tour_button));
-            // TODO - move to tour-page href
-            this.start_tour_button.on("click", () => {
-                this.activate();
-            });
-            $(".caosdb-f-leave-tour").click((e) => {
+            $(".caosdb-f-leave-tour-btn").click((e) => {
                 this.deactivate();
-                $(".caosdb-v-tour-toc-show").toggleClass("visible", false);
             });
-            this.reset_tour_button.on("click", () => {
-                this.reset_tour();
-            });
-            $(".caosdb-f-tour-toc-toggle").click((e) => {
-                $(".caosdb-v-tour-toc-sidebar").toggleClass("caosdb-v-tour-toc-hidden");
-                $("body").toggleClass("tour-sidebar-visible");
-                $(".caosdb-v-tour-toc-show").toggleClass("visible");
+            $(".caosdb-f-start-tour-btn").click((e) => {
+                this.activate();
             });
 
             this.update();
@@ -1211,7 +1264,22 @@ var tour = new function () {
             this._elements_by_id = {};
             this._tour_pages = [];
             this._index_elements(this._elements_by_id, this._tour_pages, this);
+            this._toggle_tour_buttons();
+            this._toggle_width_warning();
+        }
+
+        _toggle_tour_buttons() {
+            $(".caosdb-f-leave-tour-btn").toggleClass("d-none", !this.active);
+            $(".caosdb-f-start-tour-btn").toggleClass("d-none", this.active);
+        }
+
+        _toggle_width_warning() {
+            $(".caosdb-tour-min-width-warning").toggleClass("d-block", this.active);
+            $(".caosdb-tour-min-width-warning").toggleClass("d-none", !this.active);
+        }
 
+        _tour_active () {
+            return this.active;
         }
 
         /**
@@ -1304,6 +1372,8 @@ var tour = new function () {
             for (const element of this.elements) {
                 element._deactivate();
             }
+
+            sessionStorage.removeItem("tour-page-open-next")
         }
 
         /**
@@ -1321,25 +1391,19 @@ var tour = new function () {
             } else {
                 tour.configure(config.tour);
             }
-            // A bit ugly, but the reset button will be removed or completely
-            // changed for production anyways.
             location.reload();
         }
 
         _deactivate() {
             if (this.active) {
-                this.set_tour_button_text("Start A Tour");
                 logger.debug("Tour._deactivate tour");
                 this.old_state_active = false;
                 this.active = false;
                 this._hide_tour_sidebar();
-                $("#caosdb-tour-start-btn").removeClass("disabled");
-                $("#caosdb-tour-reset-btn").addClass("disabled");
-                $("#caosdb-tour-leave-btn").addClass("disabled");
+                this._toggle_tour_buttons();
+                this._toggle_width_warning();
                 this.update();
             }
-            this.leave_tour_button.hide();
-            this.reset_tour_button.hide();
         }
 
         _hide_tour_sidebar() {
@@ -1352,18 +1416,14 @@ var tour = new function () {
 
         _activate() {
             if (!this.active) {
-                this.set_tour_button_text("Tour");
                 logger.debug("Tour._activate tour");
                 this.old_state_active = true;
                 this.active = true;
                 this._show_tour_sidebar();
-                $("#caosdb-tour-start-btn").addClass("disabled");
-                $("#caosdb-tour-reset-btn").removeClass("disabled");
-                $("#caosdb-tour-leave-btn").removeClass("disabled");
+                this._toggle_tour_buttons();
+                this._toggle_width_warning();
                 this.update();
             }
-            this.leave_tour_button.show();
-            this.reset_tour_button.show();
         }
 
         /**
@@ -1390,15 +1450,13 @@ var tour = new function () {
             }
         }
 
-        set_tour_button_text(text) {
-            $("button.caosdb-f-tour-button").text(text);
-        }
-
         create_tour_overview_panel() {
             var tour_overview = $('<ul class="list-unstyled caosdb-v-tour-overview"/>');
             for (const element of this.elements) {
                 const next = element.create_menu_entry();
-                tour_overview.append(next);
+                if (next) {
+                    tour_overview.append(next);
+                }
             }
             $("#tour-toc .caosdb-f-tour-toc-body").empty().append(tour_overview);
         }
@@ -1437,7 +1495,8 @@ var tour = new function () {
         }
 
         if (typeof sessionStorage["tour-page-open-next"] === "undefined") {
-            sessionStorage["tour-page-open-next"] = instance._tour_pages[0];
+            const next = sessionStorage["tour-page-open-cur"] || instance._tour_pages[0];
+            sessionStorage["tour-page-open-next"] = next
         }
         instance.init_activation(config.persistent_state);
 
diff --git a/src/core/js/webcaosdb.js b/src/core/js/webcaosdb.js
index 8ac786b65aff09e50afe1580d2df3c8a109efbc8..4142575d96b197ecd2608a4f3b520203bd9dbbd7 100644
--- a/src/core/js/webcaosdb.js
+++ b/src/core/js/webcaosdb.js
@@ -1283,6 +1283,13 @@ var paging = new function () {
         }
         return index + "L" + length;
     }
+
+    this.init = function () {
+        var response_count = document.body.getAttribute("data-response-count");
+        if (parseInt(response_count) >= 0) {
+            paging.initPaging(window.location.href, response_count);
+        }
+    }
 };
 
 var queryForm = new function () {
@@ -1861,18 +1868,12 @@ this.user_management = function ($, connection, createWaitingNotification, creat
     };
 }($, connection, createWaitingNotification, createErrorNotification);
 
-/**
- * When the page is scrolled down 100 pixels, the scroll-back button appears.
- * 
- * @return FIXME
- */
 
 /**
- * Every initial function calling is done here.
- * 
- * @return TODO
+ * Initialize all the submodules.
  */
 function initOnDocumentReady() {
+    paging.init();
     hintMessages.init();
 
     // init query form
@@ -1883,15 +1884,16 @@ function initOnDocumentReady() {
 
     // show image 100% width
     $(".entity-image-preview").click(function () {
-        $(this).css('width', '100%');
-        $(this).css('max-width', "");
+        $(this).css('max-width', '100%');
         $(this).css('max-height', "");
     });
 
-    if (typeof caosdb_modules.auto_init === "undefined") {
+    if (typeof _caosdb_modules_auto_init === "undefined") {
         // the test index.html sets this to false, 
         // unset -> no tests
         caosdb_modules.auto_init = true;
+    } else {
+        caosdb_modules.auto_init = _caosdb_modules_auto_init;
     }
     caosdb_modules.init();
     navbar.init();
diff --git a/src/core/webcaosdb.xsl b/src/core/webcaosdb.xsl
index c78aa1ac759c1ad471d38432dd09e66ae3feba1b..9d0dd2e235ca59ce6f4e7b75acd59e063e322751 100644
--- a/src/core/webcaosdb.xsl
+++ b/src/core/webcaosdb.xsl
@@ -44,8 +44,7 @@
     <div class="caosdb-v-tour-toc-header">
       <h3>Tour</h3>
     </div>
-    <div class="caosdb-f-tour-toc-body">
-    </div>
+    <div class="caosdb-f-tour-toc-body"></div>
     <!--<button class="btn btn-light caosdb-f-leave-tour">Leave Tour</button>-->
     <!--<div class="caosdb-v-tour-footer">-->
         <!--<button class="caosdb-f-tour-toc-toggle btn btn-light">Hide</button>-->
@@ -70,10 +69,21 @@
         <xsl:call-template name="caosdb-head-js" />
       </head>
       <body>
-        <xsl:call-template name="caosdb-tour-toc" />
-        <xsl:call-template name="caosdb-top-navbar" />
-        <xsl:call-template name="caosdb-data-container" />
-        <footer>
+        <xsl:attribute name="data-response-count">
+          <xsl:value-of select="/Response/@count"/>
+        </xsl:attribute>
+        <xsl:if test="count(/Response/*)&lt;3 and not(/Response/Error|/Response/Info|/Response/Warning)">
+            <xsl:attribute name="class">caosdb-welcome</xsl:attribute>
+        </xsl:if>
+        <div class="background d-flex flex-column">
+          <xsl:call-template name="caosdb-tour-toc" />
+          <xsl:call-template name="caosdb-top-navbar" />
+          <xsl:call-template name="caosdb-data-container" />
+          <xsl:if test="count(/Response/*)&lt;3 and not(/Response/Error|/Response/Info|/Response/Warning)">
+            <xsl:call-template name="welcome"/>
+          </xsl:if>
+        </div>
+        <footer class="py-5">
           <xsl:call-template name="caosdb-footer"/>
         </footer>
       </body>
diff --git a/src/core/xsl/annotation.xsl b/src/core/xsl/annotation.xsl
index 0ba6f0a1ad2f04e86f296f53f5826d00ab871e58..1ed1d28fe00cffaa2bde79cd7fef070b49771b38 100644
--- a/src/core/xsl/annotation.xsl
+++ b/src/core/xsl/annotation.xsl
@@ -24,7 +24,7 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:output method="html"/>
   <xsl:template match="Version" mode="comment-annotation-header">
-    <h4 class="media-heading">
+    <div class="caosdb-f-comment-header">
       <xsl:value-of select="@username"/>
       <small>
         <i>
@@ -32,32 +32,23 @@
           <xsl:value-of select="@date"/>
         </i>
       </small>
-    </h4>
+    </div>
   </xsl:template>
-  <xsl:template match="History" mode="comment-annotation-header">
-    <h4 class="media-heading">
-      <xsl:value-of select="@username"/>
+  <xsl:template match="Property" mode="comment-annotation-text">
+    <div class="caosdb-f-comment-body">
       <small>
-        <i>
-          <xsl:text> posted on </xsl:text>
-          <xsl:value-of select="@datetime"/>
-        </i>
+        <p class="caosdb-comment-annotation-text">
+          <xsl:value-of select="text()"/>
+        </p>
       </small>
-    </h4>
-  </xsl:template>
-  <xsl:template match="Property" mode="comment-annotation-text">
-    <p class="caosdb-comment-annotation-text">
-      <xsl:value-of select="text()"/>
-    </p>
+    </div>
   </xsl:template>
   <xsl:template match="Record" mode="comment-annotation">
-    <div class="media">
-      <div class="media-left">
-        <h3>
-          <xsl:text>»</xsl:text>
-        </h3>
+    <div class="d-flex">
+      <div class="d-shrink-0">
+        <xsl:text>»</xsl:text>
       </div>
-      <div class="media-body">
+      <div class="flex-grow-1 ms-3">
         <xsl:apply-templates mode="comment-annotation-header" select="Version[@head='true']"/>
         <xsl:apply-templates mode="comment-annotation-text" select="Property[@name='comment']"/>
       </div>
diff --git a/src/core/xsl/entity.xsl b/src/core/xsl/entity.xsl
index fb008ef42988f4d427c3dcaa30b8e89db2c214ca..95f5031975d99b9252474ac7469c214b22b5ef68 100644
--- a/src/core/xsl/entity.xsl
+++ b/src/core/xsl/entity.xsl
@@ -26,19 +26,19 @@
   <!-- These little colored Rs, RTs, Ps, and Fs which hilite the beginning 
         of a new entity. -->
   <xsl:template match="Property" mode="entity-heading-label">
-    <span class="badge caosdb-f-entity-role caosdb-label-property"
+    <span class="badge caosdb-f-entity-role caosdb-label-property me-1"
     data-entity-role="Property" title="This entity is a Property.">P</span>
   </xsl:template>
   <xsl:template match="Record" mode="entity-heading-label">
-    <span class="badge caosdb-f-entity-role caosdb-label-record"
+    <span class="badge caosdb-f-entity-role caosdb-label-record me-1"
     data-entity-role="Record" title="This entity is a Record.">R</span>
   </xsl:template>
   <xsl:template match="RecordType" mode="entity-heading-label">
-    <span class="badge caosdb-f-entity-role caosdb-label-recordtype"
+    <span class="badge caosdb-f-entity-role caosdb-label-recordtype me-1"
     data-entity-role="RecordType" title="This entity is a Record Type.">RT</span>
   </xsl:template>
   <xsl:template match="File" mode="entity-heading-label">
-    <span class="badge caosdb-f-entity-role caosdb-label-file"
+    <span class="badge caosdb-f-entity-role caosdb-label-file me-1"
     data-entity-role="File" title="This entity is a File.">F</span>
   </xsl:template>
   <xsl:template match="@id" mode="backreference-link">
@@ -74,7 +74,7 @@
       <em class="caosdb-entity-heading-attr-name">
         <xsl:value-of select="concat(name(),':')"/>
       </em>
-      <a class="nav-link">
+      <a>
         <xsl:call-template name="make-filesystem-link">
           <xsl:with-param name="href" select="."/>
         </xsl:call-template>
@@ -119,14 +119,14 @@
         <xsl:attribute name="data-entity-datatype">
           <xsl:value-of select="@datatype"/>
         </xsl:attribute>
-        <div class="d-flex flex-wrap">
+        <div class="d-flex flex-wrap align-items-baseline">
               <xsl:apply-templates mode="entity-heading-label" select="."/>
               <!-- Parents -->
               <span class="caosdb-f-parent-list">
                 <xsl:if test="Parent">
                   <!-- <xsl:apply-templates select="Parent" mode="entity-body" /> -->
                   <xsl:for-each select="Parent">
-                    <span class="badge caosdb-parent-item">
+                    <span class="badge caosdb-parent-item me-1">
                       <!-- TODO lots of code duplication with parent.xsl -->
                       <xsl:attribute name="id">
                         <xsl:value-of select="generate-id()"/>
@@ -153,14 +153,14 @@
                 <xsl:with-param name="entityId" select="@id"/>
                 <xsl:with-param name="hasSuccessor" select="Version/Successor"/>
               </xsl:apply-templates>
+              <xsl:apply-templates mode="backreference-link" select="@id"/>
               <!-- Button for expanding/collapsing the comments section-->
-              <button class="btn" data-bs-toggle="collapse" title="Toggle the comments section at the bottom of this entity.">
+              <button class="btn caosdb-v-entity-comment-badge" data-bs-toggle="collapse" title="Toggle the comments section at the bottom of this entity.">
                 <xsl:attribute name="data-bs-target">
                   <xsl:value-of select="concat('#', 'comment_', $entityid)"/>
                 </xsl:attribute>
                 <i class="bi-chat-left-fill"/>
               </button>
-              <xsl:apply-templates mode="backreference-link" select="@id"/>
               <span class="badge bg-dark caosdb-id caosdb-id-button d-none">
                 <xsl:value-of select="@id"/>
               </span>
@@ -245,18 +245,18 @@
   <xsl:template match="Property" mode="property-collapsed">
     <xsl:param name="collapseid"/>
     <div class="row">
-      <div class="col-sm-4">
+      <div class="col-sm-6 col-md-4 caosdb-v-property-left-col">
           <xsl:if test="@*[not(contains('+cuid+id+name+',concat('+',name(),'+')))]">
-            <i data-bs-toggle="collapse" style="position: absolute; left: 0.4em;" class="bi-caret-down-square fs-6 caosdb-clickable">
+            <i data-bs-toggle="collapse" style="position: absolute; left: 1rem;" class="bi-caret-down-square fs-6 caosdb-clickable">
               <xsl:attribute name="data-bs-target">
                 <xsl:value-of select="concat('#',$collapseid)"/>
               </xsl:attribute>
             </i>
           </xsl:if>
-          <strong class="caosdb-property-name"> <xsl:value-of select="@name"/></strong>
+          <span class="caosdb-property-name"> <xsl:value-of select="@name"/></span>
       </div>
       <!-- collapsed data -->
-      <div class="collapse">
+      <div class="collapse order-sm-last">
         <xsl:attribute name="id">
           <xsl:value-of select="$collapseid"/>
         </xsl:attribute>
@@ -269,7 +269,7 @@
         </dl>
       </div>
       <!-- property value -->
-      <div class="col caosdb-f-property-value">
+      <div class="col-sm-6 col-md-8 caosdb-f-property-value">
         <xsl:apply-templates mode="property-value" select="."/>
       </div>
     </div>
@@ -455,20 +455,20 @@
     </xsl:choose>
   </xsl:template>
   <xsl:template match="@*" mode="property-attributes">
-    <dt class="col-6 mb-0"><xsl:value-of select="name()"/></dt>
-    <dd class="col-6 mb-0">
+    <dt class="col-6 col-md-4 mb-0"><xsl:value-of select="name()"/></dt>
+    <dd class="col-6 col-md-8 mb-0">
       <xsl:value-of select="."/>
     </dd>
   </xsl:template>
   <xsl:template match="@datatype" mode="property-attributes-type">
-    <dt class="col-6 mb-0">data type</dt>
-    <dd class="col-6 mb-0 caosdb-property-datatype">
+    <dt class="col-6 col-md-4 mb-0">data type</dt>
+    <dd class="col-6 col-md-8 mb-0 caosdb-property-datatype">
       <xsl:value-of select="."/>
     </dd>
   </xsl:template>
   <xsl:template match="@id" mode="property-attributes-id">
-    <dt class="col-6 mb-0">id</dt>
-    <dd class="col-6 mb-0">
+    <dt class="col-6 col-md-4 mb-0">id</dt>
+    <dd class="col-6 col-md-8 mb-0">
       <a class="caosdb-property-id">
         <xsl:attribute name="href">
           <xsl:value-of select="concat($entitypath,.)"/>
@@ -488,10 +488,10 @@
       <xsl:attribute name="id">
         <xsl:value-of select="$collapseId"/>
       </xsl:attribute>
-      <li class="list-group-item caosdb-comments-heading">
+      <li class="list-group-item caosdb-comments-heading d-flex">
         <i class="bi-chat-left-fill" style="margin-right: 1em;"/>
         <strong class="small">Comments</strong>
-        <button class="btn btn-sm pull-right caosdb-new-comment-button">
+        <button class="btn btn-sm pull-right caosdb-new-comment-button ms-auto">
           <strong>add new comment</strong>
         </button>
       </li>
@@ -550,7 +550,7 @@
                 </xsl:if>
                 <dl class="row caosdb-f-transition">
                 <xsl:for-each select="Transition">
-                  <dt class="col-sm-4"><button class="btn btn-secondary label label-info caosdb-f-entity-state-transition-button" type="button">
+                  <dt class="col-sm-4 mb-2"><button class="btn btn-secondary badge caosdb-f-entity-state-transition-button fs-6" type="button">
                         <xsl:attribute name="data-to-state"><xsl:value-of select="ToState/@name"/></xsl:attribute>
                         <xsl:attribute name="data-transition-name"><xsl:value-of select="@name"/></xsl:attribute>
                         <xsl:attribute name="title">Transition to state '<xsl:value-of select="ToState/@name"/>'. <xsl:if test="ToState/@description"><xsl:value-of select="ToState/@description"/></xsl:if></xsl:attribute>
@@ -560,7 +560,7 @@
                           </xsl:attribute>
                         </xsl:if>
                       <xsl:value-of select="@name"/></button></dt>
-                  <dd class="col"><xsl:value-of select="@description"/></dd>
+                  <dd class="col-sm-8"><xsl:value-of select="@description"/></dd>
                 </xsl:for-each>
                 </dl>
               </xsl:otherwise>
@@ -609,9 +609,9 @@
                 <xsl:value-of select="' bg-danger'"/>
               </xsl:if>
             </xsl:attribute>
-              <p class="caosdb-entity-heading-attr">
+              <p class="caosdb-entity-version-attr">
                 <h4 class="modal-title">Version Info</h4>
-                <em class="caosdb-entity-heading-attr-name">
+                <em class="caosdb-entity-version-attr-name">
                 This is
                 <xsl:if test="not(@head='true')"><b>not</b></xsl:if>
                 the latest version of this entity.
diff --git a/src/core/xsl/footer.xsl b/src/core/xsl/footer.xsl
index 0b034e9d5a3b170305b85567f34732ac04755f91..0231649d4ff4deda68822eecf25576175a5eed00 100644
--- a/src/core/xsl/footer.xsl
+++ b/src/core/xsl/footer.xsl
@@ -26,20 +26,24 @@
   <xsl:output method="html"/>
 
   <xsl:template name="caosdb-footer">
-    <div class="caosdb-footer-element" id="caosdb-footer-element-custom-1">
-      ${BUILD_FOOTER_CUSTOM_ELEMENT_ONE}
+    <div class="container d-flex flex-lg-row flex-column justify-content-around">
+      <div class="caosdb-footer-element" id="caosdb-footer-element-custom-1">
+        ${BUILD_FOOTER_CUSTOM_ELEMENT_ONE}
+      </div>
+      <div class="caosdb-footer-element" id="caosdb-footer-element-custom-2">
+        ${BUILD_FOOTER_CUSTOM_ELEMENT_TWO}
+      </div>
     </div>
-    <div class="caosdb-footer-element" id="AGPL-notice">
-      This server runs free software licensed under the <a
-      href="https://www.gnu.org/licenses/agpl-3.0.en.html"
-      target="_blank">AGPL-v3</a>, you can obtain the sources <a
-      href="https://gitlab.com/caosdb" target="_blank">here</a>.
-    </div>
-    <div class="caosdb-footer-element" id="caosdb-footer-element-custom-2">
-      ${BUILD_FOOTER_CUSTOM_ELEMENT_TWO}
-    </div>
-    <div class="caosdb-footer-element">
-      <a href="${BUILD_FOOTER_DATA_POLICY_HREF}">Data Policy</a><span class="caosdb-bulletsep">•</span><a href="/webinterface/${BUILD_NUMBER}/html/imprint.html">Imprint/Impressum</a>
+    <div class="container d-flex flex-md-row flex-column justify-content-center">
+      <a href="mailto:info@indiscale.com">Contact</a>
+      <span class="caosdb-bulletsep d-none d-md-inline">•</span>
+      <a href="https://www.indiscale.com/imprint/">Imprint/Impressum</a>
+      <span class="caosdb-bulletsep d-none d-md-inline">•</span>
+      <a href="${BUILD_FOOTER_DATA_POLICY_HREF}">Data Policy</a>
+      <span class="caosdb-bulletsep d-none d-md-inline">•</span>
+      <a href="https://www.gnu.org/licenses/agpl-3.0.en.html" target="_blank">License (AGPL-v3)</a>
+      <span class="caosdb-bulletsep d-none d-md-inline">•</span>
+      <a href="https://gitlab.com/caosdb" target="_blank">Sources</a>
     </div>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/src/core/xsl/main.xsl b/src/core/xsl/main.xsl
index f6a3ce4fb0513afe6b4555b64f66cf3a4b152bae..c14c7ff28f3d172f6c067740fedfcfe036546bb5 100644
--- a/src/core/xsl/main.xsl
+++ b/src/core/xsl/main.xsl
@@ -87,204 +87,21 @@
     </xsl:element>
     <xsl:element name="link">
       <xsl:attribute name="rel">stylesheet</xsl:attribute>
-      <xsl:attribute name="href">https://cdn.jsdelivr.net/npm/bootstrap-icons@1.4.0/font/bootstrap-icons.css</xsl:attribute>
+      <xsl:attribute name="href">
+        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/css/bootstrap-icons.css')"/>
+      </xsl:attribute>
     </xsl:element>
     <!--CSS_EXTENSIONS-->
   </xsl:template>
   <xsl:template name="caosdb-head-js">
     <script>
-        var caosdb_webui_build_number = "${BUILD_NUMBER}";
         window.sessionStorage.caosdbBasePath = "<xsl:value-of select="$basepath"/>";
     </script>
     <xsl:element name="script">
       <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/jquery.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/bootstrap.bundle.min.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/bootstrap-autocomplete.min.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/bootstrap-select.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/state-machine.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/showdown.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/dropzone.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/loglevel.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/plotly.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/webcaosdb.js')"/>
+        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/webcaosdb.dist.js')"/>
       </xsl:attribute>
     </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/pako.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/utif.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <script>
-      $(document).ready(() => paging.initPaging(window.location.href, <xsl:value-of select="/Response/@count"/> ));
-    </script>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/caosdb.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/form_elements.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/ext_autocomplete.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/preview.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/ext_references.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/ext_table_preview.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/ext_xls_download.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/query_shortcuts.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/ext_jupyterdrag.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/annotation.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/edit_mode.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/ext_entity_state.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/ext_file_download.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/leaflet.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/leaflet-graticule.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/leaflet-latlng-graticule.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/leaflet-coordinates.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/proj4.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/proj4leaflet.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/ext_map.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/tour.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/ext_bottom_line.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/ext_sss_markdown.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/ext_trigger_crawler_form.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <xsl:element name="script">
-      <xsl:attribute name="src">
-        <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/js/ext_bookmarks.js')"/>
-      </xsl:attribute>
-    </xsl:element>
-    <!--JS_EXTENSIONS-->
   </xsl:template>
   <xsl:template name="caosdb-data-container">
     <div class="container d-flex flex-column-reverse flex-lg-row caosdb-f-main">
@@ -296,12 +113,9 @@
           <xsl:if test="not(/Response/Query/Selection)">
             <xsl:apply-templates mode="entities" select="/Response/*"/>
           </xsl:if>
-          <xsl:if test="count(/Response/*)&lt;2 and not(/Response/Error|/Response/Info|/Response/Warning)">
-            <xsl:call-template name="welcome"/>
-          </xsl:if>
           <xsl:call-template name="paging-panel"/>
         </div>
-        <div class="caosdb-f-edit">
+        <div class="caosdb-f-edit ms-2">
           <div class="card caosdb-v-edit-panel">
             <div class="card-header">
               <span class="card-title">Edit Mode Toolbox</span>
diff --git a/src/core/xsl/navbar.xsl b/src/core/xsl/navbar.xsl
index a212d1388087a9be5d0f377fe04d1bba644363e0..ee4df81be60558e6b6aa2e558096d7420636349f 100644
--- a/src/core/xsl/navbar.xsl
+++ b/src/core/xsl/navbar.xsl
@@ -42,20 +42,14 @@
     </li>
   </xsl:template>
   <xsl:template name="caosdb-top-navbar">
-    <!-- Some general settings first, current context should be the <body> node. -->
-    <xsl:if test="count(/Response/*)&lt;2 and not(/Response/Error|/Response/Info|/Response/Warning)">
-        <xsl:attribute name="class">caosdb-welcome</xsl:attribute>
-    </xsl:if>
     <xsl:if test="/Response/@realm='${BUILD_MODULE_USER_MANAGEMENT_CHANGE_OWN_PASSWORD_REALM}'">
       <xsl:call-template name="change-password-modal">
           <xsl:with-param name="realm"><xsl:value-of select="/Response/@realm"/></xsl:with-param>
           <xsl:with-param name="username"><xsl:value-of select="/Response/@username"/></xsl:with-param>
       </xsl:call-template>
     </xsl:if>
-    <!-- Now the header follows. -->
-    <!-- TODO the z-index makes dropdown be over other elements. Can this be done in cleverer way?. -->
-    <!-- TODO the display:block allows to have the query panel below the navbar not inside. Without it, the query panel will always stay in a row with the remaining navbar. Can this be done in cleverer way?. -->
     <nav class="navbar navbar-expand-lg navbar-light bg-light sticky-top mb-2 flex-column">
+      <noscript>Please enable JavaScript!</noscript>
       <div class="container-fluid">
         <a class="navbar-brand" href="/">
           <xsl:element name="img">
@@ -156,6 +150,8 @@
           <xsl:call-template name="caosdb-user-menu"/>
           </ul>
       </div>
+      </div>
+      <!-- global messages -->
       <xsl:apply-templates select="/Response/Error">
         <xsl:with-param name="class" select="'alert-danger'"/>
       </xsl:apply-templates>
@@ -165,10 +161,9 @@
       <xsl:apply-templates select="/Response/Info">
         <xsl:with-param name="class" select="'alert-info'"/>
       </xsl:apply-templates>
-      </div>
       <!-- query panel -->
       <div class="collapse" id="caosdb-query-panel-collapsible" style="width: 100%">
-      <div class="container bg-light flex-column caosdb-query-panel" id="caosdb-query-panel">
+      <div class="container py-2 py-sm-3 py-lg-4 py-xl-5 flex-column caosdb-query-panel" id="caosdb-query-panel">
         <xsl:call-template name="caosdb-query-panel"/>
       </div>
       </div>
@@ -256,7 +251,7 @@
         </li>
       </xsl:when>
       <xsl:otherwise>
-        <div  id="user-menu" class="my-auto">
+        <li id="user-menu" class="nav-item my-auto">
           <form id="caosdb-f-login-form" class="d-none" method="POST">
             <xsl:attribute name="action">
               <xsl:value-of select="concat($basepath, 'login')"/>
@@ -273,15 +268,15 @@
             </div>
             </div>
           </form>
-          <form>
+          <form class="my-auto">
           <button style="margin-right: 15px" class="btn btn-secondary navbar-btn d-inline-block" id="caosdb-f-login-show-button" type="button">Login</button>
           </form>
-        </div>
+        </li>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
   <xsl:template name="paging-panel">
-    <div class="caosdb-f-paging-panel d-flex justify-content-between mb-2">
+    <div class="caosdb-f-paging-panel mb-2">
       <a type="button" class="caosdb-prev-button btn btn-light">Previous Page</a>
       <a type="button" class="caosdb-next-button btn btn-light">Next Page</a>
     </div>
diff --git a/src/core/xsl/parent.xsl b/src/core/xsl/parent.xsl
index 12345d584248333a373f7150a19b44a8b542be29..9dd032b3a9d238e943f3be5e4f0e81a7c6b0d6e7 100644
--- a/src/core/xsl/parent.xsl
+++ b/src/core/xsl/parent.xsl
@@ -27,18 +27,18 @@
       <xsl:apply-templates select="./RecordType"/>
   </xsl:template>
   <xsl:template match="RecordType">
-      <span class="caosdb-parent-item small">
-		<xsl:attribute name="id">
-		<xsl:value-of select="generate-id()"/>
-		</xsl:attribute>
-		<span class="caosdb-f-parent-actions-panel">
-		</span>
-		<a class="caosdb-parent-name">
-			<xsl:attribute name="href">
-				<xsl:value-of select="concat($entitypath, @id)"/>
-			</xsl:attribute>
-			<xsl:value-of select="@name"/>
-		</a>
+      <span class="badge caosdb-parent-item me-1">
+    <xsl:attribute name="id">
+    <xsl:value-of select="generate-id()"/>
+    </xsl:attribute>
+    <span class="caosdb-f-parent-actions-panel">
+    </span>
+    <a class="caosdb-parent-name">
+      <xsl:attribute name="href">
+        <xsl:value-of select="concat($entitypath, @id)"/>
+      </xsl:attribute>
+      <xsl:value-of select="@name"/>
+    </a>
       </span>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/src/core/xsl/query.xsl b/src/core/xsl/query.xsl
index 6f8167e37403e104677ca53f29ac499b95253e33..2b647c07bebe7f7cd72198baf27e45318e25a18e 100644
--- a/src/core/xsl/query.xsl
+++ b/src/core/xsl/query.xsl
@@ -50,7 +50,7 @@
     </div>
   </xsl:template>
   <xsl:template match="Query" mode="query-results">
-    <div class="card caosdb-query-response">
+    <div class="card caosdb-query-response mb-2">
       <div class="card-header caosdb-query-response-heading">
         <div class="row">
           <div class="col-sm-10 caosdb-overflow-box">
@@ -172,7 +172,7 @@
     <xsl:param name="entity-id"/>
     <xsl:param name="version-id"/>
     <xsl:param name="ishead"/>
-    <a class="btn btn-secondary btn-sm caosdb-select-id">
+    <a class="btn btn-secondary btn-sm caosdb-select-id" title="Go to this entity.">
       <xsl:attribute name="href">
         <xsl:value-of select="concat($entitypath, $entity-id)"/>
         <xsl:if test="$version-id and not($ishead)">
@@ -181,7 +181,7 @@
       </xsl:attribute>
       <!-- <xsl:value-of select="$entity-id" /> -->
       <span class="caosdb-select-id-target">
-          <i class="bi-window"></i>
+          <i class="bi bi-box-arrow-up-right"></i>
       </span>
     </a>
   </xsl:template>
@@ -248,15 +248,17 @@
           <xsl:with-param name="value">
             <xsl:value-of select="@*[translate(name(), $uppercase, $lowercase)=$first-segment]"/>
           </xsl:with-param>
+          <xsl:with-param name="reference" select="'false'"/>
+          <xsl:with-param name="boolean" select="'false'"/>
         </xsl:call-template>
       </xsl:when>
 
       <xsl:when test="translate($first-segment, $uppercase, $lowercase)='version'">
         <!--handle version-->
         <xsl:call-template name="single-value">
-          <xsl:with-param name="value">
-            <xsl:value-of select="Version/@id"/>
-          </xsl:with-param>
+          <xsl:with-param name="value" select="Version/@id"/>
+          <xsl:with-param name="reference" select="'false'"/>
+          <xsl:with-param name="boolean" select="'false'"/>
         </xsl:call-template>
       </xsl:when>
 
@@ -268,9 +270,9 @@
       <xsl:when test="translate($next-segments, $uppercase, $lowercase)='unit'">
         <!--handle unit-->
         <xsl:call-template name="single-value">
-          <xsl:with-param name="value">
-            <xsl:value-of select="@unit"/>
-          </xsl:with-param>
+          <xsl:with-param name="value" select="@unit"/>
+          <xsl:with-param name="reference" select="'false'"/>
+          <xsl:with-param name="boolean" select="'false'"/>
         </xsl:call-template>
       </xsl:when>
 
@@ -305,24 +307,24 @@
           <xsl:with-param name="value">
             <xsl:value-of select="@*[translate(name(), $uppercase, $lowercase)=$first-segment]"/>
           </xsl:with-param>
+          <xsl:with-param name="reference" select="'false'"/>
+          <xsl:with-param name="boolean" select="'false'"/>
         </xsl:call-template>
       </xsl:when>
 
       <xsl:when test="translate($first-segment, $uppercase, $lowercase)='version'">
         <!--handle version-->
         <xsl:call-template name="single-value">
-          <xsl:with-param name="value">
-            <xsl:value-of select="Version/@id"/>
-          </xsl:with-param>
+          <xsl:with-param name="value" select="Version/@id"/>
+          <xsl:with-param name="reference" select="'false'"/>
+          <xsl:with-param name="boolean" select="'false'"/>
         </xsl:call-template>
       </xsl:when>
 
       <xsl:when test="$next-segments">
         <!-- when there is a next-segmenst -->
         <xsl:apply-templates select="Property[translate(@name, $uppercase, $lowercase)=$first-segment]" mode="walk-select-segments">
-          <xsl:with-param name="next-segments">
-            <xsl:value-of select="$next-segments"/>
-          </xsl:with-param>
+          <xsl:with-param name="next-segments" select="$next-segments"/>
         </xsl:apply-templates>
       </xsl:when>
 
diff --git a/src/core/xsl/welcome.xsl b/src/core/xsl/welcome.xsl
index a38e51607afef2ba107130fda071b808f17c942a..249c2f8e873e83dc4db3132fc22152211fd87965 100644
--- a/src/core/xsl/welcome.xsl
+++ b/src/core/xsl/welcome.xsl
@@ -25,7 +25,7 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:output method="html"/>
   <xsl:template name="welcome">
-    <div class="caosdb-f-welcome-panel bg-light">
+    <div class="caosdb-v-welcome-panel bg-light">
       <h1>Welcome</h1>
       <p>This is CaosDB.</p>
               <p>This is the default welcome message. If you are an administrator you can override it. Just copy <code>src/core/xsl/welcome.xsl</code> to <code>src/ext/xsl/welcome.xsl</code> and change this content. Then run <code>make</code> again in CaosdDB's web interface's root directory.</p>
diff --git a/src/doc/tutorials/change-entity.png b/src/doc/tutorials/change-entity.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddae63fa841976709b2dcf98389e578d79998f03
Binary files /dev/null and b/src/doc/tutorials/change-entity.png differ
diff --git a/src/doc/tutorials/delete-entity-button.png b/src/doc/tutorials/delete-entity-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..c118b8217a63d00eeee6469731d8561810a8d7d4
Binary files /dev/null and b/src/doc/tutorials/delete-entity-button.png differ
diff --git a/src/doc/tutorials/edit-entity-button.png b/src/doc/tutorials/edit-entity-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..79003121df69cc615890589941079e766f970775
Binary files /dev/null and b/src/doc/tutorials/edit-entity-button.png differ
diff --git a/src/doc/tutorials/edit-mode-button.png b/src/doc/tutorials/edit-mode-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..28dd167a5887be45d6c41581a4645e796c3b6328
Binary files /dev/null and b/src/doc/tutorials/edit-mode-button.png differ
diff --git a/src/doc/tutorials/edit-mode-toolbox.png b/src/doc/tutorials/edit-mode-toolbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..e291c43a77e41adfa9f2b821d90f9982449c5f9f
Binary files /dev/null and b/src/doc/tutorials/edit-mode-toolbox.png differ
diff --git a/src/doc/tutorials/edit_mode.rst b/src/doc/tutorials/edit_mode.rst
new file mode 100644
index 0000000000000000000000000000000000000000..01502f55d5d76959a17bf74c71632d0d902f625e
--- /dev/null
+++ b/src/doc/tutorials/edit_mode.rst
@@ -0,0 +1,193 @@
+The Edit Mode
+=============
+
+Entities in CaosDB can be changed, created, and deleted using the
+``Edit Mode``. In the following chapter, you'll learn how. You should
+be fairly familiar with the concepts of Records, RecordTypes and
+Properties in CaosDB. If you have doubts, please have a look at the
+`data model documentation
+<https://docs.indiscale.com/caosdb-server/Data-Model.html>`_.
+
+In usual setups of CaosDB, you have to log in to use the edit
+mode. Afterwards, you can access it by clicking on the button in the
+to panel as shown below:
+
+.. image:: edit-mode-button.png
+   :width: 480
+   :alt: Edit mode button
+
+After entering the edit mode, the button changes its text to ``Leave
+Edit Mode``. Unsurprisingly, clicking here terminates the edit mode.
+
+.. note::
+
+   The edit mode is only available if you have sufficient
+   privileges. You can only create/edit/delete entities if your user
+   is allowed to do that. User and group permissions can be configured
+   in detail as explained in the `server documentation
+   <https://docs.indiscale.com/caosdb-server/Permissions.html>`_.
+
+When you have entered the edit mode, you'll see the edit mode toolbox
+appearing on the right hand side of your screen:
+
+.. image:: edit-mode-toolbox.png
+   :width: 240
+   :alt: Edit mode toolbox
+
+You'll learn more about its contents in the following sections. Right
+now it only contains the options for creating a new RecordType or
+Property which we'll explain in :ref:`new_recordtypes_properties`.
+
+.. _change_existing:
+
+Changing an existing Entity
+---------------------------
+
+We'll start by changing and updating existing entities. First, find
+the entity you want to change and enter the edit mode. You'll see an
+edit button in the top right of the entity card:
+
+.. image:: edit-entity-button.png
+   :width: 240
+   :alt: Edit entity button
+
+After clicking on this button, the edit menu for this entity is opened
+as shown below for a guitar Record from the `demo
+<https://demo.indiscale.com>`_. You'll also note that the edit mode
+toolbox changes its contents: It now harbours two lists of the
+existing Properties and RecordTypes.
+
+.. image:: change-entity.png
+   :width: 720
+   :alt: Changing an existing Record
+
+Property values can be changed in the entity card directly; additional
+parents can be added by dragging them from the list of RecordTypes to
+the corresponding area at the top of the Record. Similarly, Properties
+can be added by dragging Properties (or RecordTypes) from the list in the edit mode toolbox
+to the corresponding area at the bottom of the Record. Properties and
+parents can be removed from the entity by clicking on the trash-can
+symbol. Not that a Record must always have at least one parent.
+
+Changes will be applied after clicking on ``Save`` or can be discarded
+entirely by clicking ``Cancel``. Existing Properties and RecordTypes
+can be edited in the same way. Note that when changing a RecordType,
+the properties don't have values.
+	 
+
+Creating a new Record
+---------------------
+
+If you want to create a new Record of a given RecordType, visit that
+RecordType and enter the edit mode (if your new Record will have more
+than one parent, visit any one of them - you can add the others
+later). A new Record is then created by clicking on the ``+Record``
+button in the top right of the RecordType:
+
+.. image:: new-record.png
+   :width: 240
+   :alt: New record button
+
+Clicking here opens an entity card with an edit menu for the new
+Record similar to the one discussed in :ref:`change_existing`. In
+here, you can enter the name and the description of your new Record,
+assign values to its properties, and add further parents or properties
+from the corresponding lists in the edit mode toolbox. The new Record
+is inserted by clicking ``Save``.
+
+.. _new_recordtypes_properties:
+
+Creating new RecordTypes and Properties
+---------------------------------------
+
+You can extend the data model of your CaosDB by creating new
+RecordTypes and Properties directly from the WebUI. This is done by
+clicking on the corresponding buttons in the edit mode toolbox:
+
+.. image:: edit-mode-toolbox.png
+   :width: 240
+   :alt: Edit mode toolbox
+
+When creating a new RecordType, a RecordType card is added to the
+entity panel, similar to the new Record explained above:
+
+.. image:: new-recordtype.png
+   :width: 720
+   :alt: Create a new RecordType
+
+As above, you can enter a name and a description. You can add parents
+and properties by selecting them from the lists in the edit mode
+toolbox and dragging them to the respective areas in the new
+RecordType. Note that in contrast to Records, the properties of
+RecordTypes do not have values.
+
+When creating a new property name and description can be entered as
+above. In addition, the `datatype` can be selected from the CaosDB
+datatypes ``TEXT``, ``DOUBLE``, ``INTEGER``, ``DATETIME``,
+``BOOLEAN``, ``FILE``, and ``REFERENCE``. See `here
+<https://docs.indiscale.com/caosdb-server/specification/Datatype.html>`_
+for more information on the datatypes. You can also choose whether the
+new property should have a single value or a list of values.
+
+.. image:: new-property.png
+   :width: 720
+   :alt: Create a new Property
+
+When creating a property with datatype ``INTEGER`` or ``DOUBLE``,
+i.e., a number, you may enter a unit in an additional input field if
+applicable. In case of a ``REFERENCE`` property, you may specify the
+RecordType that all referenced Records must have. In the above example
+a ``REFERENCE`` property is created which may only have violins as
+values. Again, the new entity is created by clicking on ``save``.
+
+.. note::
+
+   After having created a new RecordType or Property, you may have to
+   leave and re-enter the edit mode for the new entity to appear in
+   the lists of Properties or RecordTypes in the edit mode toolbox.
+
+Deleting an Entity
+------------------
+
+Entities can also be deleted by clicking on the delete button in the
+top right of the entity:
+
+.. image:: delete-entity-button.png
+   :width: 240
+   :alt: Delete entity button
+
+After clicking on ``delete`` you'll be asked for confirmation. Note that
+entities cannot be deleted if they are needed by other entities, e.g.,
+as a reference.
+
+
+Uploading files
+---------------
+
+In case of properties with data type ``FILE``, you can use the edit
+mode to upload a corresponding file directly. When editing the Record
+which will have the file to be uploaded as the value of the
+corresponding property (named ``SourceFile`` in the example below),
+add the property as described above if it isn't present already. Next
+to the dropdown menu, in which you can choose from existing files, you
+find an uploaded button:
+
+.. image:: file-upload.png
+   :width: 720
+   :alt: File upload button
+
+Click on it to open an upload dialogue in which you can choose the
+file that you want to upload. The files uploaded this way will be
+stored within ``/uploaded.by/<REALM>/<USER>/``.
+
+The same is true for properties with data type ``REFERENCE``, too. In
+that case, the Record of the file that is uploaded will be assigned the
+RecordType of value of the original reference property.
+
+.. warning::
+
+   Until `this bug
+   <https://gitlab.indiscale.com/caosdb/src/caosdb-webui/-/issues/200>`_
+   has been fixed, the upload button is broken and does not open the
+   upload dialogue.
+
diff --git a/src/doc/tutorials/file-upload.png b/src/doc/tutorials/file-upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..85c9224a6453cc219e7510b13fb1c5869f7c01c6
Binary files /dev/null and b/src/doc/tutorials/file-upload.png differ
diff --git a/src/doc/tutorials/index.rst b/src/doc/tutorials/index.rst
index dbfeafed2a09d587ebd538a62ed9002943b52aa0..b01e45e3d574cd675b8410da1dbd1d79cb8e20c0 100644
--- a/src/doc/tutorials/index.rst
+++ b/src/doc/tutorials/index.rst
@@ -8,4 +8,7 @@ This chapter contains the following tutorials:
    :maxdepth: 2
    :glob:
 
+   first_steps
+   query
+   edit_mode
    *
diff --git a/src/doc/tutorials/new-property.png b/src/doc/tutorials/new-property.png
new file mode 100644
index 0000000000000000000000000000000000000000..af438007278b2ddf30fae4f56fb803bfda06577f
Binary files /dev/null and b/src/doc/tutorials/new-property.png differ
diff --git a/src/doc/tutorials/new-record.png b/src/doc/tutorials/new-record.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b2ac31afa78ca2aa20ee8f5f83f9a04ce39be30
Binary files /dev/null and b/src/doc/tutorials/new-record.png differ
diff --git a/src/doc/tutorials/new-recordtype.png b/src/doc/tutorials/new-recordtype.png
new file mode 100644
index 0000000000000000000000000000000000000000..9519a9ada3b034c01308ac4a4c350954d9d32d65
Binary files /dev/null and b/src/doc/tutorials/new-recordtype.png differ
diff --git a/src/linkahead_icon_512.png b/src/linkahead_icon_512.png
new file mode 100644
index 0000000000000000000000000000000000000000..84d1b5ebd715b55418444787c82689b28d917e24
Binary files /dev/null and b/src/linkahead_icon_512.png differ
diff --git a/test/core/index.html b/test/core/index.html
index 709bb06d71399fc9fc83cf052f6526d7b641f086..834684b2e737be2e5f241eed3faaea73b3c4020c 100644
--- a/test/core/index.html
+++ b/test/core/index.html
@@ -32,67 +32,9 @@
   <body>
     <div id="qunit"></div>
     <div id="qunit-fixture"></div>
-    <script src="js/jquery.js"></script>
-    <script src="js/loglevel.js"></script>
-    <script src="js/bootstrap.bundle.min.js"></script>
-    <script src="js/bootstrap-select.js"></script>
-    <script src="js/bootstrap-autocomplete.min.js"></script>
-    <script src="js/utif.js"></script>
-    <script src="js/pako.js"></script>
-    <script src="js/webcaosdb.js"></script>
-    <script src="js/plotly.js"></script>
     <script>
-      caosdb_modules.auto_init = false;
-      log.setLevel("trace");
+      var _caosdb_modules_auto_init = false;
     </script>
-    <script src="js/caosdb.js"></script>
-    <script src="js/state-machine.js"></script>
-    <script src="js/showdown.js"></script>
-    <script src="js/qunit.js"></script>
-    <script src="js/dropzone.js"></script>
-    <script src="js/setup.js"></script>
-    <script src="js/preview.js"></script>
-    <script src="js/annotation.js"></script>
-    <script src="js/edit_mode.js"></script>
-    <script src="js/query_shortcuts.js"></script>
-    <script src="js/ext_references.js"></script>
-    <script src="js/ext_file_download.js"></script>
-    <script src="js/ext_xls_download.js"></script>
-    <script src="js/form_elements.js"></script>
-    <script src="js/tour.js"></script>
-    <script src="js/leaflet.js"></script>
-    <script src="js/leaflet-graticule.js"></script>
-    <script src="js/leaflet-latlng-graticule.js"></script>
-    <script src="js/leaflet-coordinates.js"></script>
-    <script src="js/proj4.js"></script>
-    <script src="js/proj4leaflet.js"></script>
-    <script src="js/ext_map.js"></script>
-    <script src="js/ext_table_preview.js"></script>
-    <script src="js/ext_bottom_line.js"></script>
-    <script src="js/ext_autocomplete.js"></script>
-    <script src="js/ext_sss_markdown.js"></script>
-    <script src="js/ext_trigger_crawler_form.js"></script>
-    <script src="js/ext_bookmarks.js"></script>
-    <!--EXTENSIONS-->
-    <script src="js/modules/webcaosdb.js.js"></script>
-    <script src="js/modules/caosdb.js.js"></script>
-    <script src="js/modules/common.xsl.js"></script>
-    <script src="js/modules/entity.xsl.js"></script>
-    <script src="js/modules/welcome.xsl.js"></script>
-    <script src="js/modules/query.xsl.js"></script>
-    <script src="js/modules/annotation.xsl.js"></script>
-    <script src="js/modules/navbar.xsl.js"></script>
-    <script src="js/modules/edit_mode.js.js"></script>
-    <script src="js/modules/ext_xls_download.js.js"></script>
-    <script src="js/modules/ext_file_download.js.js"></script>
-    <script src="js/modules/query_shortcuts.js.js"></script>
-    <script src="js/modules/form_elements.js.js"></script>
-    <script src="js/modules/ext_references.js.js"></script>
-    <script src="js/modules/ext_map.js.js"></script>
-    <script src="js/modules/ext_bottom_line.js.js"></script>
-    <script src="js/modules/ext_autocomplete.js.js"></script>
-    <script src="js/modules/ext_sss_markdown.js.js"></script>
-    <script src="js/modules/ext_trigger_crawler_form.js.js"></script>
-    <script src="js/modules/ext_bookmarks.js.js"></script>
+    <script src="webcaosdb.dist.js"></script>
   </body>
 </html>
diff --git a/test/core/js/modules/annotation.xsl.js b/test/core/js/modules/annotation.xsl.js
index 20815816d5d1de75c4efeb11117f839bacd4ca1d..3640d93c0e1d33c638c92c9e2830c77c0e44ff40 100644
--- a/test/core/js/modules/annotation.xsl.js
+++ b/test/core/js/modules/annotation.xsl.js
@@ -35,7 +35,7 @@ QUnit.module("annotation.xsl", {
 		
 		
 		this.testCases = [];
-		this.testCases[0] = '<Response><Record><Property name="annotationOf"/><History transaction="INSERT" datetime="2015-12-24T20:15:00" username="someuser"/><Property name="comment">This is a comment</Property></Record><Record><Property name="annotationOf"/></Record></Response>';
+		this.testCases[0] = '<Response><Record><Property name="annotationOf"/><Version head="true" date="2015-12-24T20:15:00" username="someuser"/><Property name="comment">This is a comment</Property></Record><Record><Property name="annotationOf"/></Record></Response>';
 		assert.ok(str2xml(this.testCases[0]));
 	}
 });
@@ -63,10 +63,10 @@ QUnit.test("Record rule returns li elements", function(assert){
 
 	var media = annos[0].children[0];
 	assert.equal(media.tagName, "DIV", "is DIV");
-	assert.equal(media.className, "media", "className is media");
+	assert.equal(media.className, "d-flex", "className is d-flex");
 	assert.equal(media.children.length, 2, "media has two children");
-	assert.equal(media.children[0].className, "media-left");
-	assert.equal(media.children[1].className, "media-body");
+	assert.equal(media.children[0].className, "d-shrink-0");
+	assert.equal(media.children[1].className, "flex-grow-1 ms-3");
 	
 });
 
@@ -75,12 +75,12 @@ QUnit.test("History element", function(assert){
 	var xml = str2xml(xml_str);
 	
 	var html = xslt(xml, this.annotationXSL);
-	var mediaBody = html.firstChild.getElementsByClassName("media-body")[0];
+	var mediaBody = html.firstChild.getElementsByClassName("caosdb-f-comment-body")[0];
 	assert.ok(mediaBody, "media-body is there");
 	assert.ok(mediaBody.children.length>0,"media-body has children");
-	var mediaHeading = mediaBody.getElementsByClassName("media-heading")[0];
+
+	var mediaHeading = html.firstChild.getElementsByClassName("caosdb-f-comment-header")[0];
 	assert.ok(mediaHeading, "media-heading is there");
-	assert.equal(mediaHeading.parentNode, mediaBody, "media-heading is child of media-body");
 	
 	assert.ok(xml2str(mediaHeading).indexOf("someuser")!==-1, "username is there");
 	assert.ok(xml2str(mediaHeading).indexOf("2015-12-24T20:15:00")!==-1, "datetime is there");
@@ -92,7 +92,7 @@ QUnit.test("Comment text", function(assert){
 	
 	var html = xslt(xml, this.annotationXSL);
 	
-	var mediaBody = html.firstChild.getElementsByClassName("media-body")[0];
+	var mediaBody = html.firstChild.getElementsByClassName("caosdb-f-comment-body")[0];
 	assert.ok(mediaBody, "media-body is there");
 	assert.ok(mediaBody.children.length>0,"media-body has children");
 	var commentText = mediaBody.getElementsByClassName("caosdb-comment-annotation-text")[0];
diff --git a/test/core/js/modules/entity.xsl.js b/test/core/js/modules/entity.xsl.js
index 9415a10dc6bdbd51f913e9bfe1ce8f48f187d081..21ce97ac3536b325ba77d6bc2d482b926619ae5d 100644
--- a/test/core/js/modules/entity.xsl.js
+++ b/test/core/js/modules/entity.xsl.js
@@ -55,7 +55,7 @@ QUnit.test("Property names are not links anymore", function(assert) {
     var xml_str = '<Property name="pname" id="2345" datatype="TEXT">pvalue</Property>';
     var xml = str2xml(xml_str);
     var html = xslt(xml, xsl);
-    assert.equal(html.firstElementChild.getElementsByClassName("caosdb-property-name")[0].outerHTML, '<strong class=\"caosdb-property-name\">pname</strong>', "link there");
+    assert.equal(html.firstElementChild.getElementsByClassName("caosdb-property-name")[0].outerHTML, '<span class=\"caosdb-property-name\">pname</span>', "link there");
 });
 
 QUnit.test("TestRecordType data type is recognized as a reference", function(assert) {
diff --git a/test/core/js/modules/ext_map.js.js b/test/core/js/modules/ext_map.js.js
index 16488400a2f10a165d25cf29f89db2a31307cf20..9b6b01022d8106153d50eaa906a0ce33803a8dc3 100644
--- a/test/core/js/modules/ext_map.js.js
+++ b/test/core/js/modules/ext_map.js.js
@@ -134,23 +134,23 @@ QUnit.test("create_map_view", function (assert) {
 
     var map = caosdb_map.create_map_view(map_panel[0], view_config);
 
-    console.log(map_panel[0]);
     assert.ok(map instanceof L.Map, "map instance created");
-    assert.ok(map_panel.hasClass("leaflet-container"), "map_panel has .leaflet-container child");
+    assert.equal($(map_panel).find(".leaflet-container").length, 1, "map_panel has .leaflet-container child");
 
     assert.notOk(map._crs, "no special crs");
     map.remove();
+    map_panel = $("<div/>");
 
     // test with pre-defined crs
     view_config["crs"] = "Simple";
     map = caosdb_map.create_map_view(map_panel[0], view_config);
 
-    console.log(map_panel[0]);
     assert.ok(map instanceof L.Map, "map instance created");
-    assert.ok(map_panel.hasClass("leaflet-container"), "map_panel has .leaflet-container child");
+    assert.equal($(map_panel).find(".leaflet-container").length, 1, "map_panel has .leaflet-container child");
     assert.equal(map._crs, L.CRS.Simple, "map has SIMPLE crs");
 
     map.remove();
+    map_panel = $("<div/>");
 
     // test with special crs:
     view_config["crs"] = {
@@ -165,7 +165,7 @@ QUnit.test("create_map_view", function (assert) {
 
     console.log(map_panel[0]);
     assert.ok(map instanceof L.Map, "map instance created");
-    assert.ok(map_panel.hasClass("leaflet-container"), "map_panel has .leaflet-container child");
+    assert.equal($(map_panel).find(".leaflet-container").length, 1, "map_panel has .leaflet-container child");
     assert.ok(map._crs instanceof L.Proj.CRS, "map has special crs");
 
     map.remove();
diff --git a/test/core/js/modules/query.xsl.js b/test/core/js/modules/query.xsl.js
index a1a449d259c6ca1e4dad0c3d6ec2c975b2cc669b..371b51598918e2fd6bb5d94ca13a94337ccd322e 100644
--- a/test/core/js/modules/query.xsl.js
+++ b/test/core/js/modules/query.xsl.js
@@ -122,7 +122,7 @@ QUnit.test("Query tag is transformed via xslt", function(assert) {
     let html = applyTemplates(str2xml('<Query/>'), this.queryXSL, 'query-results');
     //var html = xslt(xml, xsl);
     assert.equal(html.firstElementChild.tagName, "DIV", "first child is div.");
-    assert.equal(html.firstElementChild.className, "card caosdb-query-response", "first child has class caosdb-query-reponse.");
+    assert.equal(html.firstElementChild.className, "card caosdb-query-response mb-2", "first child has class caosdb-query-reponse.");
 });
 
 QUnit.test("xsl defines id 'caosdb-query-form'", function(assert) {
@@ -141,14 +141,12 @@ QUnit.test("xsl script's 'caosdb-query-form' has a hidden input, with name=P and
 });
 
 
-QUnit.test("Query is available, contained by a div.", function(assert) {
-    var cont = getQueryFormContainer(this.queryXSL);
-    assert.equal(cont.tagName, "DIV", "contained by a div");
-    assert.equal(cont.className, "caosdb-query-panel", "container has classname 'caosdb-query-panel'");
-    assert.equal(cont.firstElementChild.tagName, "FORM", "form element is available");
-    assert.equal(cont.firstElementChild.className, "card", "FORM has class 'card'");
-    assert.equal(cont.firstElementChild.id, "caosdb-query-form", "FORM has id 'caosdb-query-form'");
+QUnit.test("Query is available", function(assert) {
+    var cont = getQueryForm(this.queryXSL);
+    assert.equal(cont.tagName, "FORM", "contained by a div");
+    assert.equal(cont.className, "card caosdb-query-form", "container has classname 'card caosdb-query-form'");
 });
+
 QUnit.test("Query is send with a paging of 0L10 by default", function(assert) {
     var form_e = getQueryForm(this.queryXSL);
 
@@ -187,11 +185,6 @@ QUnit.test("template select-table-row ", function(assert){
 
 /* MISC FUNCTIONS */
 function getQueryForm(queryXSL) {
-    var cont = getQueryFormContainer(queryXSL);
-    return cont.getElementsByTagName("form")[0];
-}
-
-function getQueryFormContainer(queryXSL) {
     var html = callTemplate(queryXSL, "caosdb-query-panel", {});
     return html.firstElementChild;
 }
diff --git a/test/core/js/modules/webcaosdb.js.js b/test/core/js/modules/webcaosdb.js.js
index 071f9e025cdf0cc034f67a6262b6d7472ec1b9c7..52bf4ada52d2ce59b59d8615c89ca5796343622b 100644
--- a/test/core/js/modules/webcaosdb.js.js
+++ b/test/core/js/modules/webcaosdb.js.js
@@ -582,9 +582,6 @@ QUnit.test("addShowPreviewButton", function (assert) {
     assert.throws(() => {
         preview.addShowPreviewButton(null, $('<div/>')[0]);
     }, "null ref_property_elem parameter throws.");
-    assert.throws(() => {
-        preview.addShowPreviewButton(notOkTestElem, $('<div/>')[0]);
-    }, "ref_property_elem w/o caosdb-value-list throws.");
     assert.equal(okTestElem.firstChild.childNodes.length, 0, "before: test div has no children");
     assert.equal(okTestElem, preview.addShowPreviewButton(okTestElem, preview.createShowPreviewButton()), "returns the first parameter");
     assert.equal(okTestElem.firstChild.childNodes.length, 1, "after: test div has new child");
@@ -774,25 +771,25 @@ QUnit.test("removeAllWaitingNotifications", function (assert) {
 QUnit.test("getActiveSlideItemIndex", function (assert) {
     assert.ok(preview.getActiveSlideItemIndex, "function available");
     let okElem0 = $('<div><div class="carousel-inner">' +
-        '<div class="item active"></div>' // index 0
+        '<div class="carousel-item active"></div>' // index 0
         +
-        '<div class="item"></div>' +
-        '<div class="item"></div>' +
+        '<div class="carousel-item"></div>' +
+        '<div class="carousel-item"></div>' +
         '</div></div>')[0];
     let okElem1 = $('<div><div class="carousel-inner">' +
-        '<div class="item"></div>' +
-        '<div class="item active"></div>' // index 1
+        '<div class="carousel-item"></div>' +
+        '<div class="carousel-item active"></div>' // index 1
         +
-        '<div class="item"></div>' +
+        '<div class="carousel-item"></div>' +
         '</div></div>')[0];
     let okElem2 = $('<div><div class="carousel-inner">' +
-        '<div class="item"></div>' +
-        '<div class="item"></div>' +
-        '<div class="item active"></div>' // index 2
+        '<div class="carousel-item"></div>' +
+        '<div class="carousel-item"></div>' +
+        '<div class="carousel-item active"></div>' // index 2
         +
         '</div></div>')[0];
     let noInner = $('<div></div>')[0];
-    let noActive = $('<div><div class="carousel-inner"><div class="item"></div></div></div>')[0];
+    let noActive = $('<div><div class="carousel-inner"><div class="carousel-item"></div></div></div>')[0];
 
     assert.throws(() => {
         preview.getActiveSlideItemIndex()
@@ -855,14 +852,14 @@ QUnit.test("createEmptyInner", function (assert) {
 
     let inner = preview.createEmptyInner(3);
     assert.equal(inner.children.length, 3, "three items");
-    assert.equal(inner.children[0].className, "item active", "first item is active");
-    assert.equal(inner.children[1].className, "item", "second item is not active");
-    assert.equal(inner.children[2].className, "item", "third item is not active");
+    assert.equal(inner.children[0].className, "carousel-item active", "first item is active");
+    assert.equal(inner.children[1].className, "carousel-item", "second item is not active");
+    assert.equal(inner.children[2].className, "carousel-item", "third item is not active");
 });
 
 QUnit.test("createCarouselNav", function (assert) {
     assert.ok(preview.createCarouselNav, "function available");
-    let refLinks = $('<div style="display: none;" class="caosdb-value-list"><a><span class="caosdb-id">1234</span></a><a><span class="caosdb-id">2345</span></a><a><span class="caosdb-id">3456</span></a><a><span class="caosdb-id">4567</span></a></div>')[0];
+    let refLinks = $('<div style="display: none;" class="caosdb-value-list"><a class="caosdb-f-reference-value"><span class="caosdb-id">1234</span></a><a class="caosdb-f-reference-value"><span class="caosdb-id">2345</span></a><a class="caosdb-f-reference-value"><span class="caosdb-id">3456</span></a><a class="caosdb-f-reference-value"><span class="caosdb-id">4567</span></a></div>')[0];
     assert.throws(() => {
         preview.createCarouselNav();
     }, "no param throws");
@@ -875,16 +872,16 @@ QUnit.test("createCarouselNav", function (assert) {
 
     let nav = preview.createCarouselNav(refLinks, "cid");
     assert.equal(nav.className, "caosdb-preview-carousel-nav", "caosdb-carousel-nav");
-    assert.ok($(nav).find('[data-slide="prev"][href="#cid"]')[0], "has prev button");
-    assert.ok($(nav).find('[data-slide="next"][href="#cid"]')[0], "has next button");
+    assert.ok($(nav).find('[data-bs-slide="prev"][href="#cid"]')[0], "has prev button");
+    assert.ok($(nav).find('[data-bs-slide="next"][href="#cid"]')[0], "has next button");
     let selectors = preview.getRefLinksContainer(nav);
     assert.equal(selectors.children.length, 4, '4 selctor buttons');
     $(document.body).append(nav);
     assert.equal($(selectors).is(':hidden'), false, "selectors not hidden.");
     $(nav).remove();
     $(selectors).find('a').each((index, button) => {
-        assert.equal(button.getAttribute("data-slide-to"), index, "buttons have correct data-slide-to attribute");
-        assert.equal(button.getAttribute("data-target"), "#cid", "buttons have correct data-target attribute");
+        assert.equal(button.getAttribute("data-bs-slide-to"), index, "buttons have correct data-bs-slide-to attribute");
+        assert.equal(button.getAttribute("data-bs-target"), "#cid", "buttons have correct data-bs-target attribute");
         assert.notOk(button.getAttribute("href"), "button dont have href");
     });
     assert.equal($(selectors).find('a:first').hasClass('active'), true, "first button is active");
@@ -892,11 +889,11 @@ QUnit.test("createCarouselNav", function (assert) {
 });
 
 {
-    let refLinks = $('<div class="caosdb-value-list"><a><span class="caosdb-id">1234</span></a><a><span class="caosdb-id">2345</span></a><a><span class="caosdb-id">3456</span></a><a><span class="caosdb-id">4567</span></a></div>')[0];
-    let e1 = $('<div><div class="caosdb-id">1234</div></div>')[0];
-    let e2 = $('<div><div class="caosdb-id">2345</div></div>')[0];
-    let e3 = $('<div><div class="caosdb-id">3456</div></div>')[0];
-    let e4 = $('<div><div class="caosdb-id">4567</div></div>')[0];
+    let refLinks = $('<div class="caosdb-value-list"><a class="caosdb-f-reference-value"><span class="caosdb-id">1234</span></a><a class="caosdb-f-reference-value"><span class="caosdb-id">2345</span></a><a class="caosdb-f-reference-value"><span class="caosdb-id">3456</span></a><a class="caosdb-f-reference-value"><span class="caosdb-id">4567</span></a></div>')[0];
+    let e1 = $('<a class="caosdb-f-reference-value"><div class="caosdb-id">1234</div></a>')[0];
+    let e2 = $('<a class="caosdb-f-reference-value"><div class="caosdb-id">2345</div></a>')[0];
+    let e3 = $('<a class="caosdb-f-reference-value"><div class="caosdb-id">3456</div></a>')[0];
+    let e4 = $('<a class="caosdb-f-reference-value"><div class="caosdb-id">4567</div></a>')[0];
     let entities = [e1, e3, e4, e2];
     let carousel = preview.createPreviewCarousel(entities, refLinks);
     let correct_order_id = ["1234", "2345", "3456", "4567"];
@@ -923,16 +920,16 @@ QUnit.test("createCarouselNav", function (assert) {
         assert.equal($(carousel).find("." + preview.classNamePreviewCarouselNav).length, 1, "carousel has nav");
         assert.equal($(carousel).find(".carousel-inner").length, 1, "carousel has inner");
         for (let i = 0; i < correct_order_id.length; i++) {
-            assert.equal(getEntityId($(carousel).find('.item')[i]), correct_order_id[i], "entities ids are in order")
+            assert.equal(getEntityId($(carousel).find('.carousel-item')[i]), correct_order_id[i], "entities ids are in order")
         }
 
         assert.ok(carousel.id, "has id");
-        assert.equal($(carousel).attr("data-interval"), "false", "no auto-sliding");
+        assert.equal($(carousel).attr("data-bs-interval"), "false", "no auto-sliding");
     });
 
     QUnit.test("getSelectorButtons", function (assert) {
         assert.ok(preview.getSelectorButtons, "function available");
-        assert.equal(preview.getSelectorButtons($(carousel).find('.' + preview.classNamePreviewCarouselNav)[0])[0].getAttribute('data-slide-to'), "0", "found selector button");
+        assert.equal(preview.getSelectorButtons($(carousel).find('.' + preview.classNamePreviewCarouselNav)[0])[0].getAttribute('data-bs-slide-to'), "0", "found selector button");
     });
 
     QUnit.test("setActiveSlideItemSelector", function (assert) {
@@ -960,8 +957,8 @@ QUnit.test("createCarouselNav", function (assert) {
         assert.equal(preview.setActiveSlideItemSelector(carousel, 1), carousel, "returns carousel");
         for (let i = 0; i < correct_order_id.length; i++) {
             preview.setActiveSlideItemSelector(carousel, i);
-            assert.equal($($(carousel).find('[data-slide-to]')[i]).hasClass("active"), true, "button " + i + " is active");
-            assert.equal($(carousel).find('.item.active').length, 1, "and none else");
+            assert.equal($($(carousel).find('[data-bs-slide-to]')[i]).hasClass("active"), true, "button " + i + " is active");
+            assert.equal($(carousel).find('.carousel-item.active').length, 1, "and none else");
         }
     });
 
@@ -970,11 +967,11 @@ QUnit.test("createCarouselNav", function (assert) {
 
         preview.setActiveSlideItemSelector(carousel, 1);
         assert.equal(preview.getActiveSlideItemIndex(carousel), 0, "before: active item is 0");
-        assert.equal($(carousel).find('.' + preview.classNamePreviewCarouselNav).find('.active')[0].getAttribute('data-slide-to'), 1, 'before: active selector is 1.');
+        assert.equal($(carousel).find('.' + preview.classNamePreviewCarouselNav).find('.active')[0].getAttribute('data-bs-slide-to'), 1, 'before: active selector is 1.');
         $(carousel).on('slid.bs.carousel', preview.triggerUpdateActiveSlideItemSelector);
         $(carousel).trigger('slid.bs.carousel');
         assert.equal(preview.getActiveSlideItemIndex(carousel), 0, "after: active item is 0");
-        assert.equal($(carousel).find('.' + preview.classNamePreviewCarouselNav).find('.active')[0].getAttribute('data-slide-to'), 0, 'after: active selector is 0.');
+        assert.equal($(carousel).find('.' + preview.classNamePreviewCarouselNav).find('.active')[0].getAttribute('data-bs-slide-to'), 0, 'after: active selector is 0.');
     });
 
     QUnit.test("createPreview", function (assert) {
@@ -1056,21 +1053,21 @@ QUnit.test("createCarouselNav", function (assert) {
 
 QUnit.test("preparePreviewEntity", function (assert) {
     assert.ok(preview.preparePreviewEntity, "function available");
-    let e = $('<div><div class="badge caosdb-id">1234</div></div>')[0];
+    let e = $('<div><div class="caosdb-v-entity-header-buttons-list"><div class="caosdb-f-reference-value"><a class="caosdb-id">1234</a></div></div></div>')[0];
     let prepared = preview.preparePreviewEntity(e);
-    assert.equal($(prepared).find('a.caosdb-id')[0].href, connection.getBasePath() + "Entity/1234", "link is correct.");
+    assert.equal($(prepared).find("a[title='Load this entity in a new window.']")[0].href, connection.getBasePath() + "Entity/1234", "link is correct.");
 });
 
 QUnit.test("getEntityRef", function (assert) {
     assert.ok(preview.getEntityRef, 'function available');
 
-    var html = $('<div><div class="caosdb-id">sdfg</div></div>')[0];
+    var html = $('<div class="caosdb-f-reference-value"><div class="caosdb-id">sdfg</div></div>')[0];
     assert.equal(preview.getEntityRef(html), "sdfg", "id extracted");
 
-    html = $('<div><div class="caosdb-id"></div></div>')[0];
+    html = $('<div class="caosdb-f-reference-value"><div class="caosdb-id"></div></div>')[0];
     assert.equal(preview.getEntityRef(html), "", "empty string extracted");
 
-    html = $('<div></div>')[0];
+    html = $('<div class="caosdb-f-reference-value"></div>')[0];
     assert.throws(() => {
         preview.getEntityRef(html);
     }, "missing .caosdb-id throws");
@@ -1264,133 +1261,6 @@ QUnit.test("initPaging", function (assert) {
     assert.equal(initPaging(getPageHref(window.location.href, "0L10"), 1234), true, "1234 returns true.");
     assert.equal(initPaging(getPageHref(window.location.href, "0L10"), '1234'), true, "'1234' returns true.");
 
-    // test effectiveness
-    let $pagingPanel = $('<div>', {
-        "class": "caosdb-paging-panel"
-    });
-    let $prevButton = $('<a>', {
-        "class": "caosdb-prev-button"
-    });
-    let $nextButton = $('<a>', {
-        "class": "caosdb-next-button"
-    });
-
-    $pagingPanel.append($prevButton).append($nextButton);
-    $(document.body).append($pagingPanel);
-
-    $prevButton.hide();
-    $nextButton.hide();
-    $pagingPanel.hide();
-
-
-    // no paging at all:
-    let hidden_prev = $('.caosdb-prev-button').css("display") == "none";
-    let hidden_next = $('.caosdb-next-button').css("display") == "none";
-    let hidden_panel = $('.caosdb-paging-panel').css("display") == "none";
-
-    initPaging(window.location.href);
-    hidden_prev = hidden_prev && $('.caosdb-prev-button').css("display") == "none";
-    hidden_next = hidden_next && $('.caosdb-next-button').css("display") == "none";
-    hidden_panel = hidden_panel && $('.caosdb-paging-panel').css("display") == "none";
-
-    initPaging(window.location.href, null);
-    hidden_prev = hidden_prev && $('.caosdb-prev-button').css("display") == "none";
-    hidden_next = hidden_next && $('.caosdb-next-button').css("display") == "none";
-    hidden_panel = hidden_panel && $('.caosdb-paging-panel').css("display") == "none";
-
-    initPaging(null, null);
-    hidden_prev = hidden_prev && $('.caosdb-prev-button').css("display") == "none";
-    hidden_next = hidden_next && $('.caosdb-next-button').css("display") == "none";
-    hidden_panel = hidden_panel && $('.caosdb-paging-panel').css("display") == "none";
-
-    initPaging(window.location.href, "100");
-    hidden_prev = hidden_prev && $('.caosdb-prev-button').css("display") == "none";
-    hidden_next = hidden_next && $('.caosdb-next-button').css("display") == "none";
-    hidden_panel = hidden_panel && $('.caosdb-paging-panel').css("display") == "none";
-
-    initPaging(window.location.href, 100);
-    hidden_prev = hidden_prev && $('.caosdb-prev-button').css("display") == "none";
-    hidden_next = hidden_next && $('.caosdb-next-button').css("display") == "none";
-    hidden_panel = hidden_panel && $('.caosdb-paging-panel').css("display") == "none";
-
-    initPaging(getPageHref(window.location.href, "0L100"), "100");
-    hidden_prev = hidden_prev && $('.caosdb-prev-button').css("display") == "none";
-    hidden_next = hidden_next && $('.caosdb-next-button').css("display") == "none";
-    hidden_panel = hidden_panel && $('.caosdb-paging-panel').css("display") == "none";
-
-    assert.equal(hidden_prev, true, "prev button has display=none");
-    assert.equal(hidden_next, true, "next button has display=none");
-    assert.equal(hidden_panel, true, "paging panel has display=none");
-
-    // show next button
-    initPaging(getPageHref(window.location.href, "0L10"), 100);
-    hidden_prev = $('.caosdb-prev-button').css("display") == "none";
-    hidden_panel = $('.caosdb-paging-panel').css("display") != "block";
-    hidden_next = $('.caosdb-next-button').css("display") != "inline";
-    let nextHrefOk = $('.caosdb-next-button').attr('href') == getPageHref(window.location.href, "10L10");
-
-    initPaging(getPageHref(window.location.href, "0L10"), "100");
-    hidden_prev = hidden_prev && $('.caosdb-prev-button').css("display") == "none";
-    hidden_panel = hidden_panel || $('.caosdb-paging-panel').css("display") != "block";
-    hidden_next = hidden_next || $('.caosdb-next-button').css("display") != "inline";
-    nextHrefOk = nextHrefOk && $('.caosdb-next-button').attr('href') == getPageHref(window.location.href, "10L10");
-
-    initPaging(getPageHref(window.location.href, "0L99"), "100");
-    hidden_prev = hidden_prev && $('.caosdb-prev-button').css("display") == "none";
-    hidden_panel = hidden_panel || $('.caosdb-paging-panel').css("display") != "block";
-    hidden_next = hidden_next || $('.caosdb-next-button').css("display") != "inline";
-    nextHrefOk = nextHrefOk && $('.caosdb-next-button').attr('href') == getPageHref(window.location.href, "99L99");
-
-    assert.equal(hidden_prev, true, "prev button has display=none");
-    assert.equal(hidden_next, false, "next button has display=inline");
-    assert.equal(hidden_panel, false, "paging panel has display=block");
-    assert.equal(nextHrefOk, true, "next buttons href is ok");
-
-    // show prev button
-    initPaging(getPageHref(window.location.href, "10L100"), 100);
-    hidden_prev = $('.caosdb-prev-button').css("display") != "inline";
-    hidden_panel = $('.caosdb-paging-panel').css("display") != "block";
-    hidden_next = $('.caosdb-next-button').css("display") == "none";
-    let prevHrefOk = $('.caosdb-prev-button').attr('href') == getPageHref(window.location.href, "0L100");
-
-    initPaging(getPageHref(window.location.href, "1L100"), 100);
-    hidden_prev = hidden_prev || $('.caosdb-prev-button').css("display") != "inline";
-    hidden_panel = hidden_panel || $('.caosdb-paging-panel').css("display") != "block";
-    hidden_next = hidden_next && $('.caosdb-next-button').css("display") == "none";
-    prevHrefOk = prevHrefOk && $('.caosdb-prev-button').attr('href') == getPageHref(window.location.href, "0L100");
-
-    initPaging(getPageHref(window.location.href, "20L10"), 100);
-    hidden_prev = hidden_prev || $('.caosdb-prev-button').css("display") != "inline";
-    hidden_panel = hidden_panel || $('.caosdb-paging-panel').css("display") != "block";
-    prevHrefOk = prevHrefOk && $('.caosdb-prev-button').attr('href') == getPageHref(window.location.href, "10L10");
-
-    assert.equal(hidden_prev, false, "prev button has display=inline");
-    assert.equal(hidden_next, true, "next button has display=none");
-    assert.equal(hidden_panel, false, "paging panel has display=block");
-    assert.equal(prevHrefOk, true, "prev buttons href is ok");
-
-    // show both
-    initPaging(getPageHref(window.location.href, "10L10"), 100);
-    hidden_prev = $('.caosdb-prev-button').css("display") != "inline";
-    hidden_panel = $('.caosdb-paging-panel').css("display") != "block";
-    hidden_next = $('.caosdb-next-button').css("display") != "inline";
-    nextHrefOk = nextHrefOk && $('.caosdb-next-button').attr('href') == getPageHref(window.location.href, "20L10");
-    prevHrefOk = prevHrefOk && $('.caosdb-prev-button').attr('href') == getPageHref(window.location.href, "0L10");
-
-    initPaging(getPageHref(window.location.href, "1L100"), 200);
-    hidden_prev = hidden_prev || $('.caosdb-prev-button').css("display") != "inline";
-    hidden_panel = hidden_panel || $('.caosdb-paging-panel').css("display") != "block";
-    hidden_next = hidden_next || $('.caosdb-next-button').css("display") != "inline";
-    nextHrefOk = nextHrefOk && $('.caosdb-next-button').attr('href') == getPageHref(window.location.href, "101L100");
-    prevHrefOk = prevHrefOk && $('.caosdb-prev-button').attr('href') == getPageHref(window.location.href, "0L100");
-
-    assert.equal(hidden_prev, false, "prev button has display=inline");
-    assert.equal(hidden_next, false, "next button has display=inline");
-    assert.equal(hidden_panel, false, "paging panel has display=block");
-    assert.equal(prevHrefOk, true, "prev buttons href is ok");
-    assert.equal(nextHrefOk, true, "next buttons href is ok");
-
-    document.body.removeChild($pagingPanel[0]);
 });
 
 
@@ -1556,8 +1426,8 @@ QUnit.test("convertNewCommentResponse", function (assert) {
     let convertNewAnnotationResponse = annotation.convertNewCommentResponse;
     assert.ok(convertNewAnnotationResponse, "function exists.");
     let done = assert.async();
-    let testResponse = '<Response><Record><Property name="annotationOf"/><History transaction="INSERT" datetime="2015-12-24T20:15:00" username="someuser"/><Property name="comment">This is a comment</Property></Record></Response>';
-    let expectedResult = "<li xmlns=\"http://www.w3.org/1999/xhtml\" class=\"list-group-item markdowned\"><div class=\"media\"><div class=\"media-left\"><h3>»</h3></div><div class=\"media-body\"><h4 class=\"media-heading\">someuser<small><i> posted on 2015-12-24T20:15:00</i></small></h4><p class=\"caosdb-comment-annotation-text\"><p>This is a comment</p></p></div></div></li>";
+    let testResponse = '<Response><Record><Property name="annotationOf"/><Version head="true" date="2015-12-24T20:15:00" username="someuser"/><Property name="comment">This is a comment</Property></Record></Response>';
+    let expectedResult = "<li xmlns=\"http://www.w3.org/1999/xhtml\" class=\"list-group-item markdowned\"><div class=\"d-flex\"><div class=\"d-shrink-0\">»</div><div class=\"flex-grow-1 ms-3\"><div class=\"caosdb-f-comment-header\">someuser<small><i> posted on 2015-12-24T20:15:00</i></small></div><div class=\"caosdb-f-comment-body\"><small><p class=\"caosdb-comment-annotation-text\"><p>This is a comment</p></p></small></div></div></div></li>";
     convertNewAnnotationResponse(str2xml(testResponse), annotation.loadAnnotationXsl("../../")).then(function (result) {
         assert.equal(result.length, 1, "one element returned.");
         assert.equal(xml2str(result[0]).replace(/\n/g, ""), expectedResult, "result converted correctly");
diff --git a/test/core/js/modules/welcome.xsl.js b/test/core/js/modules/welcome.xsl.js
index 39fb9fd0edd9e4950e9bbad3189b2aeed4ed7a7c..de59eedca9bbacdbc4c797f9bfd51d11bb332132 100644
--- a/test/core/js/modules/welcome.xsl.js
+++ b/test/core/js/modules/welcome.xsl.js
@@ -46,10 +46,10 @@ QUnit.test("availability", function(assert) {
 	assert.ok(this.welcomeXSL);
 })
 
-QUnit.test("welcome template produces .caosdb-f-welcome-panel", function(assert) {
+QUnit.test("welcome template produces .caosdb-v-welcome-panel", function(assert) {
     var xsl = injectTemplate(this.welcomeXSL, '<xsl:template match="/"><xsl:call-template name="welcome"/></xsl:template>');
     var xml_str = '<root>';
     var xml = str2xml(xml_str);
     var html = xslt(xml, xsl);
-    assert.ok($(html.firstElementChild).hasClass("caosdb-f-welcome-panel"), "has class .caosdb-f-welcome-panel");
+    assert.ok($(html.firstElementChild).hasClass("caosdb-v-welcome-panel"), "has class .caosdb-v-welcome-panel");
 });