diff --git a/frontend/README.md b/README.md
similarity index 100%
rename from frontend/README.md
rename to README.md
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1c3ca68a..f9f04041 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -4195,9 +4195,9 @@
       "license": "MIT"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5953,9 +5953,9 @@
       }
     },
     "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/frontend/src/ModalContent.tsx b/frontend/src/ModalContent.tsx
index 29406894..590fdd59 100644
--- a/frontend/src/ModalContent.tsx
+++ b/frontend/src/ModalContent.tsx
@@ -2,7 +2,6 @@
 /* eslint-disable @typescript-eslint/restrict-plus-operands */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable react/no-unescaped-entities */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { useEffect, useState } from 'react'
 import { TextView } from 'utopia-ui'
@@ -45,77 +44,6 @@ export function Welcome1({ clickAction1, map }: ChapterProps) {
   )
 }
 
-export function Welcome2({ clickAction1 }: ChapterProps) {
-  return (
-    <>
-      <h3 className='font-bold text-lg'> Dencentralized Networking</h3>
-      <img className='float-right w-32 mx-4 my-2' src='/markers-circle.svg'></img>
-
-      <p className='py-3'>
-        Find like-minded people, projects and events. In your neighbourhood and wherever you are!
-      </p>
-      <p className='py-3'>Onboard new people, places and events</p>
-      <div className='grid'>
-        <button className='btn place-self-end mt-4' onClick={() => clickAction1!()}>
-          next
-        </button>
-      </div>
-    </>
-  )
-}
-
-export function Welcome3({ clickAction1 }: ChapterProps) {
-  return (
-    <>
-      <h3 className='font-bold text-lg'>Mapping the Change</h3>
-      <p className='py-3'>More and more people are waking up to what's really happening. </p>
-      <p className='py-1'>
-        They are in the process of understanding the potential that is within themselves and within
-        the whole mankind.
-      </p>
-      <img className='float-left w-32 mx-4' src='/3markers-globe.svg'></img>
-
-      <p className='py-1'>
-        Starting to reconnect with our Mother Earth and beginning to question things that long times
-        have been taken for granted.
-      </p>
-      <div className='grid'>
-        <label className='btn place-self-end mt-4' onClick={() => clickAction1!()}>
-          next
-        </label>
-      </div>
-    </>
-  )
-}
-
-export function Welcome4({ clickAction1 }: ChapterProps) {
-  return (
-    <>
-      <h3 className='font-bold text-lg'> Dezentralized Networks </h3>
-
-      <p className='py-3'>
-        Find like-minded people, places and events. In your neighbourhood and wherever you are!
-      </p>
-      <img className='float-right w-32 mx-4 my-2' src='/network.svg'></img>
-
-      <p className='py-1'>
-        Hypnotised, they sit in front of screens in concrete blocks, flooded and disillusioned by
-        irrelevant information.
-      </p>
-
-      <p className='py-1'>
-        From an early age, they are trained to do alienated work and consume unhealthy and
-        meaningless products.
-      </p>
-      <div className='grid'>
-        <button className='btn place-self-end mt-4' onClick={() => clickAction1!()}>
-          next
-        </button>
-      </div>
-    </>
-  )
-}
-
 const close = () => {
   const myModal = document.getElementById('my_modal_3') as HTMLDialogElement
   myModal.close()
@@ -147,34 +75,6 @@ export const ModalContent = ({ map }: { map: any }) => {
             }}
           />
         )
-      case 2:
-        return (
-          <Welcome2
-            clickAction1={() => {
-              setChapter(3)
-            }}
-          />
-        )
-      case 3:
-        return (
-          <Welcome3
-            clickAction1={() => {
-              setChapter(4)
-            }}
-          />
-        )
-      case 4:
-        return (
-          <Welcome4
-            clickAction1={() => {
-              close()
-              setTimeout(() => {
-                //  setQuestsOpen(true);
-                setChapter(1)
-              }, 1000)
-            }}
-          />
-        )
       default:
         return <></>
     }
diff --git a/frontend/src/pages/MapContainer.tsx b/frontend/src/pages/MapContainer.tsx
index 3ca2e349..6e39a682 100644
--- a/frontend/src/pages/MapContainer.tsx
+++ b/frontend/src/pages/MapContainer.tsx
@@ -120,7 +120,9 @@ function MapContainer({ layers, map }: { layers: LayerProps[]; map: any }) {
                 {layer.itemType.show_name_input && (
                   <PopupTextInput dataField='name' placeholder='Name'></PopupTextInput>
                 )}
-                {layer.itemType.show_start_end_input && <PopupStartEndInput></PopupStartEndInput>}
+                {layer.itemType.show_start_end_input && (
+                  <PopupStartEndInput showLabels={false}></PopupStartEndInput>
+                )}
                 {layer.itemType.show_text_input && (
                   <div className='mt-4'>
                     <PopupTextAreaInput
diff --git a/lib/README.md b/lib/README.md
index 4b0f5124..0d88014b 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -1,4 +1,4 @@
-# Utopia UI [![npm version](https://img.shields.io/npm/v/utopia-ui.svg)](https://www.npmjs.com/package/utopia-ui)  ![Build Status](https://img.shields.io/github/actions/workflow/status/utopia-os/utopia-ui/test.build.yml?branch=main) ![Test Coverage](https://utopia-os.org/utopia-ui/test-coverage.svg) [![Docs Coverage](https://utopia-os.org/utopia-ui/coverage.svg)](https://utopia-os.org/utopia-ui/) ![License](https://img.shields.io/github/license/utopia-os/utopia-ui)
+# Utopia UI [![npm version](https://img.shields.io/npm/v/utopia-ui.svg)](https://www.npmjs.com/package/utopia-ui)  ![Build Status](https://img.shields.io/github/actions/workflow/status/utopia-os/utopia-ui/test.build.yml?branch=main) ![Test Coverage](https://utopia-os.org/utopia-map/test-coverage.svg) [![Docs Coverage](https://utopia-os.org/utopia-map/coverage.svg)](https://utopia-os.org/utopia-map/utopia-ui/coverage.svg) ![License](https://img.shields.io/github/license/utopia-os/utopia-ui)
 
 **UI Framework for Real-Life-Networking-Apps**
 
diff --git a/lib/package-lock.json b/lib/package-lock.json
index 20c727fe..b437933e 100644
--- a/lib/package-lock.json
+++ b/lib/package-lock.json
@@ -3978,9 +3978,9 @@
       "license": "ISC"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12562,9 +12562,9 @@
       }
     },
     "node_modules/test-exclude/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13054,9 +13054,9 @@
       }
     },
     "node_modules/typedoc/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/lib/rollup.config.js b/lib/rollup.config.js
index e739c2b1..a68ba830 100644
--- a/lib/rollup.config.js
+++ b/lib/rollup.config.js
@@ -42,7 +42,12 @@ export default [
         extensions: ['.ts', '.tsx'],
       }),
       commonjs({
-        include: /node_modules/,
+        include: [
+          /node_modules\/attr-accept/,
+          /node_modules\/tiptap-markdown/,
+          /node_modules\/markdown-it-task-lists/,
+          /node_modules\/classnames/,
+        ],
         requireReturnsDefault: 'auto',
       }),
       postcss({