diff --git a/README.md b/README.md
index a1dea0380..b45bd566e 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@ Almost reaching a feature set that we can call v1. Before that:
 - [ ] Linux version
 - [ ] Companion integration
 - [ ] Lower Third Manager
+- [ ] Note only event
 - [ ] URL Aliases (define configurable aliases to ease onsite setup)
 - [ ] Logging view
 - [ ] Reach Schedule: way to speedup timer to meet a deadline
diff --git a/client/src/features/info/Info.jsx b/client/src/features/info/Info.jsx
index 445dfdf51..4f0f51e18 100644
--- a/client/src/features/info/Info.jsx
+++ b/client/src/features/info/Info.jsx
@@ -18,7 +18,7 @@ export default function Info() {
     presenterNext: '',
     noteNext: '',
   });
-  const [selected, setSelected] = useState('-/-');
+  const [selected, setSelected] = useState('No events');
   const logData = [];
 
   // handle incoming messages
@@ -38,11 +38,14 @@ export default function Info() {
 
     // Handle selection data
     socket.on('selected', (data) => {
-      const formatedCurrent = `Event ${
-        data.index != null ? data.index + 1 : '-'
-      }/${data.total != null ? data.total : '-'}`;
-
-      setSelected(formatedCurrent);
+      if (data.total === 0 || data.total == null) {
+        setSelected('No events');
+      } else {
+        const formatedCurrent = `Event ${
+          data.index != null ? data.index + 1 : '-'
+        }/${data.total != null ? data.total : '-'}`;
+        setSelected(formatedCurrent);
+      }
     });
 
     // Clear listener
@@ -70,7 +73,10 @@ export default function Info() {
 
   return (
     <>
-      <div className={style.main}>{selected}</div>
+      <div className={style.main}>
+        <span>{`Running on port 4001`}</span>
+        <span>{selected}</span>
+      </div>
       {/* <InfoLogger logData={logData} /> */}
       <InfoNif />
       <InfoTitle title={'Now'} data={titlesNow} />
diff --git a/client/src/features/info/Info.module.css b/client/src/features/info/Info.module.css
index 314822f08..fc8fb38d7 100644
--- a/client/src/features/info/Info.module.css
+++ b/client/src/features/info/Info.module.css
@@ -10,8 +10,9 @@
 
 .main {
   font-size: 0.9em;
-  text-align: right;
   color: #ff7597;
+  display: flex;
+  justify-content: space-between;
 }
 
 .header {
diff --git a/client/src/features/info/InfoNif.jsx b/client/src/features/info/InfoNif.jsx
index 46d862ab9..8008214aa 100644
--- a/client/src/features/info/InfoNif.jsx
+++ b/client/src/features/info/InfoNif.jsx
@@ -39,6 +39,7 @@ export default function InfoNif() {
               {data?.networkInterfaces.map((e) => {
                 return (
                   <a
+                    key={e.address}
                     href='/'
                     onClick={() =>
                       handleLink(baseURL.replace('__IP__', e.address))
diff --git a/server/package.json b/server/package.json
index a4fc8af91..4f7bf78c4 100644
--- a/server/package.json
+++ b/server/package.json
@@ -5,7 +5,7 @@
   "description": "Time keeping for live events",
   "repository": "https://github.com/cpvalente/ontime",
   "keywords": [ "lighdev", "ontime", "timer" ],
-  "license": "lgpl-3.0",
+  "license": "AGPL-3.0-only",
   "main": "main.js",
   "devDependencies": {
     "concurrently": "^6.1.0",
diff --git a/server/src/classes/EventTimer.js b/server/src/classes/EventTimer.js
index 2d2bb16ff..30edaef49 100644
--- a/server/src/classes/EventTimer.js
+++ b/server/src/classes/EventTimer.js
@@ -487,6 +487,9 @@ export class EventTimer extends Timer {
     // set general
     this._eventlist = [];
     this.numEvents = 0;
+
+    // broadcast change
+    this.broadcastState();
   }
 
   setupWithEventList(eventlist) {