diff --git a/frontend/src/annotation-service/ui/admin/status/editor/status-editor.component.html b/frontend/src/annotation-service/ui/admin/status/editor/status-editor.component.html
index 644b6a1af..65774864c 100644
--- a/frontend/src/annotation-service/ui/admin/status/editor/status-editor.component.html
+++ b/frontend/src/annotation-service/ui/admin/status/editor/status-editor.component.html
@@ -41,7 +41,7 @@
 							</div>
 							<div class="col-12 mt-1">
 								<div class="container-fluid">
-									<div class="row">
+									<div class="row gap-1-rem">
 										<div class="col-12">
 											<mat-form-field class="w-100">
 												<input matInput placeholder="{{'ANNOTATION-SERVICE.STATUS-EDITOR.FIELDS.LABEL' | translate}}" [formControl]="formGroup.get('label')" required>
@@ -52,7 +52,7 @@
 										<div class="col-12">
 											<mat-form-field class="w-100">
 												<mat-label>{{'ANNOTATION-SERVICE.STATUS-EDITOR.FIELDS.INTERNAL-STATUS' | translate}}</mat-label>
-													<mat-select [formControl]="formGroup.get('internalStatus')">
+													<mat-select [formControl]="formGroup.get('internalStatus')" required>
 														<mat-option *ngFor="let internalStatus of internalStatusEnum" [value]="internalStatus">{{enumUtils.toInternalStatusString(internalStatus)}}</mat-option>
 														<mat-option [value]="null">{{'ANNOTATION-SERVICE.STATUS-EDITOR.DEFAULT-VALUE.NONE' | translate}}</mat-option>
 													</mat-select>
diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html
index ddc07f1af..2422c4d0c 100644
--- a/frontend/src/app/app.component.html
+++ b/frontend/src/app/app.component.html
@@ -3,7 +3,7 @@
         [skipText]="'DASHBOARD.TOUR-GUIDE.LEAVE-TOUR'| translate"
         [nextText]="'DASHBOARD.TOUR-GUIDE.GOT-IT'| translate"
     ></ngx-guided-tour>
-    <button class="skip-to-main-content" (click)="skipToMain()" tabindex="1">{{'ALT-TEXT.SKIP-TO-MAIN-CONTENT' | translate}}</button>
+    <button class="skip-to-main-content" (click)="skipToMain()" tabindex="0">{{'ALT-TEXT.SKIP-TO-MAIN-CONTENT' | translate}}</button>
     <div id="cookies-consent"></div>
     <div class="wrapper" *ngIf="!showOnlyRouterOutlet">
         <app-navbar (sidebarToggled)="sidenav.toggle(); toggleNavbar($event);"></app-navbar>
diff --git a/frontend/src/app/ui/admin/language/editor/language-editor.component.html b/frontend/src/app/ui/admin/language/editor/language-editor.component.html
index 1537c4b26..e4d887413 100644
--- a/frontend/src/app/ui/admin/language/editor/language-editor.component.html
+++ b/frontend/src/app/ui/admin/language/editor/language-editor.component.html
@@ -28,7 +28,7 @@
 						<div class="row">
 							<div class="col-12">
 								<div class="container-fluid">
-									<div class="row">
+									<div class="row" style="row-gap: 0.5rem">
 										<div class="col-6" *ngIf="isNew">
 											<mat-form-field class="w-100">
 												<mat-label>{{'LANGUAGE-EDITOR.FIELDS.CODE' | translate}}</mat-label>
diff --git a/frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html b/frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html
index 74270b0fb..bfda24c46 100644
--- a/frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html
+++ b/frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html
@@ -76,7 +76,7 @@
 										<div class="col-12">
 											<div *ngFor="let field of formGroup.get('definition').get('fields').controls; let fieldIndex=index;" class="row mb-3">
 												<div class="col-12">
-													<div class="row d-flex align-items-center">
+													<div class="row d-flex align-items-center" style="row-gap: 0.5rem">
 														<div class="col-auto pb-3 d-flex">
 															<span>{{fieldIndex + 1}}</span>
 														</div>
diff --git a/frontend/src/app/ui/admin/reference/editor/reference-editor.component.html b/frontend/src/app/ui/admin/reference/editor/reference-editor.component.html
index 494eebf23..5af3be997 100644
--- a/frontend/src/app/ui/admin/reference/editor/reference-editor.component.html
+++ b/frontend/src/app/ui/admin/reference/editor/reference-editor.component.html
@@ -25,7 +25,7 @@
 			<form *ngIf="formGroup" (ngSubmit)="formSubmit()">
 				<mat-card class="pt-3 pb-3" appearance="outlined">
 					<mat-card-content>
-						<div class="row">
+						<div class="row" style="row-gap: 0.5rem">
 							<div class="col-4">
 								<mat-form-field class="w-100">
 									<mat-label>{{'REFERENCE-EDITOR.FIELDS.LABEL' | translate}}</mat-label>
diff --git a/frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html b/frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html
index df93127eb..eb66bb557 100644
--- a/frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html
+++ b/frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html
@@ -1,5 +1,5 @@
 
-<div class="row">
+<div class="row" style="row-gap: 0.5rem">
 	<div class="col-3">
 		<mat-form-field class="w-100">
 			<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.KEY' | translate}}</mat-label>
diff --git a/frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.scss b/frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.scss
index cfc45c667..94984bd7c 100644
--- a/frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.scss
+++ b/frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.scss
@@ -9,6 +9,10 @@
 	  background-color: white;
 	  color: #009700; //todo mchouliara
 	}
+
+    .row {
+        row-gap: 0.5rem;
+    }
   }