diff --git a/src/App.vue b/src/App.vue
index 4ea5e69..2d88114 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,132 +1,132 @@
 <template lang="pug">
 	#app.App(:class="{ 'App--rtl': isRTL }")
 		// AuthCheck
 		noscript Your browser does not have JS enabled, you are still able to browse the website but you won't be able to access advanced features such as editing or loggin-in.
 		AppHeader
 		.App__content
 			transition(name="fade", mode="out-in")
 				router-view.view
 		transition(name="fade", mode="out-in")
 			WTLSpinner.App__spinner(
 				v-if="activeRequests"
 			)
 		Error
 	//
 		.App__polling-operations
 			PollingBar
 
 </template>
 
 <style lang="scss">
 @import "~styles/global";
 @import "~styles/declarations";
 
 noscript {
 	display: block;
 	padding: 1rem;
 	background-color: red;
 	color: white;
 	font-size: 1.5rem;
 }
 
 .App {
 	display: flex;
 	min-height: 100vh;
 	flex-direction: column;
 
 	&__spinner {
 		position: fixed;
 		top: 15px;
-		z-index: 3;
+		z-index: 99999;
 		overflow: hidden;
 		background: #fff;
 		margin: 0 auto;
 		right: 30%;
 		border-radius: 50%;
 		box-shadow: $shadow-2;
 	}
 
 	@include media-breakpoint-up(md) {
 		&__spinner {
 			left: 0;
 			right: 0;
 		}
 	}
 }
 
 .App__content {
 	flex: 1;
 	background-color: #f8f8fb;
 
 	a {
 		color: $blue;
 		text-decoration: none;
 
 		&:hover {
 			text-decoration: none;
 		}
 	}
 
 	ul,
 	ol {
 		margin-left: 1.5rem;
 	}
 
 	.view {
 		@include container();
 
 		padding-top: 5rem;
 	}
 }
 
 .fade-enter-active,
 .fade-leave-active {
 	transition: all 0.2s ease;
 }
 
 .fade-enter,
 .fade-leave-active {
 	opacity: 0;
 }
 </style>
 
 <script>
 import AppHeader from "components/AppHeader"
 import PollingBar from "components/PollingBar"
 import WTLSpinner from "components/ui/WTLSpinner2"
 import Error from "components/Error"
 // import AuthCheck from "components/utils/AuthCheck"
 
 export default {
 	name: "App",
 	components: { AppHeader, PollingBar /* , AuthCheck */, WTLSpinner, Error },
 	data: () => {
 		return {
 			isRTL: LANGUAGE_ISRTL
 		}
 	},
 	computed: {
 		activeRequests() {
 			return this.$store.state.activeApiRequests > 0
 		}
 	},
 	mounted() {
 		// Add a request/response interceptor for showing loading spinner
 		this.axios.interceptors.request.use((config) => {
 			this.$store.dispatch("UPDATE_ACTIVE_REQUESTS", { add: 1 })
 			return config
 		}, (error) => {
 			this.$store.dispatch("UPDATE_ACTIVE_REQUESTS", { add: -1 })
 			return Promise.reject(error)
 		})
 
 		this.axios.interceptors.response.use((response) => {
 			this.$store.dispatch("UPDATE_ACTIVE_REQUESTS", { add: -1 })
 			return response
 		}, (error) => {
 			this.$store.dispatch("UPDATE_ACTIVE_REQUESTS", { add: -1 })
 			return Promise.reject(error)
 		})
 	}
 }
 </script>
diff --git a/src/views/NotFound.vue b/src/views/NotFound.vue
index 6f4d431..f073a9e 100644
--- a/src/views/NotFound.vue
+++ b/src/views/NotFound.vue
@@ -1,18 +1,18 @@
 <template lang="pug">
 	main.view--NotFound
-		h1 404
+		h1 404 - Page not found
 		router-link(to="/") Go back to the homepage
 </template>
 
 <script>
 export default {
 	name: "NotFound",
 	meta() {
 		return {
 			title: "Not Found",
 			description: "Page was not found",
-			httpCode: 404
+			httpStatusCode: 404
 		}
 	}
 }
 </script>