diff --git a/frontend/src/app/features/content/pages/content/content-page.component.html b/frontend/src/app/features/content/pages/content/content-page.component.html
index ada8a6211..37c70c729 100644
--- a/frontend/src/app/features/content/pages/content/content-page.component.html
+++ b/frontend/src/app/features/content/pages/content/content-page.component.html
@@ -75,7 +75,7 @@
                         (languageChange)="changeLanguage($event)"
                         [languages]="languages"
                         [percents]="contentForm.translationStatus | async"></sqx-language-selector>
-                    @if (content.canDelete) {
+                    @if (content.canDelete && schema.type !== 'Singleton') {
                         <button
                             class="btn btn-outline-secondary ms-2"
                             #buttonOptions
diff --git a/frontend/src/app/features/content/shared/preview-button.component.ts b/frontend/src/app/features/content/shared/preview-button.component.ts
index 599d07435..23ce3db0b 100644
--- a/frontend/src/app/features/content/shared/preview-button.component.ts
+++ b/frontend/src/app/features/content/shared/preview-button.component.ts
@@ -6,7 +6,7 @@
  */
 
 
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { AuthService, ContentDto, DropdownMenuComponent, interpolate, LocalStoreService, ModalDirective, ModalModel, ModalPlacementDirective, SchemaDto, Settings, StatefulComponent, TranslatePipe } from '@app/shared';
@@ -32,7 +32,7 @@ interface State {
         TranslatePipe,
     ],
 })
-export class PreviewButtonComponent extends StatefulComponent<State> implements OnInit {
+export class PreviewButtonComponent extends StatefulComponent<State> implements OnChanges {
     @Input()
     public confirm?: () => Observable<boolean>;
 
@@ -51,7 +51,7 @@ export class PreviewButtonComponent extends StatefulComponent<State> implements
         super({ previewNamesMore: [] });
     }
 
-    public ngOnInit() {
+    public ngOnChanges() {
         let selectedName = this.localStore.get(this.configKey());
 
         if (!selectedName || !this.schema.previewUrls[selectedName]) {
@@ -81,11 +81,10 @@ export class PreviewButtonComponent extends StatefulComponent<State> implements
     }
 
     private navigateTo(name: string) {
-        const vars = { ...this.content, ...this.authService.user || {} };
+        const urlVars = { ...this.content, ...this.authService.user || {} };
+        const urlLink = interpolate(this.schema.previewUrls[name], urlVars, 'iv');
 
-        const url = interpolate(this.schema.previewUrls[name], vars, 'iv');
-
-        window.open(url, '_blank');
+        window.open(urlLink, '_blank');
     }
 
     private selectUrl(selectedName: string) {
diff --git a/frontend/src/app/framework/angular/forms/editors/autocomplete.component.html b/frontend/src/app/framework/angular/forms/editors/autocomplete.component.html
index d065faeda..760185167 100644
--- a/frontend/src/app/framework/angular/forms/editors/autocomplete.component.html
+++ b/frontend/src/app/framework/angular/forms/editors/autocomplete.component.html
@@ -1,5 +1,5 @@
 <div class="control-container">
-    <div class="anchor invisible2" #anchor [class.cursor-size]="startCharacter" [class.full-size]="!startCharacter">
+    <div class="anchor invisible" #anchor [class.cursor-size]="startCharacter" [class.full-size]="!startCharacter">
         <span class="form-control w-100">&nbsp;</span>
     </div>