diff --git a/README.md b/README.md
index 927f3c645..96d8882bc 100644
--- a/README.md
+++ b/README.md
@@ -538,7 +538,8 @@ See [`docs/dev.md`](https://github.com/creatorsim/creator/blob/master/docs/dev.m
   <p align="center">
     <img src="https://github.com/user-attachments/assets/681e1f79-d019-40d1-89da-e45326d84ab1" height="100" alt="Universidad Carlos III de Madrid Logo"/>
     <img src="https://github.com/user-attachments/assets/c31a97e8-eaf7-4440-9f2a-dc7ca773b5a2" height="100" alt="Universidad Carlos III de Madrid Logo"/>
-    <img src="https://github.com/user-attachments/assets/28ae0396-852c-4c4c-8812-bc7dc494e3c3" height="100" alt="Universidad de Leon Logo"/
+    <img src="https://github.com/user-attachments/assets/28ae0396-852c-4c4c-8812-bc7dc494e3c3" height="100" alt="Universidad de Leon Logo"/>
+    <img src="https://github.com/user-attachments/assets/a9941cad-e999-4368-8ef9-489565d697b8" height="100" alt="Universidad Politécnica de Madrid Logo"/>
   </p>
 </div>
 
diff --git a/src/web/assets/img/institutions/upm.png b/src/web/assets/img/institutions/upm.png
new file mode 100644
index 000000000..aadc0d42b
Binary files /dev/null and b/src/web/assets/img/institutions/upm.png differ
diff --git a/src/web/assets/img/institutions/upm.webp b/src/web/assets/img/institutions/upm.webp
new file mode 100644
index 000000000..f38961a06
Binary files /dev/null and b/src/web/assets/img/institutions/upm.webp differ
diff --git a/src/web/components/assembly/AssemblyActions.vue b/src/web/components/assembly/AssemblyActions.vue
index bc4da5b98..0a0d9211b 100644
--- a/src/web/components/assembly/AssemblyActions.vue
+++ b/src/web/components/assembly/AssemblyActions.vue
@@ -130,7 +130,7 @@ const usesCreatorAssembler = computed(() => {
 });
 
 const showLibraryButton = computed(() => {
-  return ((usesCreatorAssembler.value && libraryLoaded.value) || architecture.config.name.includes("SRV"));
+  return ((usesCreatorAssembler.value && libraryLoaded.value) || architecture?.config?.name?.includes("SRV"));
 });
 
 // Watch for architecture changes
diff --git a/src/web/components/assembly/LibraryTags.vue b/src/web/components/assembly/LibraryTags.vue
index f13086e7e..d031bfdd9 100644
--- a/src/web/components/assembly/LibraryTags.vue
+++ b/src/web/components/assembly/LibraryTags.vue
@@ -38,7 +38,7 @@ export default {
   computed: {
     libraryLoaded() {
       // Access libraryVersion to make this reactive to library changes
-      if (architecture.config.name.includes("SRV"))
+      if (architecture?.config?.name?.includes("SRV"))
         return (
           this.libraryVersion >= 0 &&
           loadedLibrary && (libtags32.length !== 0 || libtags64.length !== 0) &&
diff --git a/src/web/components/assembly/LoadLibrary.vue b/src/web/components/assembly/LoadLibrary.vue
index fb508ad1d..14009d39c 100644
--- a/src/web/components/assembly/LoadLibrary.vue
+++ b/src/web/components/assembly/LoadLibrary.vue
@@ -27,21 +27,21 @@ export default defineComponent({
   },
 
   data() {
-    return { 
+    return {
       library: null,
-      compiler: architecture.config.name
-     };
+      compiler: architecture?.config?.name,
+    };
   },
   computed: {
     file_accept() {
-      return (this.compiler.includes("SRV") ? ".o" : ".yml");
-    }
+      return this.compiler?.includes("SRV") ? ".o" : ".yml";
+    },
   },
 
   methods: {
     load() {
       // read file
-      if (!this.compiler.includes("SRV")) {
+      if (!this.compiler?.includes("SRV")) {
         show_loading();
         const reader = new FileReader();
         reader.onload = _event => {
@@ -61,7 +61,7 @@ export default defineComponent({
       } else {
         show_loading();
         const reader = new FileReader();
-        var arrayBuffer;
+        let arrayBuffer;
         reader.onload = _event => {
           try {
             load_library_sail(new Uint8Array(reader.result), document.getElementById("binary_file").files[0].name);
@@ -70,8 +70,6 @@ export default defineComponent({
           }
         };
         reader.readAsArrayBuffer(this.library!);
-
-
       }
     },
   },
diff --git a/src/web/components/assembly/SaveLibrary.vue b/src/web/components/assembly/SaveLibrary.vue
index 2441418c5..29010c448 100644
--- a/src/web/components/assembly/SaveLibrary.vue
+++ b/src/web/components/assembly/SaveLibrary.vue
@@ -54,7 +54,7 @@ export default defineComponent({
         }
       >,
 
-      compiler: architecture.config.name,
+      compiler: architecture?.config?.name,
 
       /*Binary data*/
       binaryHex: "",
@@ -202,7 +202,7 @@ export default defineComponent({
      */
     async handleShown() {
       // Compile as library
-      if (!this.compiler.includes("SRV")){
+      if (!this.compiler?.includes("SRV")){
         const compiled = await this.compileAsLibrary();
         if (!compiled) {
           // Close modal if compilation failed
@@ -230,7 +230,7 @@ export default defineComponent({
      */
     handleOk(evt: any) {
       evt.preventDefault();
-      if (this.compiler.includes("SRV"))
+      if (this.compiler?.includes("SRV"))
         this.library_save_sail();
       else 
         this.library_save();
@@ -464,7 +464,7 @@ export default defineComponent({
           title="File name"
         />
         <small class="form-text text-muted"
-          >File will be saved as {{ name_binary_save || "library" }} {{ (compiler.includes("SRV")) ? ".o" : ".yml" }}</small
+          >File will be saved as {{ name_binary_save || "library" }} {{ (compiler?.includes("SRV")) ? ".o" : ".yml" }}</small
         >
       </b-form-group>
       <hr class="my-4" />
diff --git a/src/web/components/assembly/TextareaAssembly.vue b/src/web/components/assembly/TextareaAssembly.vue
index 1e571aff9..4fa5bd0c3 100644
--- a/src/web/components/assembly/TextareaAssembly.vue
+++ b/src/web/components/assembly/TextareaAssembly.vue
@@ -504,7 +504,7 @@ watch(
 <template> 
  <!-- Editor monaco  -->
   <div class="editor-wrapper" :style="{ height: height }">
-    <div v-if="architecture.config.name.includes('SRV') && files.length >= 0" class="tabs-editor">
+    <div v-if="architecture?.config?.name?.includes('SRV') && files.length >= 0" class="tabs-editor">
       <b-tabs content-class="mt-3" v-model="activeTabIndex">
         <b-tab v-for="(tab, i) in files" 
                :key="tab.filename"
@@ -538,7 +538,7 @@ watch(
 
       </b-tabs>
     </div>
-    <div ref="editorContainer" class="monaco-editor-container" v-show="files.length > 0 || !architecture.config.name.includes('SRV')"/>
+    <div ref="editorContainer" class="monaco-editor-container" v-show="files.length > 0 || !architecture?.config?.name?.includes('SRV')"/>
 
     <div id="vim-statusbar" class="vim-statusbar"></div>
     <b-modal v-model="renameModalOpen" class="rename-button" :class="{ 'rename-button-dark': dark }" title="Rename file" @ok="confirmRename">
diff --git a/src/web/components/general/UIeltoInstitutions.vue b/src/web/components/general/UIeltoInstitutions.vue
index d4569d91c..b717a7592 100644
--- a/src/web/components/general/UIeltoInstitutions.vue
+++ b/src/web/components/general/UIeltoInstitutions.vue
@@ -60,6 +60,24 @@ export default defineComponent({
             />
           </a>
         </b-col>
+      </b-row>
+
+      <b-row cols="3" class="text-center" align-v="center">
+        <b-col cols="4"></b-col>
+        <b-col cols="4">
+          <a target="_blank" href="https://www.upm.es/">
+            <img
+              alt="Universidad Politecnica de Madrid Logo"
+              class="p-0"
+              style="width: 100%"
+              src="@/web/assets/img/institutions/upm.webp"
+            />
+          </a>
+        </b-col>
+        <b-col cols="4"></b-col>
+      </b-row>
+
+      <b-row cols="1" class="text-center" align-v="center">
         <b-col cols="12">
           <b-list-group class="my-3">
             <b-list-group-item style="text-align: center">