diff --git a/client/src/components/Level.tsx b/client/src/components/Level.tsx
index e093b25..1f6eed2 100644
--- a/client/src/components/Level.tsx
+++ b/client/src/components/Level.tsx
@@ -194,7 +194,7 @@ function Level() {
 
 
           <EditorContext.Provider value={editorConnection}>
-            {editorConnection ? <Main /> : null}
+            {editorConnection ? <Main key={`${worldId}/${levelId}`}/> : null}
           </EditorContext.Provider>
         </Grid>
       </Grid>
diff --git a/client/src/components/infoview/info.tsx b/client/src/components/infoview/info.tsx
index a7ca772..199b924 100644
--- a/client/src/components/infoview/info.tsx
+++ b/client/src/components/infoview/info.tsx
@@ -145,7 +145,7 @@ const InfoDisplayContent = React.memo((props: InfoDisplayContentProps) => {
                     {' '}or <a className='link pointer dim' onClick={e => { e.preventDefault(); setPaused(false); }}>resume updating</a>
                     {' '}to see information.
                 </span> :
-                'No info found.')}
+                'Loading goal...')}
     </>
 })
 
diff --git a/client/src/components/infoview/messages.tsx b/client/src/components/infoview/messages.tsx
index 12bdaed..f934505 100644
--- a/client/src/components/infoview/messages.tsx
+++ b/client/src/components/infoview/messages.tsx
@@ -71,7 +71,7 @@ function mkMessageViewProps(uri: DocumentUri, messages: InteractiveDiagnostic[])
 /** Shows the given messages assuming they are for the given file. */
 export const MessagesList = React.memo(({uri, messages}: {uri: DocumentUri, messages: InteractiveDiagnostic[]}) => {
     const should_hide = messages.length === 0;
-    if (should_hide) { return <>No messages.</> }
+    if (should_hide) { return <></> }
 
     return (
     <div className="ml1">
@@ -140,7 +140,7 @@ export function AllMessages({uri: uri0}: { uri: DocumentUri }) {
                 </a>
             </span>
         </summary> */}
-        <AllMessagesBody uri={uri} messages={iDiags} />
+        <AllMessagesBody uri={uri} key={uri} messages={iDiags} />
     {/* </Details> */}
     </RpcContext.Provider>
     )