diff --git a/web/satellite/src/components/account/AccountArea.vue b/web/satellite/src/components/account/AccountArea.vue
index d1ea6036a..8d6e5edc4 100644
--- a/web/satellite/src/components/account/AccountArea.vue
+++ b/web/satellite/src/components/account/AccountArea.vue
@@ -3,11 +3,11 @@
 
 <template>
     <div class="account-area-container">
-	    <h1>Account</h1>
-	    <TabNavigation
-		    class="account-area-container__navigation"
-		    :navigation="navigation"/>
-	    <router-view />
+        <h1>Account</h1>
+        <TabNavigation
+            class="account-area-container__navigation"
+            :navigation="navigation"/>
+        <router-view />
     </div>
 </template>
 
diff --git a/web/satellite/src/components/account/AccountPaymentMethods.vue b/web/satellite/src/components/account/AccountPaymentMethods.vue
index 70b0167ec..34878f07d 100644
--- a/web/satellite/src/components/account/AccountPaymentMethods.vue
+++ b/web/satellite/src/components/account/AccountPaymentMethods.vue
@@ -2,45 +2,45 @@
 // See LICENSE for copying information.
 
 <template>
-	<div class="payment-methods-container">
-		<div class="payment-methods-container__card-container">
-			<div class="payment-methods-container__card-container__info-area">
-				<img class="payment-methods-container__card-container__info-area__card-logo" src="../../../static/images/Logo.svg">
-				<div class="payment-methods-container__card-container__info-area__info-container">
-					<h1>xxxx 0000</h1>
-					<h2>Shawn Wilkinson</h2>
-				</div>
-				<div class="payment-methods-container__card-container__info-area__expire-container">
-					<h2>Expires</h2>
-					<h1>12/2020</h1>
-				</div>
-				<h3 class="payment-methods-container__card-container__info-area__added-text">Added on 29 May 2019</h3>
-			</div>
-			<div class="payment-methods-container__card-container__default-button" v-if="true">
-				<p class="payment-methods-container__card-container__default-button__label">Default</p>
-			</div>
-			<div class="payment-methods-container__card-container__button-area" v-if="false">
-				<div class="payment-methods-container__card-container__button-area__make-button">
-					<p class="payment-methods-container__card-container__button-area__make-button__label">Make Default</p>
-				</div>
-				<svg class="payment-methods-container__card-container__button-area__delete-button"
-				     width="34"
-				     height="34"
-				     viewBox="0 0 34 34"
-				     fill="none"
-				     xmlns="http://www.w3.org/2000/svg">
-					<rect width="34" height="34" rx="17" fill="#EB5757"/>
-					<path d="M19.7834 11.9727V11.409C19.7834 10.6576 19.1215 10 18.2706 10H16.0014C15.1504 10 14.4886 10.6576 14.4886 11.409V11.9727H10.7065V13.1938H12.0302V22.3057C12.0302 23.5269 12.9758 24.4662 14.0158 24.4662H20.1616C21.2962 24.4662 22.1471 23.5269 22.1471 22.3057V13.1938H23.4709V11.9727H19.7834ZM16.6632 22.3057H15.3395V14.2271H16.6632V22.3057ZM18.9324 22.3057H17.6087V14.2271H18.9324V22.3057Z" fill="white"/>
-				</svg>
-			</div>
-		</div>
-		<Button
-			class="payment-methods-container__add-button"
-			label="Add Card"
-			width="140px"
-			height="48px"
-			isDisabled />
-	</div>
+    <div class="payment-methods-container">
+        <div class="payment-methods-container__card-container">
+            <div class="payment-methods-container__card-container__info-area">
+                <img class="payment-methods-container__card-container__info-area__card-logo" src="../../../static/images/Logo.svg">
+                <div class="payment-methods-container__card-container__info-area__info-container">
+                    <h1>xxxx 0000</h1>
+                    <h2>Shawn Wilkinson</h2>
+                </div>
+                <div class="payment-methods-container__card-container__info-area__expire-container">
+                    <h2>Expires</h2>
+                    <h1>12/2020</h1>
+                </div>
+                <h3 class="payment-methods-container__card-container__info-area__added-text">Added on 29 May 2019</h3>
+            </div>
+            <div class="payment-methods-container__card-container__default-button" v-if="true">
+                <p class="payment-methods-container__card-container__default-button__label">Default</p>
+            </div>
+            <div class="payment-methods-container__card-container__button-area" v-if="false">
+                <div class="payment-methods-container__card-container__button-area__make-button">
+                    <p class="payment-methods-container__card-container__button-area__make-button__label">Make Default</p>
+                </div>
+                <svg class="payment-methods-container__card-container__button-area__delete-button"
+                    width="34"
+                    height="34"
+                    viewBox="0 0 34 34"
+                    fill="none"
+                    xmlns="http://www.w3.org/2000/svg">
+                        <rect width="34" height="34" rx="17" fill="#EB5757"/>
+                        <path d="M19.7834 11.9727V11.409C19.7834 10.6576 19.1215 10 18.2706 10H16.0014C15.1504 10 14.4886 10.6576 14.4886 11.409V11.9727H10.7065V13.1938H12.0302V22.3057C12.0302 23.5269 12.9758 24.4662 14.0158 24.4662H20.1616C21.2962 24.4662 22.1471 23.5269 22.1471 22.3057V13.1938H23.4709V11.9727H19.7834ZM16.6632 22.3057H15.3395V14.2271H16.6632V22.3057ZM18.9324 22.3057H17.6087V14.2271H18.9324V22.3057Z" fill="white"/>
+                </svg>
+            </div>
+        </div>
+        <Button
+            class="payment-methods-container__add-button"
+            label="Add Card"
+            width="140px"
+            height="48px"
+            isDisabled />
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/account/ChangePasswordPopup.vue b/web/satellite/src/components/account/ChangePasswordPopup.vue
index 09274afc5..906e7aef3 100644
--- a/web/satellite/src/components/account/ChangePasswordPopup.vue
+++ b/web/satellite/src/components/account/ChangePasswordPopup.vue
@@ -2,61 +2,61 @@
 // See LICENSE for copying information.
 
 <template>
-	<div class="change-password-popup-container">
-		<div class="change-password-popup">
-			<div class="change-password-popup__form-container">
-				<div class="change-password-row-container">
-					<svg class="change-password-popup__form-container__svg" width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-						<path d="M30 60C46.5685 60 60 46.5685 60 30C60 13.4315 46.5685 0 30 0C13.4315 0 0 13.4315 0 30C0 46.5685 13.4315 60 30 60Z" fill="#2683FF"/>
-						<path d="M29.5001 34.5196C30.1001 34.5196 30.5865 34.0452 30.5865 33.46C30.5865 32.8748 30.1001 32.4004 29.5001 32.4004C28.9 32.4004 28.4136 32.8748 28.4136 33.46C28.4136 34.0452 28.9 34.5196 29.5001 34.5196Z" fill="#FEFEFF"/>
-						<path d="M39.9405 40.2152C40.1781 40 40.3139 39.6854 40.3139 39.3709V25.5464C40.3139 24.9007 39.7707 24.3709 39.1086 24.3709H35.7473V21.0927C35.7473 17.7318 32.9462 15 29.5 15C26.0538 15 23.2527 17.7318 23.2527 21.0927V24.3709H19.8914C19.2293 24.3709 18.686 24.9007 18.686 25.5464V39.3709C18.686 39.6854 18.8218 40 19.0595 40.2152L23.7959 44.6689C24.0166 44.8841 24.3222 45 24.6278 45H34.3552C34.6608 45 34.9664 44.8841 35.1871 44.6689L39.9405 40.2152ZM30.7053 36.6391V38.1291C30.7053 38.7748 30.1621 39.3046 29.5 39.3046C28.8379 39.3046 28.2947 38.7748 28.2947 38.1291V36.6391C26.9705 36.1589 26.0198 34.9172 26.0198 33.4437C26.0198 31.5728 27.5817 30.0497 29.5 30.0497C31.4183 30.0497 32.9801 31.5728 32.9801 33.4437C32.9801 34.9172 32.0295 36.1589 30.7053 36.6391ZM33.3367 24.3709H25.6464V21.0927C25.6464 19.0232 27.3779 17.351 29.483 17.351C31.5881 17.351 33.3197 19.0397 33.3197 21.0927V24.3709H33.3367Z" fill="#FEFEFF"/>
-						<defs>
-							<clipPath id="clip0">
-								<rect width="21.6279" height="30" fill="#FFFFFF" transform="translate(18.686 15)"/>
-							</clipPath>
-						</defs>
-					</svg>
-					<h2 class="change-password-popup__form-container__main-label-text">Change Password</h2>
-				</div>
-				<HeaderlessInput
-						class="full-input"
-						label="Old Password"
-						placeholder ="Enter Old Password"
-						width="100%"
-						isPassword
-						ref="oldPasswordInput"
-						:error="oldPasswordError"
-						@setData="setOldPassword" />
-				<HeaderlessInput
-						class="full-input mt"
-						label="New Password"
-						placeholder ="Enter New Password"
-						width="100%"
-						ref="newPasswordInput"
-						isPassword
-						:error="newPasswordError"
-						@setData="setNewPassword" />
-				<HeaderlessInput
-						class="full-input mt"
-						label="Confirm password"
-						placeholder="Confirm password"
-						width="100%"
-						ref="confirmPasswordInput"
-						isPassword
-						:error="confirmationPasswordError"
-						@setData="setPasswordConfirmation" />
-				<div class="change-password-popup__form-container__button-container">
-					<Button label="Cancel" width="205px" height="48px" :onPress="onCloseClick" isWhite />
-					<Button label="Update" width="205px" height="48px" :onPress="onUpdateClick" />
-				</div>
-			</div>
-			<div class="change-password-popup__close-cross-container" @click="onCloseClick">
-				<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-					<path d="M15.7071 1.70711C16.0976 1.31658 16.0976 0.683417 15.7071 0.292893C15.3166 -0.0976311 14.6834 -0.0976311 14.2929 0.292893L15.7071 1.70711ZM0.292893 14.2929C-0.0976311 14.6834 -0.0976311 15.3166 0.292893 15.7071C0.683417 16.0976 1.31658 16.0976 1.70711 15.7071L0.292893 14.2929ZM1.70711 0.292893C1.31658 -0.0976311 0.683417 -0.0976311 0.292893 0.292893C-0.0976311 0.683417 -0.0976311 1.31658 0.292893 1.70711L1.70711 0.292893ZM14.2929 15.7071C14.6834 16.0976 15.3166 16.0976 15.7071 15.7071C16.0976 15.3166 16.0976 14.6834 15.7071 14.2929L14.2929 15.7071ZM14.2929 0.292893L0.292893 14.2929L1.70711 15.7071L15.7071 1.70711L14.2929 0.292893ZM0.292893 1.70711L14.2929 15.7071L15.7071 14.2929L1.70711 0.292893L0.292893 1.70711Z" fill="#384B65"/>
-				</svg>
-			</div>
-		</div>
-	</div>
+    <div class="change-password-popup-container">
+        <div class="change-password-popup">
+            <div class="change-password-popup__form-container">
+                <div class="change-password-row-container">
+                    <svg class="change-password-popup__form-container__svg" width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M30 60C46.5685 60 60 46.5685 60 30C60 13.4315 46.5685 0 30 0C13.4315 0 0 13.4315 0 30C0 46.5685 13.4315 60 30 60Z" fill="#2683FF"/>
+                        <path d="M29.5001 34.5196C30.1001 34.5196 30.5865 34.0452 30.5865 33.46C30.5865 32.8748 30.1001 32.4004 29.5001 32.4004C28.9 32.4004 28.4136 32.8748 28.4136 33.46C28.4136 34.0452 28.9 34.5196 29.5001 34.5196Z" fill="#FEFEFF"/>
+                        <path d="M39.9405 40.2152C40.1781 40 40.3139 39.6854 40.3139 39.3709V25.5464C40.3139 24.9007 39.7707 24.3709 39.1086 24.3709H35.7473V21.0927C35.7473 17.7318 32.9462 15 29.5 15C26.0538 15 23.2527 17.7318 23.2527 21.0927V24.3709H19.8914C19.2293 24.3709 18.686 24.9007 18.686 25.5464V39.3709C18.686 39.6854 18.8218 40 19.0595 40.2152L23.7959 44.6689C24.0166 44.8841 24.3222 45 24.6278 45H34.3552C34.6608 45 34.9664 44.8841 35.1871 44.6689L39.9405 40.2152ZM30.7053 36.6391V38.1291C30.7053 38.7748 30.1621 39.3046 29.5 39.3046C28.8379 39.3046 28.2947 38.7748 28.2947 38.1291V36.6391C26.9705 36.1589 26.0198 34.9172 26.0198 33.4437C26.0198 31.5728 27.5817 30.0497 29.5 30.0497C31.4183 30.0497 32.9801 31.5728 32.9801 33.4437C32.9801 34.9172 32.0295 36.1589 30.7053 36.6391ZM33.3367 24.3709H25.6464V21.0927C25.6464 19.0232 27.3779 17.351 29.483 17.351C31.5881 17.351 33.3197 19.0397 33.3197 21.0927V24.3709H33.3367Z" fill="#FEFEFF"/>
+                        <defs>
+                            <clipPath id="clip0">
+                                <rect width="21.6279" height="30" fill="#FFFFFF" transform="translate(18.686 15)"/>
+                            </clipPath>
+                        </defs>
+                    </svg>
+                    <h2 class="change-password-popup__form-container__main-label-text">Change Password</h2>
+                </div>
+                <HeaderlessInput
+                    class="full-input"
+                    label="Old Password"
+                    placeholder ="Enter Old Password"
+                    width="100%"
+                    isPassword
+                    ref="oldPasswordInput"
+                    :error="oldPasswordError"
+                    @setData="setOldPassword" />
+                <HeaderlessInput
+                    class="full-input mt"
+                    label="New Password"
+                    placeholder ="Enter New Password"
+                    width="100%"
+                    ref="newPasswordInput"
+                    isPassword
+                    :error="newPasswordError"
+                    @setData="setNewPassword" />
+                <HeaderlessInput
+                    class="full-input mt"
+                    label="Confirm password"
+                    placeholder="Confirm password"
+                    width="100%"
+                    ref="confirmPasswordInput"
+                    isPassword
+                    :error="confirmationPasswordError"
+                    @setData="setPasswordConfirmation" />
+                <div class="change-password-popup__form-container__button-container">
+                    <Button label="Cancel" width="205px" height="48px" :onPress="onCloseClick" isWhite />
+                    <Button label="Update" width="205px" height="48px" :onPress="onUpdateClick" />
+                </div>
+            </div>
+            <div class="change-password-popup__close-cross-container" @click="onCloseClick">
+                <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M15.7071 1.70711C16.0976 1.31658 16.0976 0.683417 15.7071 0.292893C15.3166 -0.0976311 14.6834 -0.0976311 14.2929 0.292893L15.7071 1.70711ZM0.292893 14.2929C-0.0976311 14.6834 -0.0976311 15.3166 0.292893 15.7071C0.683417 16.0976 1.31658 16.0976 1.70711 15.7071L0.292893 14.2929ZM1.70711 0.292893C1.31658 -0.0976311 0.683417 -0.0976311 0.292893 0.292893C-0.0976311 0.683417 -0.0976311 1.31658 0.292893 1.70711L1.70711 0.292893ZM14.2929 15.7071C14.6834 16.0976 15.3166 16.0976 15.7071 15.7071C16.0976 15.3166 16.0976 14.6834 15.7071 14.2929L14.2929 15.7071ZM14.2929 0.292893L0.292893 14.2929L1.70711 15.7071L15.7071 1.70711L14.2929 0.292893ZM0.292893 1.70711L14.2929 15.7071L15.7071 14.2929L1.70711 0.292893L0.292893 1.70711Z" fill="#384B65"/>
+                </svg>
+            </div>
+        </div>
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/account/EditProfilePopup.vue b/web/satellite/src/components/account/EditProfilePopup.vue
index 326975bc0..ba8ac17d0 100644
--- a/web/satellite/src/components/account/EditProfilePopup.vue
+++ b/web/satellite/src/components/account/EditProfilePopup.vue
@@ -2,44 +2,44 @@
 // See LICENSE for copying information.
 
 <template>
-	<div class="edit-profile-popup-container">
-		<div class="edit-profile-popup">
-			<div class="edit-profile-popup__form-container">
-				<div class="edit-profile-row-container">
-					<div class="edit-profile-popup__form-container__avatar">
-						<h1>{{avatarLetter}}</h1>
-					</div>
-					<h2 class="edit-profile-popup__form-container__main-label-text">Edit profile</h2>
-				</div>
-				<HeaderedInput
-					class="full-input"
-					label="Full name"
-					placeholder="Enter Full Name"
-					width="100%"
-					ref="fullNameInput"
-					:error="fullNameError"
-					:initValue="originalFullName"
-					@setData="setFullName" />
-				<HeaderedInput
-					class="full-input"
-					label="Short Name"
-					placeholder="Enter Short Name"
-					width="100%"
-					ref="shortNameInput"
-					:initValue="originalShortName"
-					@setData="setShortName"/>
-				<div class="edit-profile-popup__form-container__button-container">
-					<Button label="Cancel" width="205px" height="48px" :onPress="onCloseClick" isWhite />
-					<Button label="Update" width="205px" height="48px" :onPress="onUpdateClick" />
-				</div>
-			</div>
-			<div class="edit-profile-popup__close-cross-container" @click="onCloseClick">
-				<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-					<path d="M15.7071 1.70711C16.0976 1.31658 16.0976 0.683417 15.7071 0.292893C15.3166 -0.0976311 14.6834 -0.0976311 14.2929 0.292893L15.7071 1.70711ZM0.292893 14.2929C-0.0976311 14.6834 -0.0976311 15.3166 0.292893 15.7071C0.683417 16.0976 1.31658 16.0976 1.70711 15.7071L0.292893 14.2929ZM1.70711 0.292893C1.31658 -0.0976311 0.683417 -0.0976311 0.292893 0.292893C-0.0976311 0.683417 -0.0976311 1.31658 0.292893 1.70711L1.70711 0.292893ZM14.2929 15.7071C14.6834 16.0976 15.3166 16.0976 15.7071 15.7071C16.0976 15.3166 16.0976 14.6834 15.7071 14.2929L14.2929 15.7071ZM14.2929 0.292893L0.292893 14.2929L1.70711 15.7071L15.7071 1.70711L14.2929 0.292893ZM0.292893 1.70711L14.2929 15.7071L15.7071 14.2929L1.70711 0.292893L0.292893 1.70711Z" fill="#384B65"/>
-				</svg>
-			</div>
-		</div>
-	</div>
+    <div class="edit-profile-popup-container">
+        <div class="edit-profile-popup">
+            <div class="edit-profile-popup__form-container">
+                <div class="edit-profile-row-container">
+                    <div class="edit-profile-popup__form-container__avatar">
+                        <h1>{{avatarLetter}}</h1>
+                    </div>
+                    <h2 class="edit-profile-popup__form-container__main-label-text">Edit profile</h2>
+                </div>
+                <HeaderedInput
+                    class="full-input"
+                    label="Full name"
+                    placeholder="Enter Full Name"
+                    width="100%"
+                    ref="fullNameInput"
+                    :error="fullNameError"
+                    :initValue="originalFullName"
+                    @setData="setFullName" />
+                <HeaderedInput
+                    class="full-input"
+                    label="Short Name"
+                    placeholder="Enter Short Name"
+                    width="100%"
+                    ref="shortNameInput"
+                    :initValue="originalShortName"
+                    @setData="setShortName"/>
+                <div class="edit-profile-popup__form-container__button-container">
+                    <Button label="Cancel" width="205px" height="48px" :onPress="onCloseClick" isWhite />
+                    <Button label="Update" width="205px" height="48px" :onPress="onUpdateClick" />
+                </div>
+            </div>
+            <div class="edit-profile-popup__close-cross-container" @click="onCloseClick">
+                <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M15.7071 1.70711C16.0976 1.31658 16.0976 0.683417 15.7071 0.292893C15.3166 -0.0976311 14.6834 -0.0976311 14.2929 0.292893L15.7071 1.70711ZM0.292893 14.2929C-0.0976311 14.6834 -0.0976311 15.3166 0.292893 15.7071C0.683417 16.0976 1.31658 16.0976 1.70711 15.7071L0.292893 14.2929ZM1.70711 0.292893C1.31658 -0.0976311 0.683417 -0.0976311 0.292893 0.292893C-0.0976311 0.683417 -0.0976311 1.31658 0.292893 1.70711L1.70711 0.292893ZM14.2929 15.7071C14.6834 16.0976 15.3166 16.0976 15.7071 15.7071C16.0976 15.3166 16.0976 14.6834 15.7071 14.2929L14.2929 15.7071ZM14.2929 0.292893L0.292893 14.2929L1.70711 15.7071L15.7071 1.70711L14.2929 0.292893ZM0.292893 1.70711L14.2929 15.7071L15.7071 14.2929L1.70711 0.292893L0.292893 1.70711Z" fill="#384B65"/>
+                </svg>
+            </div>
+        </div>
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/account/Profile.vue b/web/satellite/src/components/account/Profile.vue
index 758075b3f..b6a08a742 100644
--- a/web/satellite/src/components/account/Profile.vue
+++ b/web/satellite/src/components/account/Profile.vue
@@ -3,68 +3,68 @@
 
 <template>
     <div class="profile-container">
-		<div class="profile-container__edit-profile no-margin" >
-			<div class="profile-container__edit-profile__row">
-				<div class="profile-container__edit-profile__avatar">
-					<h1>{{avatarLetter}}</h1>
-				</div>
-				<div class="profile-container__edit-profile__text">
-					<h2>Edit Profile</h2>
-					<h3>This information will be visible to all users</h3>
-				</div>
-			</div>
-			<div title="Edit">
-				<svg class="edit-svg" width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg" v-on:click="toggleEditProfilePopup">
-					<rect width="40" height="40" rx="4" fill="#E2ECF7"/>
-					<path d="M19.0901 21.4605C19.3416 21.7259 19.6695 21.8576 19.9995 21.8576C20.3295 21.8576 20.6574 21.7259 20.9089 21.4605L28.6228 13.3181C29.1257 12.7871 29.1257 11.9291 28.6228 11.3982C28.1198 10.8673 27.3069 10.8673 26.8039 11.3982L19.0901 19.5406C18.5891 20.0715 18.5891 20.9295 19.0901 21.4605ZM27.7134 19.1435C27.0031 19.1435 26.4277 19.7509 26.4277 20.5005V27.2859H13.5713V13.7152H19.9995C20.7097 13.7152 21.2851 13.1078 21.2851 12.3581C21.2851 11.6085 20.7097 11.0011 19.9995 11.0011H13.5713C12.1508 11.0011 11 12.2158 11 13.7152V27.2859C11 28.7852 12.1508 30 13.5713 30H26.4277C27.8482 30 28.999 28.7852 28.999 27.2859V20.5005C28.999 19.7509 28.4236 19.1435 27.7134 19.1435Z" fill="#2683FF"/>
-				</svg>
-			</div>
-		</div>
-		<div class="profile-container__secondary-container">
-			<div class="profile-container__secondary-container__change-password">
-				<div class="profile-container__edit-profile__row">
-					<svg class="profile-container__secondary-container__img" width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-						<path d="M30 60C46.5685 60 60 46.5685 60 30C60 13.4315 46.5685 0 30 0C13.4315 0 0 13.4315 0 30C0 46.5685 13.4315 60 30 60Z" fill="#E8EAF2"/>
-						<path d="M29.5001 34.5196C30.1001 34.5196 30.5865 34.0452 30.5865 33.46C30.5865 32.8748 30.1001 32.4004 29.5001 32.4004C28.9 32.4004 28.4136 32.8748 28.4136 33.46C28.4136 34.0452 28.9 34.5196 29.5001 34.5196Z" fill="#354049"/>
-						<path d="M39.9405 40.2152C40.1781 40 40.3139 39.6854 40.3139 39.3709V25.5464C40.3139 24.9007 39.7707 24.3709 39.1086 24.3709H35.7473V21.0927C35.7473 17.7318 32.9462 15 29.5 15C26.0538 15 23.2527 17.7318 23.2527 21.0927V24.3709H19.8914C19.2293 24.3709 18.686 24.9007 18.686 25.5464V39.3709C18.686 39.6854 18.8218 40 19.0595 40.2152L23.7959 44.6689C24.0166 44.8841 24.3222 45 24.6278 45H34.3552C34.6608 45 34.9664 44.8841 35.1871 44.6689L39.9405 40.2152ZM30.7053 36.6391V38.1291C30.7053 38.7748 30.1621 39.3046 29.5 39.3046C28.8379 39.3046 28.2947 38.7748 28.2947 38.1291V36.6391C26.9705 36.1589 26.0198 34.9172 26.0198 33.4437C26.0198 31.5728 27.5817 30.0497 29.5 30.0497C31.4183 30.0497 32.9801 31.5728 32.9801 33.4437C32.9801 34.9172 32.0295 36.1589 30.7053 36.6391ZM33.3367 24.3709H25.6464V21.0927C25.6464 19.0232 27.3779 17.351 29.483 17.351C31.5881 17.351 33.3197 19.0397 33.3197 21.0927V24.3709H33.3367Z" fill="#354049"/>
-					</svg>
-					<div class="profile-container__secondary-container__change-password__text-container">
-						<h2>Change Password</h2>
-						<h3>6 or more characters</h3>
-					</div>
-				</div>
-				<div title="Edit">
-					<svg class="edit-svg" width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg" v-on:click="toggleChangePasswordPopup">
-						<rect width="40" height="40" rx="4" fill="#E2ECF7"/>
-						<path d="M19.0901 21.4605C19.3416 21.7259 19.6695 21.8576 19.9995 21.8576C20.3295 21.8576 20.6574 21.7259 20.9089 21.4605L28.6228 13.3181C29.1257 12.7871 29.1257 11.9291 28.6228 11.3982C28.1198 10.8673 27.3069 10.8673 26.8039 11.3982L19.0901 19.5406C18.5891 20.0715 18.5891 20.9295 19.0901 21.4605ZM27.7134 19.1435C27.0031 19.1435 26.4277 19.7509 26.4277 20.5005V27.2859H13.5713V13.7152H19.9995C20.7097 13.7152 21.2851 13.1078 21.2851 12.3581C21.2851 11.6085 20.7097 11.0011 19.9995 11.0011H13.5713C12.1508 11.0011 11 12.2158 11 13.7152V27.2859C11 28.7852 12.1508 30 13.5713 30H26.4277C27.8482 30 28.999 28.7852 28.999 27.2859V20.5005C28.999 19.7509 28.4236 19.1435 27.7134 19.1435Z" fill="#2683FF"/>
-					</svg>
-				</div>
-			</div>
-			<div class="profile-container__secondary-container__email-container">
-				<div class="profile-container__edit-profile__row">
-					<svg class="profile-container__secondary-container__img" width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-						<path d="M30 60C46.5685 60 60 46.5685 60 30C60 13.4315 46.5685 0 30 0C13.4315 0 0 13.4315 0 30C0 46.5685 13.4315 60 30 60Z" fill="#E8EAF2"/>
-						<path d="M29.9998 16.7598C25.7965 16.7641 21.8459 18.7646 19.3534 22.1498C16.8607 25.535 16.1236 29.9013 17.3671 33.9162C18.6096 37.9314 21.6853 41.1186 25.6546 42.5032C29.6238 43.8868 34.014 43.305 37.4846 40.9348L35.9861 38.7538C33.3633 40.552 30.0711 41.0781 27.0174 40.1856C23.9649 39.2931 21.4732 37.077 20.2319 34.1482C18.9905 31.2203 19.1294 27.8888 20.6104 25.0734C22.0924 22.2591 24.7588 20.2577 27.8761 19.6232C30.9922 18.9878 34.2296 19.7862 36.6938 21.7976C39.1581 23.809 40.5898 26.8202 40.592 30.0007V31.0365C40.592 32.8762 39.8001 33.9732 38.4723 33.9732V33.995L38.4734 33.9961C38.3892 33.9819 38.305 33.9743 38.2208 33.9743H37.9408C37.1959 33.9743 36.0868 32.8903 36.0868 32.1597V30.0007C36.0989 28.1019 35.2293 26.3038 33.7331 25.1345C32.2358 23.9653 30.2824 23.5563 28.4417 24.0277C26.602 24.498 25.085 25.7963 24.3335 27.5408C23.5832 29.2854 23.6838 31.2794 24.6069 32.9395C25.529 34.5987 27.1696 35.7373 29.0475 36.0206C30.9254 36.3039 32.8286 35.6991 34.2 34.3855C35.0597 35.6542 36.521 36.6255 37.9386 36.6255V36.6025C38.0228 36.6178 38.1092 36.6255 38.1956 36.6255H38.4756C41.326 36.6255 43.2356 34.3855 43.2356 31.042V30.0007C43.2312 26.4909 41.8356 23.1265 39.3551 20.6448C36.8734 18.1631 33.5101 16.7654 30.0003 16.7598L29.9998 16.7598ZM29.9998 33.4416C28.6075 33.4416 27.353 32.6038 26.8204 31.3176C26.2878 30.0313 26.582 28.5515 27.5664 27.567C28.5508 26.5824 30.0306 26.2884 31.317 26.821C32.6032 27.3537 33.441 28.6082 33.441 30.0004C33.441 31.9014 31.901 33.4413 30.0001 33.4413L29.9998 33.4416Z" fill="#354049"/>
-					</svg>
-					<div class="profile-container__secondary-container__email-container__text-container">
-						<h2>{{user.email}}</h2>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="profile-container__button-area">
-			<Button
-				class="profile-container__button-area__delete-button"
-				label="Delete account"
-				width="210px"
-				height="56px"
-				:onPress="toggleDeleteAccountPopup"
-				isDeletion/>
-		</div>
-		<ChangePasswordPopup v-if="isChangePasswordPopupShown"/>
-		<EditProfilePopup v-if="isEditProfilePopupShown"/>
-		<DeleteAccountPopup v-if="isDeleteAccountPopupShown" />
-	</div>
+        <div class="profile-container__edit-profile no-margin" >
+            <div class="profile-container__edit-profile__row">
+                <div class="profile-container__edit-profile__avatar">
+                    <h1>{{avatarLetter}}</h1>
+                </div>
+                <div class="profile-container__edit-profile__text">
+                    <h2>Edit Profile</h2>
+                    <h3>This information will be visible to all users</h3>
+                </div>
+            </div>
+            <div title="Edit">
+                <svg class="edit-svg" width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg" v-on:click="toggleEditProfilePopup">
+                    <rect width="40" height="40" rx="4" fill="#E2ECF7"/>
+                    <path d="M19.0901 21.4605C19.3416 21.7259 19.6695 21.8576 19.9995 21.8576C20.3295 21.8576 20.6574 21.7259 20.9089 21.4605L28.6228 13.3181C29.1257 12.7871 29.1257 11.9291 28.6228 11.3982C28.1198 10.8673 27.3069 10.8673 26.8039 11.3982L19.0901 19.5406C18.5891 20.0715 18.5891 20.9295 19.0901 21.4605ZM27.7134 19.1435C27.0031 19.1435 26.4277 19.7509 26.4277 20.5005V27.2859H13.5713V13.7152H19.9995C20.7097 13.7152 21.2851 13.1078 21.2851 12.3581C21.2851 11.6085 20.7097 11.0011 19.9995 11.0011H13.5713C12.1508 11.0011 11 12.2158 11 13.7152V27.2859C11 28.7852 12.1508 30 13.5713 30H26.4277C27.8482 30 28.999 28.7852 28.999 27.2859V20.5005C28.999 19.7509 28.4236 19.1435 27.7134 19.1435Z" fill="#2683FF"/>
+                </svg>
+            </div>
+        </div>
+        <div class="profile-container__secondary-container">
+            <div class="profile-container__secondary-container__change-password">
+                <div class="profile-container__edit-profile__row">
+                    <svg class="profile-container__secondary-container__img" width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M30 60C46.5685 60 60 46.5685 60 30C60 13.4315 46.5685 0 30 0C13.4315 0 0 13.4315 0 30C0 46.5685 13.4315 60 30 60Z" fill="#E8EAF2"/>
+                        <path d="M29.5001 34.5196C30.1001 34.5196 30.5865 34.0452 30.5865 33.46C30.5865 32.8748 30.1001 32.4004 29.5001 32.4004C28.9 32.4004 28.4136 32.8748 28.4136 33.46C28.4136 34.0452 28.9 34.5196 29.5001 34.5196Z" fill="#354049"/>
+                        <path d="M39.9405 40.2152C40.1781 40 40.3139 39.6854 40.3139 39.3709V25.5464C40.3139 24.9007 39.7707 24.3709 39.1086 24.3709H35.7473V21.0927C35.7473 17.7318 32.9462 15 29.5 15C26.0538 15 23.2527 17.7318 23.2527 21.0927V24.3709H19.8914C19.2293 24.3709 18.686 24.9007 18.686 25.5464V39.3709C18.686 39.6854 18.8218 40 19.0595 40.2152L23.7959 44.6689C24.0166 44.8841 24.3222 45 24.6278 45H34.3552C34.6608 45 34.9664 44.8841 35.1871 44.6689L39.9405 40.2152ZM30.7053 36.6391V38.1291C30.7053 38.7748 30.1621 39.3046 29.5 39.3046C28.8379 39.3046 28.2947 38.7748 28.2947 38.1291V36.6391C26.9705 36.1589 26.0198 34.9172 26.0198 33.4437C26.0198 31.5728 27.5817 30.0497 29.5 30.0497C31.4183 30.0497 32.9801 31.5728 32.9801 33.4437C32.9801 34.9172 32.0295 36.1589 30.7053 36.6391ZM33.3367 24.3709H25.6464V21.0927C25.6464 19.0232 27.3779 17.351 29.483 17.351C31.5881 17.351 33.3197 19.0397 33.3197 21.0927V24.3709H33.3367Z" fill="#354049"/>
+                    </svg>
+                    <div class="profile-container__secondary-container__change-password__text-container">
+                        <h2>Change Password</h2>
+                        <h3>6 or more characters</h3>
+                    </div>
+                </div>
+                <div title="Edit">
+                    <svg class="edit-svg" width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg" v-on:click="toggleChangePasswordPopup">
+                        <rect width="40" height="40" rx="4" fill="#E2ECF7"/>
+                        <path d="M19.0901 21.4605C19.3416 21.7259 19.6695 21.8576 19.9995 21.8576C20.3295 21.8576 20.6574 21.7259 20.9089 21.4605L28.6228 13.3181C29.1257 12.7871 29.1257 11.9291 28.6228 11.3982C28.1198 10.8673 27.3069 10.8673 26.8039 11.3982L19.0901 19.5406C18.5891 20.0715 18.5891 20.9295 19.0901 21.4605ZM27.7134 19.1435C27.0031 19.1435 26.4277 19.7509 26.4277 20.5005V27.2859H13.5713V13.7152H19.9995C20.7097 13.7152 21.2851 13.1078 21.2851 12.3581C21.2851 11.6085 20.7097 11.0011 19.9995 11.0011H13.5713C12.1508 11.0011 11 12.2158 11 13.7152V27.2859C11 28.7852 12.1508 30 13.5713 30H26.4277C27.8482 30 28.999 28.7852 28.999 27.2859V20.5005C28.999 19.7509 28.4236 19.1435 27.7134 19.1435Z" fill="#2683FF"/>
+                    </svg>
+                </div>
+            </div>
+            <div class="profile-container__secondary-container__email-container">
+                <div class="profile-container__edit-profile__row">
+                    <svg class="profile-container__secondary-container__img" width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M30 60C46.5685 60 60 46.5685 60 30C60 13.4315 46.5685 0 30 0C13.4315 0 0 13.4315 0 30C0 46.5685 13.4315 60 30 60Z" fill="#E8EAF2"/>
+                        <path d="M29.9998 16.7598C25.7965 16.7641 21.8459 18.7646 19.3534 22.1498C16.8607 25.535 16.1236 29.9013 17.3671 33.9162C18.6096 37.9314 21.6853 41.1186 25.6546 42.5032C29.6238 43.8868 34.014 43.305 37.4846 40.9348L35.9861 38.7538C33.3633 40.552 30.0711 41.0781 27.0174 40.1856C23.9649 39.2931 21.4732 37.077 20.2319 34.1482C18.9905 31.2203 19.1294 27.8888 20.6104 25.0734C22.0924 22.2591 24.7588 20.2577 27.8761 19.6232C30.9922 18.9878 34.2296 19.7862 36.6938 21.7976C39.1581 23.809 40.5898 26.8202 40.592 30.0007V31.0365C40.592 32.8762 39.8001 33.9732 38.4723 33.9732V33.995L38.4734 33.9961C38.3892 33.9819 38.305 33.9743 38.2208 33.9743H37.9408C37.1959 33.9743 36.0868 32.8903 36.0868 32.1597V30.0007C36.0989 28.1019 35.2293 26.3038 33.7331 25.1345C32.2358 23.9653 30.2824 23.5563 28.4417 24.0277C26.602 24.498 25.085 25.7963 24.3335 27.5408C23.5832 29.2854 23.6838 31.2794 24.6069 32.9395C25.529 34.5987 27.1696 35.7373 29.0475 36.0206C30.9254 36.3039 32.8286 35.6991 34.2 34.3855C35.0597 35.6542 36.521 36.6255 37.9386 36.6255V36.6025C38.0228 36.6178 38.1092 36.6255 38.1956 36.6255H38.4756C41.326 36.6255 43.2356 34.3855 43.2356 31.042V30.0007C43.2312 26.4909 41.8356 23.1265 39.3551 20.6448C36.8734 18.1631 33.5101 16.7654 30.0003 16.7598L29.9998 16.7598ZM29.9998 33.4416C28.6075 33.4416 27.353 32.6038 26.8204 31.3176C26.2878 30.0313 26.582 28.5515 27.5664 27.567C28.5508 26.5824 30.0306 26.2884 31.317 26.821C32.6032 27.3537 33.441 28.6082 33.441 30.0004C33.441 31.9014 31.901 33.4413 30.0001 33.4413L29.9998 33.4416Z" fill="#354049"/>
+                    </svg>
+                    <div class="profile-container__secondary-container__email-container__text-container">
+                        <h2>{{user.email}}</h2>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="profile-container__button-area">
+            <Button
+                class="profile-container__button-area__delete-button"
+                label="Delete account"
+                width="210px"
+                height="56px"
+                :onPress="toggleDeleteAccountPopup"
+                isDeletion/>
+        </div>
+        <ChangePasswordPopup v-if="isChangePasswordPopupShown"/>
+        <EditProfilePopup v-if="isEditProfilePopupShown"/>
+        <DeleteAccountPopup v-if="isDeleteAccountPopupShown" />
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/account/billing/BillingArea.vue b/web/satellite/src/components/account/billing/BillingArea.vue
index c77b6d3bc..110a3f598 100644
--- a/web/satellite/src/components/account/billing/BillingArea.vue
+++ b/web/satellite/src/components/account/billing/BillingArea.vue
@@ -10,7 +10,7 @@
                         <SortingHeader />
                         <BillingItem />
                     </table>
-				</div>
+                </div>
                 <PaginationArea />
             </div>
         </div>
diff --git a/web/satellite/src/components/account/billing/BillingItem.vue b/web/satellite/src/components/account/billing/BillingItem.vue
index 868e28b05..34b77b5a2 100644
--- a/web/satellite/src/components/account/billing/BillingItem.vue
+++ b/web/satellite/src/components/account/billing/BillingItem.vue
@@ -2,34 +2,34 @@
 // See LICENSE for copying information.
 
 <template>
-	<tr class="container">
-		<td class="container__item bold">test</td>
-		<td class="container__item">test</td>
-		<td class="container__item">test</td>
-		<td class="container__item">
-			<div class="row justify-start">
-				<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-					<path d="M20 7.26316V3.87134C20 3.40351 19.7938 2.93567 19.4845 2.5848C19.1753 2.23392 18.7629 2 18.3505 2H1.64948C1.23711 2 0.824742 2.23392 0.515464 2.5848C0.206186 2.93567 0 3.40351 0 3.87134V7.26316H20Z" fill="#2683FF"/>
-					<path d="M0 9.36816V16.1852C0 16.5862 0.206186 16.9872 0.515464 17.288C0.824742 17.5887 1.23711 17.7892 1.64948 17.7892H18.3505C18.7629 17.7892 19.1753 17.5887 19.4845 17.288C19.7938 16.9872 20 16.5862 20 16.1852V9.36816H0ZM5.36083 15.1827H2.68041V13.8794H5.36083V15.1827ZM10.7217 15.1827H6.70103V13.8794H10.7217V15.1827Z" fill="#2683FF"/>
-				</svg>
-				<p>test</p>
-			</div>
-		</td>
-		<td class="container__item bold">
-			<div class="row justify-start">
-				<p>test</p>
-			</div>
-		</td>
-		<td class="container__item">
-			<div class="row">
-				<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-					<rect class="background" width="40" height="40" rx="4" fill="#E2ECF7"/>
-					<path class="blue" d="M25.6491 19.2809L21.2192 23.5281C20.891 23.8427 20.3988 24 20.0707 24C19.7425 24 19.2503 23.8427 19.0862 23.5281L14.4922 19.2809C13.8359 18.6517 13.8359 17.8652 14.4922 17.236C14.8204 16.9213 15.1485 16.9213 15.6407 16.9213C15.9689 16.9213 16.4611 17.0787 16.6252 17.3933L18.594 19.1236L18.594 11.4157C18.594 10.6292 19.2503 10 20.0707 10C20.891 10 21.5473 10.6292 21.5473 11.4157L21.5473 19.1236L23.5162 17.236C23.6803 16.9213 24.1725 16.9213 24.5006 16.9213C24.8288 16.9213 25.321 17.0787 25.4851 17.3933C26.1414 17.8652 26.1414 18.809 25.6491 19.2809Z" fill="#2683FF"/>
-					<rect class="blue" x="11" y="28" width="18" height="2" rx="1" fill="#2683FF"/>
-				</svg>
-			</div>
-		</td>
-	</tr>
+    <tr class="container">
+        <td class="container__item bold">test</td>
+        <td class="container__item">test</td>
+        <td class="container__item">test</td>
+        <td class="container__item">
+            <div class="row justify-start">
+                <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M20 7.26316V3.87134C20 3.40351 19.7938 2.93567 19.4845 2.5848C19.1753 2.23392 18.7629 2 18.3505 2H1.64948C1.23711 2 0.824742 2.23392 0.515464 2.5848C0.206186 2.93567 0 3.40351 0 3.87134V7.26316H20Z" fill="#2683FF"/>
+                    <path d="M0 9.36816V16.1852C0 16.5862 0.206186 16.9872 0.515464 17.288C0.824742 17.5887 1.23711 17.7892 1.64948 17.7892H18.3505C18.7629 17.7892 19.1753 17.5887 19.4845 17.288C19.7938 16.9872 20 16.5862 20 16.1852V9.36816H0ZM5.36083 15.1827H2.68041V13.8794H5.36083V15.1827ZM10.7217 15.1827H6.70103V13.8794H10.7217V15.1827Z" fill="#2683FF"/>
+                </svg>
+                <p>test</p>
+            </div>
+        </td>
+        <td class="container__item bold">
+            <div class="row justify-start">
+                <p>test</p>
+            </div>
+        </td>
+        <td class="container__item">
+            <div class="row">
+                <svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <rect class="background" width="40" height="40" rx="4" fill="#E2ECF7"/>
+                    <path class="blue" d="M25.6491 19.2809L21.2192 23.5281C20.891 23.8427 20.3988 24 20.0707 24C19.7425 24 19.2503 23.8427 19.0862 23.5281L14.4922 19.2809C13.8359 18.6517 13.8359 17.8652 14.4922 17.236C14.8204 16.9213 15.1485 16.9213 15.6407 16.9213C15.9689 16.9213 16.4611 17.0787 16.6252 17.3933L18.594 19.1236L18.594 11.4157C18.594 10.6292 19.2503 10 20.0707 10C20.891 10 21.5473 10.6292 21.5473 11.4157L21.5473 19.1236L23.5162 17.236C23.6803 16.9213 24.1725 16.9213 24.5006 16.9213C24.8288 16.9213 25.321 17.0787 25.4851 17.3933C26.1414 17.8652 26.1414 18.809 25.6491 19.2809Z" fill="#2683FF"/>
+                    <rect class="blue" x="11" y="28" width="18" height="2" rx="1" fill="#2683FF"/>
+                </svg>
+            </div>
+        </td>
+    </tr>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/account/billing/PaginationArea.vue b/web/satellite/src/components/account/billing/PaginationArea.vue
index 9a304d269..a6910245b 100644
--- a/web/satellite/src/components/account/billing/PaginationArea.vue
+++ b/web/satellite/src/components/account/billing/PaginationArea.vue
@@ -4,12 +4,12 @@
 <template>
     <div class="pagination-container">
         <div class="pagination-container__pages">
-			<div v-html="arrowLeft" class="pagination-container__button"></div>
-			<div class="pagination-container__items">
-			    <span class="selected">1</span>
-			    <span>2</span>
-             </div>
-             <div v-html="arrowRight" class="pagination-container__button"></div>
+            <div v-html="arrowLeft" class="pagination-container__button"></div>
+            <div class="pagination-container__items">
+                <span class="selected">1</span>
+                <span>2</span>
+            </div>
+            <div v-html="arrowRight" class="pagination-container__button"></div>
         </div>
     </div>
 </template>
diff --git a/web/satellite/src/components/account/billing/SortingHeader.vue b/web/satellite/src/components/account/billing/SortingHeader.vue
index b79be00d3..7a66a888a 100644
--- a/web/satellite/src/components/account/billing/SortingHeader.vue
+++ b/web/satellite/src/components/account/billing/SortingHeader.vue
@@ -2,42 +2,42 @@
 // See LICENSE for copying information.
 
 <template>
-	<tr class="sort-header-container">
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>ID</p>
-			</div>
-		</th>
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>Date</p>
-			</div>
-		</th>
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>Project Name</p>
-			</div>
-		</th>
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>Payment method</p>
-			</div>
-		</th>
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>Amount</p>
-				<div class="sort-header-container__item__arrows">
-					<span v-html="arrowUp"></span>
-					<span v-html="arrowDown"></span>
-				</div>
-			</div>
-		</th>
-		<th class="sort-header-container__item no-padding">
-			<div class="row center">
-				<p>Receipt</p>
-			</div>
-		</th>
-	</tr>
+    <tr class="sort-header-container">
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>ID</p>
+            </div>
+        </th>
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>Date</p>
+            </div>
+        </th>
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>Project Name</p>
+            </div>
+        </th>
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>Payment method</p>
+            </div>
+        </th>
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>Amount</p>
+                <div class="sort-header-container__item__arrows">
+                    <span v-html="arrowUp"></span>
+                    <span v-html="arrowDown"></span>
+                </div>
+            </div>
+        </th>
+        <th class="sort-header-container__item no-padding">
+            <div class="row center">
+                <p>Receipt</p>
+            </div>
+        </th>
+    </tr>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/buckets/BucketArea.vue b/web/satellite/src/components/buckets/BucketArea.vue
index c7f3ddad3..1a16e4509 100644
--- a/web/satellite/src/components/buckets/BucketArea.vue
+++ b/web/satellite/src/components/buckets/BucketArea.vue
@@ -16,10 +16,10 @@
                 <PaginationArea />
             </div>
             <EmptyState
-            class="empty-container"
-            v-if="pages === 0 && search && search.length > 0"
-            mainTitle="Nothing found :("
-            :imageSource="emptyImage" />
+                class="empty-container"
+                v-if="pages === 0 && search && search.length > 0"
+                mainTitle="Nothing found :("
+                :imageSource="emptyImage" />
         </div>
         <NoBucketArea v-if="pages === 0 && !search" />
     </div>
diff --git a/web/satellite/src/components/buckets/SortingHeader.vue b/web/satellite/src/components/buckets/SortingHeader.vue
index 592cdb7a0..fc821554d 100644
--- a/web/satellite/src/components/buckets/SortingHeader.vue
+++ b/web/satellite/src/components/buckets/SortingHeader.vue
@@ -2,28 +2,28 @@
 // See LICENSE for copying information.
 
 <template>
-	<tr class="sort-header-container">
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>Bucket Name</p>
-			</div>
-		</th>
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>Storage Used</p>
-			</div>
-		</th>
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>Egress Used</p>
-			</div>
-		</th>
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>Objects Stored</p>
-			</div>
-		</th>
-	</tr>
+    <tr class="sort-header-container">
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>Bucket Name</p>
+            </div>
+        </th>
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>Storage Used</p>
+            </div>
+        </th>
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>Egress Used</p>
+            </div>
+        </th>
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>Objects Stored</p>
+            </div>
+        </th>
+    </tr>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/common/HeaderedInput.vue b/web/satellite/src/components/common/HeaderedInput.vue
index 5e63815e8..6efed6c98 100644
--- a/web/satellite/src/components/common/HeaderedInput.vue
+++ b/web/satellite/src/components/common/HeaderedInput.vue
@@ -3,17 +3,17 @@
 
 <template>
     <div class="input-container">
-		<div v-if="!isOptional" class="label-container">
-			<img v-if="error" src="../../../static/images/register/ErrorInfo.svg"/>
-			<h3 v-if="!error">{{label}}</h3>
-			<h3  v-if="!error" class="label-container__add-label">{{additionalLabel}}</h3>
-			<h3 class="label-container__error" v-if="error">{{error}}</h3>
-		</div>
-		<div v-if="isOptional" class="optional-label-container">
-			<h3>{{label}}</h3>
-			<h4>Optional</h4>
-		</div>
-		<textarea
+        <div v-if="!isOptional" class="label-container">
+            <img v-if="error" src="../../../static/images/register/ErrorInfo.svg"/>
+            <h3 v-if="!error">{{label}}</h3>
+            <h3  v-if="!error" class="label-container__add-label">{{additionalLabel}}</h3>
+            <h3 class="label-container__error" v-if="error">{{error}}</h3>
+        </div>
+        <div v-if="isOptional" class="optional-label-container">
+            <h3>{{label}}</h3>
+            <h4>Optional</h4>
+        </div>
+        <textarea
             v-if="isMultiline"
             :id="this.$props.label"
             :placeholder="this.$props.placeholder"
@@ -21,11 +21,11 @@
             :rows="5"
             :cols="40"
             wrap="hard"
-			v-model.lazy="value"
-			@change="onInput"
+            v-model.lazy="value"
+            @change="onInput"
             @input="onInput">
-		</textarea>
-		<input
+        </textarea>
+        <input
             v-if="!isMultiline"
             :id="this.$props.label"
             :placeholder="this.$props.placeholder"
@@ -34,7 +34,7 @@
             @change="onInput"
             @input="onInput"
             :style="style"/>
-	</div>
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/common/HeaderlessInput.vue b/web/satellite/src/components/common/HeaderlessInput.vue
index 02ee19bf6..e2dd949e2 100644
--- a/web/satellite/src/components/common/HeaderlessInput.vue
+++ b/web/satellite/src/components/common/HeaderlessInput.vue
@@ -4,10 +4,10 @@
 <template>
     <div class="input-wrap">
         <div class="label-container">
-			<img v-if="error" src="../../../static/images/register/ErrorInfo.svg"/>
-			<h3 v-if="!error && label" :style="style.labelStyle">{{label}}</h3>
-			<h3 class="label-container__error" v-if="error" :style="style.errorStyle">{{error}}</h3>
-		</div>
+            <img v-if="error" src="../../../static/images/register/ErrorInfo.svg"/>
+            <h3 v-if="!error && label" :style="style.labelStyle">{{label}}</h3>
+            <h3 class="label-container__error" v-if="error" :style="style.errorStyle">{{error}}</h3>
+        </div>
         <input
             :class="{'inputError' : error}"
             @input="onInput"
@@ -16,20 +16,20 @@
             :type="[isPassword ? passwordType : textType]"
             :style="style.inputStyle"/>
         <!--2 conditions of eye image (crossed or not) -->
-            <svg v-if="isPassword && !isPasswordShown" v-on:click="changeVision()" width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-                <path d="M10 4C4.70642 4 1 10 1 10C1 10 3.6999 16 10 16C16.3527 16 19 10 19 10C19 10 15.3472 4 10 4ZM10 13.8176C7.93537 13.8176 6.2946 12.1271 6.2946 10C6.2946 7.87285 7.93537 6.18239 10 6.18239C12.0646 6.18239 13.7054 7.87285 13.7054 10C13.7054 12.1271 12.0646 13.8176 10 13.8176Z" fill="#AFB7C1"/>
-                <path d="M11.6116 9.96328C11.6116 10.8473 10.8956 11.5633 10.0116 11.5633C9.12763 11.5633 8.41162 10.8473 8.41162 9.96328C8.41162 9.07929 9.12763 8.36328 10.0116 8.36328C10.8956 8.36328 11.6116 9.07929 11.6116 9.96328Z" fill="#AFB7C1"/>
-            </svg>
-            <svg v-if="isPassword && isPasswordShown" v-on:click="changeVision()" width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-                <path d="M10 4C4.70642 4 1 10 1 10C1 10 3.6999 16 10 16C16.3527 16 19 10 19 10C19 10 15.3472 4 10 4ZM10 13.8176C7.93537 13.8176 6.2946 12.1271 6.2946 10C6.2946 7.87285 7.93537 6.18239 10 6.18239C12.0646 6.18239 13.7054 7.87285 13.7054 10C13.7054 12.1271 12.0646 13.8176 10 13.8176Z" fill="#AFB7C1"/>
-                <path d="M11.6121 9.96328C11.6121 10.8473 10.8961 11.5633 10.0121 11.5633C9.12812 11.5633 8.41211 10.8473 8.41211 9.96328C8.41211 9.07929 9.12812 8.36328 10.0121 8.36328C10.8961 8.36328 11.6121 9.07929 11.6121 9.96328Z" fill="#AFB7C1"/>
-                <mask id="path-3-inside-1" fill="white">
+        <svg v-if="isPassword && !isPasswordShown" v-on:click="changeVision()" width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M10 4C4.70642 4 1 10 1 10C1 10 3.6999 16 10 16C16.3527 16 19 10 19 10C19 10 15.3472 4 10 4ZM10 13.8176C7.93537 13.8176 6.2946 12.1271 6.2946 10C6.2946 7.87285 7.93537 6.18239 10 6.18239C12.0646 6.18239 13.7054 7.87285 13.7054 10C13.7054 12.1271 12.0646 13.8176 10 13.8176Z" fill="#AFB7C1"/>
+            <path d="M11.6116 9.96328C11.6116 10.8473 10.8956 11.5633 10.0116 11.5633C9.12763 11.5633 8.41162 10.8473 8.41162 9.96328C8.41162 9.07929 9.12763 8.36328 10.0116 8.36328C10.8956 8.36328 11.6116 9.07929 11.6116 9.96328Z" fill="#AFB7C1"/>
+        </svg>
+        <svg v-if="isPassword && isPasswordShown" v-on:click="changeVision()" width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M10 4C4.70642 4 1 10 1 10C1 10 3.6999 16 10 16C16.3527 16 19 10 19 10C19 10 15.3472 4 10 4ZM10 13.8176C7.93537 13.8176 6.2946 12.1271 6.2946 10C6.2946 7.87285 7.93537 6.18239 10 6.18239C12.0646 6.18239 13.7054 7.87285 13.7054 10C13.7054 12.1271 12.0646 13.8176 10 13.8176Z" fill="#AFB7C1"/>
+            <path d="M11.6121 9.96328C11.6121 10.8473 10.8961 11.5633 10.0121 11.5633C9.12812 11.5633 8.41211 10.8473 8.41211 9.96328C8.41211 9.07929 9.12812 8.36328 10.0121 8.36328C10.8961 8.36328 11.6121 9.07929 11.6121 9.96328Z" fill="#AFB7C1"/>
+            <mask id="path-3-inside-1" fill="white">
                 <path fill-rule="evenodd" clip-rule="evenodd" d="M5 16.5L16 1L16.8155 1.57875L5.81551 17.0787L5 16.5Z"/>
-                </mask>
-                <path fill-rule="evenodd" clip-rule="evenodd" d="M5 16.5L16 1L16.8155 1.57875L5.81551 17.0787L5 16.5Z" fill="white"/>
-                <path d="M16 1L16.5787 0.184493L15.7632 -0.394254L15.1845 0.421253L16 1ZM5 16.5L4.18449 15.9213L3.60575 16.7368L4.42125 17.3155L5 16.5ZM16.8155 1.57875L17.631 2.15749L18.2098 1.34199L17.3943 0.76324L16.8155 1.57875ZM5.81551 17.0787L5.23676 17.8943L6.05227 18.473L6.63101 17.6575L5.81551 17.0787ZM15.1845 0.421253L4.18449 15.9213L5.81551 17.0787L16.8155 1.57875L15.1845 0.421253ZM17.3943 0.76324L16.5787 0.184493L15.4213 1.81551L16.2368 2.39425L17.3943 0.76324ZM6.63101 17.6575L17.631 2.15749L16 1L5 16.5L6.63101 17.6575ZM4.42125 17.3155L5.23676 17.8943L6.39425 16.2632L5.57875 15.6845L4.42125 17.3155Z" fill="white" mask="url(#path-3-inside-1)"/>
-                <path fill-rule="evenodd" clip-rule="evenodd" d="M5 17.5L16 2L16.8155 2.57875L5.81551 18.0787L5 17.5Z" fill="#AFB7C1"/>
-            </svg>
+            </mask>
+            <path fill-rule="evenodd" clip-rule="evenodd" d="M5 16.5L16 1L16.8155 1.57875L5.81551 17.0787L5 16.5Z" fill="white"/>
+            <path d="M16 1L16.5787 0.184493L15.7632 -0.394254L15.1845 0.421253L16 1ZM5 16.5L4.18449 15.9213L3.60575 16.7368L4.42125 17.3155L5 16.5ZM16.8155 1.57875L17.631 2.15749L18.2098 1.34199L17.3943 0.76324L16.8155 1.57875ZM5.81551 17.0787L5.23676 17.8943L6.05227 18.473L6.63101 17.6575L5.81551 17.0787ZM15.1845 0.421253L4.18449 15.9213L5.81551 17.0787L16.8155 1.57875L15.1845 0.421253ZM17.3943 0.76324L16.5787 0.184493L15.4213 1.81551L16.2368 2.39425L17.3943 0.76324ZM6.63101 17.6575L17.631 2.15749L16 1L5 16.5L6.63101 17.6575ZM4.42125 17.3155L5.23676 17.8943L6.39425 16.2632L5.57875 15.6845L4.42125 17.3155Z" fill="white" mask="url(#path-3-inside-1)"/>
+            <path fill-rule="evenodd" clip-rule="evenodd" d="M5 17.5L16 2L16.8155 2.57875L5.81551 18.0787L5 17.5Z" fill="#AFB7C1"/>
+        </svg>
         <!-- end of image-->
     </div>
 </template>
diff --git a/web/satellite/src/components/common/registrationSuccessPopup.html b/web/satellite/src/components/common/registrationSuccessPopup.html
index 09e13985f..5d12b6e4c 100644
--- a/web/satellite/src/components/common/registrationSuccessPopup.html
+++ b/web/satellite/src/components/common/registrationSuccessPopup.html
@@ -2,30 +2,30 @@
 <!--See LICENSE for copying information.-->
 
 <div v-if="isPopupShown" class="register-success-popup-container" id="successfulRegistrationPopup">
-	<div class="register-success-popup" >
-		<div class="register-success-popup__info-panel-container">
-			<svg width="206" height="232" viewBox="0 0 206 232" fill="none" xmlns="http://www.w3.org/2000/svg">
-				<path d="M205.275 67.6463C205.089 74.8655 201.955 80.2446 195.908 83.8707C194.793 84.5379 194.405 85.2172 194.408 86.4899C194.446 106.182 194.444 125.876 194.414 145.564C194.412 146.747 194.714 147.462 195.797 148.089C202.796 152.13 206.335 159.588 205.078 167.426C203.873 174.939 197.868 181.111 190.09 182.589C185.581 183.448 181.212 182.763 177.259 180.339C176.055 179.601 175.206 179.73 174.077 180.383C157.147 190.188 140.199 199.969 123.234 209.714C122.073 210.38 121.638 211.116 121.639 212.467C121.658 221.943 114.345 230.19 105.209 231.107C95.4799 232.087 86.8785 225.977 84.7768 216.532C84.4536 215.081 84.3453 213.566 84.3112 212.078C84.2875 211.072 84.008 210.455 83.1132 209.936C65.911 200.041 48.7239 190.123 31.5445 180.188C30.6137 179.647 29.8828 179.644 28.9452 180.211C17.7202 186.968 3.41102 180.489 1.03159 167.866C-0.471472 159.893 2.77542 152.434 9.91188 148.235C11.0401 147.571 11.5493 146.899 11.5469 145.52C11.4958 125.827 11.5032 106.135 11.5343 86.4438C11.5352 85.2602 11.228 84.5613 10.145 83.9322C2.97806 79.7704 -0.391832 72.5387 0.984538 64.4191C2.35015 56.3537 8.58871 50.4371 16.7058 49.2815C21.0563 48.6622 25.2518 49.4546 29.0175 51.8587C29.8914 52.4171 30.5414 52.4005 31.4317 51.8876C48.5612 41.9747 65.7041 32.091 82.861 22.2289C83.8979 21.633 84.3026 20.9472 84.3054 19.7249C84.3346 8.87848 92.9031 0.576899 103.764 0.795224C112.227 0.965272 120.146 7.95106 121.348 16.3043C121.458 17.0724 121.631 17.5451 121.631 18.6029C121.631 20.918 122.483 21.9011 124.287 22.9303C140.933 32.4551 157.533 42.0553 174.124 51.6726C175.263 52.3338 176.092 52.3624 177.279 51.6883C188.547 45.2613 202.209 51.4202 204.952 64.1384C205.209 65.3204 205.185 66.5652 205.275 67.6463ZM58.368 135.204C58.198 135.349 58.0833 135.474 57.9409 135.553C48.6031 140.948 39.2707 146.357 29.8988 151.69C29.3809 151.982 28.373 151.922 27.848 151.604C25.3702 150.107 22.734 149.114 19.8472 149.037C10.2431 148.791 4.40148 156.638 4.0743 163.453C3.69423 171.434 9.73415 179.612 19.5025 179.538C28.0691 179.476 34.5875 172.607 34.5027 164.037C34.4885 162.505 34.9384 161.638 36.2828 160.877C46.2341 155.208 56.1476 149.474 66.0512 143.724C67.0082 143.166 67.7782 143.076 68.82 143.564C74.9955 146.467 81.3826 146.959 87.9671 145.098C88.6208 144.914 89.4892 145.1 90.1445 145.38C92.0802 146.203 93.9295 147.249 95.8778 148.035C96.9894 148.485 97.3637 149.092 97.3618 150.271C97.3283 165.794 97.3295 181.313 97.3587 196.835C97.36 197.93 97.014 198.552 96.0153 199.032C90.7841 201.551 86.8382 208.058 87.9145 215.015C89.1645 223.097 97.47 229.203 105.482 227.636C112.542 226.255 117.18 221.437 118.173 214.022C118.846 208.993 116.426 202.353 109.959 199.028C109.082 198.581 108.598 198.09 108.601 197.012C108.633 181.935 108.635 166.859 108.601 151.785C108.6 150.445 109.216 150.17 110.388 149.963C113.487 149.418 116.592 148.82 119.619 147.97C120.988 147.587 122.073 147.531 123.399 148.103C130.036 150.959 136.5 150.47 142.681 146.739C143.564 146.209 144.196 146.185 145.083 146.703C153.249 151.458 161.43 156.193 169.647 160.859C170.975 161.61 171.49 162.443 171.449 164.003C171.212 173.023 179.077 180.392 188.25 179.415C197.254 178.459 203.632 169.79 201.544 161.027C199.04 150.524 187.665 145.787 178.476 151.463C177.508 152.06 176.807 152.222 175.776 151.619C167.999 147.075 160.205 142.565 152.378 138.108C151.221 137.452 151.067 136.841 151.436 135.601C153.796 127.648 152.193 120.574 146.498 114.482C145.385 113.291 140.162 104.952 139.435 103.414C138.859 102.198 139.103 101.549 140.261 100.883C152.128 94.0877 163.976 87.259 175.805 80.3981C176.758 79.847 177.405 79.8369 178.339 80.4645C181.672 82.7037 185.409 83.4106 189.33 82.7252C196.963 81.3873 202.495 74.4805 201.816 66.3281C201.077 57.4828 192.4 50.8713 183.734 52.7882C176.13 54.4724 171.354 60.4164 171.441 68.2278C171.453 69.5596 171.083 70.3191 169.897 70.9969C157.881 77.871 145.895 84.7925 133.931 91.7568C132.852 92.3829 132.262 92.254 131.395 91.4173C125.757 85.9863 118.975 82.9359 111.235 81.9697C108.624 81.6407 108.622 81.6554 108.622 78.9596C108.621 64.8293 108.656 50.6991 108.58 36.5695C108.57 34.5975 109.031 33.4548 110.878 32.393C117.503 28.5874 120.022 20.3919 116.99 13.4046C113.934 6.35605 106.125 2.5901 98.8003 4.82132C92.1337 6.85144 88.4191 11.5614 87.7644 18.4141C87.2614 23.7031 89.7632 29.5781 95.7991 32.8755C96.7259 33.3816 97.3732 33.8269 97.3686 35.099C97.3175 50.6766 97.3218 66.2521 97.3609 81.8307C97.3633 83.0653 96.8012 83.4838 95.7933 83.9933C92.7794 85.5127 89.5467 86.8414 86.9883 88.9573C84.0369 91.394 81.2789 92.8011 77.1686 92.8011C76.7676 92.7878 76.5096 92.8281 76.0929 92.8192C75.0745 92.7971 73.9306 92.7546 73.0982 92.2786C60.9772 85.3663 48.9216 78.3406 36.7855 71.4507C35.0522 70.468 34.2151 69.4154 34.5045 67.4169C34.6198 66.6208 34.3744 65.7687 34.245 64.9483C33.0599 57.485 25.7607 51.2418 16.9493 52.6911C8.30673 54.113 2.81908 61.9351 4.24435 70.3062C6.06321 80.9986 18.2648 86.4115 27.4711 80.5632C28.5098 79.9027 29.2281 79.8507 30.2921 80.4715C39.4159 85.7925 48.5766 91.0508 57.7247 96.3299C59.293 97.2343 60.8557 98.1479 62.4132 99.0525C51.9022 110.183 50.7224 122.145 58.368 135.204Z" fill="#2683FF"/><path d="M83.6426 99.2185C86.0473 99.4319 87.245 98.6225 89.0024 96.99C96.5893 89.939 105.54 87.7558 115.367 91.0202C125.028 94.2293 131.019 101.095 133.004 111.167C133.392 113.14 134.167 114.325 135.93 115.33C140.967 118.199 143.869 124.406 142.872 129.577C141.581 136.272 137.191 140.914 130.984 141.897C127.679 142.423 124.396 142.047 121.486 140.254C120.183 139.451 119.15 139.539 117.804 140.103C109.161 143.736 100.792 143.121 92.8378 138.117C91.6155 137.348 90.594 137.288 89.2711 137.721C78.0624 141.381 66.4039 135.022 63.5564 123.842C60.2954 111.026 70.5204 98.6336 83.6426 99.2185Z" fill="#2683FF"/>
-				<path d="M182.388 164.321C182.387 161.815 184.189 159.992 186.658 159.998C189.035 160.008 191.057 161.97 191.082 164.292C191.108 166.527 188.946 168.686 186.693 168.69C184.281 168.691 182.39 166.771 182.388 164.321Z" fill="#2683FF"/>
-				<path d="M98.6328 19.4492C98.6424 17.0212 100.535 15.147 102.983 15.1445C105.432 15.1433 107.312 17.0117 107.321 19.4505C107.327 21.7884 105.287 23.8535 102.989 23.8259C100.655 23.8031 98.6248 21.761 98.6328 19.4492Z" fill="#2683FF"/>
-				<path d="M23.5619 164.341C23.553 166.785 21.6438 168.71 19.2462 168.691C16.9802 168.671 14.8852 166.556 14.8751 164.274C14.8621 161.995 16.9356 159.999 19.3141 159.999C21.7797 160.001 23.5718 161.832 23.5619 164.341Z" fill="#2683FF"/>
-				<path d="M103.029 208.317C105.475 208.335 107.332 210.195 107.32 212.616C107.306 215.028 105.419 216.843 102.942 216.829C100.484 216.814 98.6056 214.939 98.6326 212.529C98.6609 210.131 100.576 208.301 103.029 208.317Z" fill="#2683FF"/>
-				<path d="M19.3635 71.9823C16.8859 72.0047 14.949 70.2 14.8755 67.8046C14.8029 65.4716 16.7623 63.5128 19.206 63.4772C21.7552 63.4403 23.5279 65.1392 23.5639 67.6536C23.6008 70.1791 21.8717 71.9608 19.3635 71.9823Z" fill="#2683FF"/>
-				<path d="M186.604 71.9891C184.099 71.97 182.363 70.1868 182.387 67.6607C182.413 65.1534 184.189 63.4471 186.74 63.48C189.184 63.5126 191.13 65.455 191.074 67.8C191.015 70.1776 189.065 72.006 186.604 71.9891Z" fill="#2683FF"/>
-			</svg>
-		</div>
-		<div class="register-success-popup__form-container">
-			<h2 class="register-success-popup__form-container__main-label-text">Verify Your Email</h2>
-			<p>You have almost finished registering your account on the Tardigrade Satellite. Only one step left. Please check your inbox for a verification email.</p>
-			<h3>Didn’t receive a verification email?<b> {{timeToEnableResendEmailButton}}</b></h3>
-			<div class="register-success-popup__form-container__button-container">
-				<Button label="Resend Email" width="450px" height="50px" :onPress="onResendEmailButtonClick" :isDisabled="isResendEmailButtonDisabled"/>
-			</div>
-		</div>
-		<div class="register-success-popup__close-cross-container">
-			<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" v-on:click="onCloseClick" >
-				<path d="M15.7071 1.70711C16.0976 1.31658 16.0976 0.683417 15.7071 0.292893C15.3166 -0.0976311 14.6834 -0.0976311 14.2929 0.292893L15.7071 1.70711ZM0.292893 14.2929C-0.0976311 14.6834 -0.0976311 15.3166 0.292893 15.7071C0.683417 16.0976 1.31658 16.0976 1.70711 15.7071L0.292893 14.2929ZM1.70711 0.292893C1.31658 -0.0976311 0.683417 -0.0976311 0.292893 0.292893C-0.0976311 0.683417 -0.0976311 1.31658 0.292893 1.70711L1.70711 0.292893ZM14.2929 15.7071C14.6834 16.0976 15.3166 16.0976 15.7071 15.7071C16.0976 15.3166 16.0976 14.6834 15.7071 14.2929L14.2929 15.7071ZM14.2929 0.292893L0.292893 14.2929L1.70711 15.7071L15.7071 1.70711L14.2929 0.292893ZM0.292893 1.70711L14.2929 15.7071L15.7071 14.2929L1.70711 0.292893L0.292893 1.70711Z" fill="#384B65"/>
-			</svg>
-		</div>
-	</div>
+    <div class="register-success-popup" >
+        <div class="register-success-popup__info-panel-container">
+            <svg width="206" height="232" viewBox="0 0 206 232" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M205.275 67.6463C205.089 74.8655 201.955 80.2446 195.908 83.8707C194.793 84.5379 194.405 85.2172 194.408 86.4899C194.446 106.182 194.444 125.876 194.414 145.564C194.412 146.747 194.714 147.462 195.797 148.089C202.796 152.13 206.335 159.588 205.078 167.426C203.873 174.939 197.868 181.111 190.09 182.589C185.581 183.448 181.212 182.763 177.259 180.339C176.055 179.601 175.206 179.73 174.077 180.383C157.147 190.188 140.199 199.969 123.234 209.714C122.073 210.38 121.638 211.116 121.639 212.467C121.658 221.943 114.345 230.19 105.209 231.107C95.4799 232.087 86.8785 225.977 84.7768 216.532C84.4536 215.081 84.3453 213.566 84.3112 212.078C84.2875 211.072 84.008 210.455 83.1132 209.936C65.911 200.041 48.7239 190.123 31.5445 180.188C30.6137 179.647 29.8828 179.644 28.9452 180.211C17.7202 186.968 3.41102 180.489 1.03159 167.866C-0.471472 159.893 2.77542 152.434 9.91188 148.235C11.0401 147.571 11.5493 146.899 11.5469 145.52C11.4958 125.827 11.5032 106.135 11.5343 86.4438C11.5352 85.2602 11.228 84.5613 10.145 83.9322C2.97806 79.7704 -0.391832 72.5387 0.984538 64.4191C2.35015 56.3537 8.58871 50.4371 16.7058 49.2815C21.0563 48.6622 25.2518 49.4546 29.0175 51.8587C29.8914 52.4171 30.5414 52.4005 31.4317 51.8876C48.5612 41.9747 65.7041 32.091 82.861 22.2289C83.8979 21.633 84.3026 20.9472 84.3054 19.7249C84.3346 8.87848 92.9031 0.576899 103.764 0.795224C112.227 0.965272 120.146 7.95106 121.348 16.3043C121.458 17.0724 121.631 17.5451 121.631 18.6029C121.631 20.918 122.483 21.9011 124.287 22.9303C140.933 32.4551 157.533 42.0553 174.124 51.6726C175.263 52.3338 176.092 52.3624 177.279 51.6883C188.547 45.2613 202.209 51.4202 204.952 64.1384C205.209 65.3204 205.185 66.5652 205.275 67.6463ZM58.368 135.204C58.198 135.349 58.0833 135.474 57.9409 135.553C48.6031 140.948 39.2707 146.357 29.8988 151.69C29.3809 151.982 28.373 151.922 27.848 151.604C25.3702 150.107 22.734 149.114 19.8472 149.037C10.2431 148.791 4.40148 156.638 4.0743 163.453C3.69423 171.434 9.73415 179.612 19.5025 179.538C28.0691 179.476 34.5875 172.607 34.5027 164.037C34.4885 162.505 34.9384 161.638 36.2828 160.877C46.2341 155.208 56.1476 149.474 66.0512 143.724C67.0082 143.166 67.7782 143.076 68.82 143.564C74.9955 146.467 81.3826 146.959 87.9671 145.098C88.6208 144.914 89.4892 145.1 90.1445 145.38C92.0802 146.203 93.9295 147.249 95.8778 148.035C96.9894 148.485 97.3637 149.092 97.3618 150.271C97.3283 165.794 97.3295 181.313 97.3587 196.835C97.36 197.93 97.014 198.552 96.0153 199.032C90.7841 201.551 86.8382 208.058 87.9145 215.015C89.1645 223.097 97.47 229.203 105.482 227.636C112.542 226.255 117.18 221.437 118.173 214.022C118.846 208.993 116.426 202.353 109.959 199.028C109.082 198.581 108.598 198.09 108.601 197.012C108.633 181.935 108.635 166.859 108.601 151.785C108.6 150.445 109.216 150.17 110.388 149.963C113.487 149.418 116.592 148.82 119.619 147.97C120.988 147.587 122.073 147.531 123.399 148.103C130.036 150.959 136.5 150.47 142.681 146.739C143.564 146.209 144.196 146.185 145.083 146.703C153.249 151.458 161.43 156.193 169.647 160.859C170.975 161.61 171.49 162.443 171.449 164.003C171.212 173.023 179.077 180.392 188.25 179.415C197.254 178.459 203.632 169.79 201.544 161.027C199.04 150.524 187.665 145.787 178.476 151.463C177.508 152.06 176.807 152.222 175.776 151.619C167.999 147.075 160.205 142.565 152.378 138.108C151.221 137.452 151.067 136.841 151.436 135.601C153.796 127.648 152.193 120.574 146.498 114.482C145.385 113.291 140.162 104.952 139.435 103.414C138.859 102.198 139.103 101.549 140.261 100.883C152.128 94.0877 163.976 87.259 175.805 80.3981C176.758 79.847 177.405 79.8369 178.339 80.4645C181.672 82.7037 185.409 83.4106 189.33 82.7252C196.963 81.3873 202.495 74.4805 201.816 66.3281C201.077 57.4828 192.4 50.8713 183.734 52.7882C176.13 54.4724 171.354 60.4164 171.441 68.2278C171.453 69.5596 171.083 70.3191 169.897 70.9969C157.881 77.871 145.895 84.7925 133.931 91.7568C132.852 92.3829 132.262 92.254 131.395 91.4173C125.757 85.9863 118.975 82.9359 111.235 81.9697C108.624 81.6407 108.622 81.6554 108.622 78.9596C108.621 64.8293 108.656 50.6991 108.58 36.5695C108.57 34.5975 109.031 33.4548 110.878 32.393C117.503 28.5874 120.022 20.3919 116.99 13.4046C113.934 6.35605 106.125 2.5901 98.8003 4.82132C92.1337 6.85144 88.4191 11.5614 87.7644 18.4141C87.2614 23.7031 89.7632 29.5781 95.7991 32.8755C96.7259 33.3816 97.3732 33.8269 97.3686 35.099C97.3175 50.6766 97.3218 66.2521 97.3609 81.8307C97.3633 83.0653 96.8012 83.4838 95.7933 83.9933C92.7794 85.5127 89.5467 86.8414 86.9883 88.9573C84.0369 91.394 81.2789 92.8011 77.1686 92.8011C76.7676 92.7878 76.5096 92.8281 76.0929 92.8192C75.0745 92.7971 73.9306 92.7546 73.0982 92.2786C60.9772 85.3663 48.9216 78.3406 36.7855 71.4507C35.0522 70.468 34.2151 69.4154 34.5045 67.4169C34.6198 66.6208 34.3744 65.7687 34.245 64.9483C33.0599 57.485 25.7607 51.2418 16.9493 52.6911C8.30673 54.113 2.81908 61.9351 4.24435 70.3062C6.06321 80.9986 18.2648 86.4115 27.4711 80.5632C28.5098 79.9027 29.2281 79.8507 30.2921 80.4715C39.4159 85.7925 48.5766 91.0508 57.7247 96.3299C59.293 97.2343 60.8557 98.1479 62.4132 99.0525C51.9022 110.183 50.7224 122.145 58.368 135.204Z" fill="#2683FF"/><path d="M83.6426 99.2185C86.0473 99.4319 87.245 98.6225 89.0024 96.99C96.5893 89.939 105.54 87.7558 115.367 91.0202C125.028 94.2293 131.019 101.095 133.004 111.167C133.392 113.14 134.167 114.325 135.93 115.33C140.967 118.199 143.869 124.406 142.872 129.577C141.581 136.272 137.191 140.914 130.984 141.897C127.679 142.423 124.396 142.047 121.486 140.254C120.183 139.451 119.15 139.539 117.804 140.103C109.161 143.736 100.792 143.121 92.8378 138.117C91.6155 137.348 90.594 137.288 89.2711 137.721C78.0624 141.381 66.4039 135.022 63.5564 123.842C60.2954 111.026 70.5204 98.6336 83.6426 99.2185Z" fill="#2683FF"/>
+                <path d="M182.388 164.321C182.387 161.815 184.189 159.992 186.658 159.998C189.035 160.008 191.057 161.97 191.082 164.292C191.108 166.527 188.946 168.686 186.693 168.69C184.281 168.691 182.39 166.771 182.388 164.321Z" fill="#2683FF"/>
+                <path d="M98.6328 19.4492C98.6424 17.0212 100.535 15.147 102.983 15.1445C105.432 15.1433 107.312 17.0117 107.321 19.4505C107.327 21.7884 105.287 23.8535 102.989 23.8259C100.655 23.8031 98.6248 21.761 98.6328 19.4492Z" fill="#2683FF"/>
+                <path d="M23.5619 164.341C23.553 166.785 21.6438 168.71 19.2462 168.691C16.9802 168.671 14.8852 166.556 14.8751 164.274C14.8621 161.995 16.9356 159.999 19.3141 159.999C21.7797 160.001 23.5718 161.832 23.5619 164.341Z" fill="#2683FF"/>
+                <path d="M103.029 208.317C105.475 208.335 107.332 210.195 107.32 212.616C107.306 215.028 105.419 216.843 102.942 216.829C100.484 216.814 98.6056 214.939 98.6326 212.529C98.6609 210.131 100.576 208.301 103.029 208.317Z" fill="#2683FF"/>
+                <path d="M19.3635 71.9823C16.8859 72.0047 14.949 70.2 14.8755 67.8046C14.8029 65.4716 16.7623 63.5128 19.206 63.4772C21.7552 63.4403 23.5279 65.1392 23.5639 67.6536C23.6008 70.1791 21.8717 71.9608 19.3635 71.9823Z" fill="#2683FF"/>
+                <path d="M186.604 71.9891C184.099 71.97 182.363 70.1868 182.387 67.6607C182.413 65.1534 184.189 63.4471 186.74 63.48C189.184 63.5126 191.13 65.455 191.074 67.8C191.015 70.1776 189.065 72.006 186.604 71.9891Z" fill="#2683FF"/>
+            </svg>
+        </div>
+        <div class="register-success-popup__form-container">
+            <h2 class="register-success-popup__form-container__main-label-text">Verify Your Email</h2>
+            <p>You have almost finished registering your account on the Tardigrade Satellite. Only one step left. Please check your inbox for a verification email.</p>
+            <h3>Didn’t receive a verification email?<b> {{timeToEnableResendEmailButton}}</b></h3>
+            <div class="register-success-popup__form-container__button-container">
+                <Button label="Resend Email" width="450px" height="50px" :onPress="onResendEmailButtonClick" :isDisabled="isResendEmailButtonDisabled"/>
+            </div>
+        </div>
+        <div class="register-success-popup__close-cross-container">
+            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" v-on:click="onCloseClick" >
+                <path d="M15.7071 1.70711C16.0976 1.31658 16.0976 0.683417 15.7071 0.292893C15.3166 -0.0976311 14.6834 -0.0976311 14.2929 0.292893L15.7071 1.70711ZM0.292893 14.2929C-0.0976311 14.6834 -0.0976311 15.3166 0.292893 15.7071C0.683417 16.0976 1.31658 16.0976 1.70711 15.7071L0.292893 14.2929ZM1.70711 0.292893C1.31658 -0.0976311 0.683417 -0.0976311 0.292893 0.292893C-0.0976311 0.683417 -0.0976311 1.31658 0.292893 1.70711L1.70711 0.292893ZM14.2929 15.7071C14.6834 16.0976 15.3166 16.0976 15.7071 15.7071C16.0976 15.3166 16.0976 14.6834 15.7071 14.2929L14.2929 15.7071ZM14.2929 0.292893L0.292893 14.2929L1.70711 15.7071L15.7071 1.70711L14.2929 0.292893ZM0.292893 1.70711L14.2929 15.7071L15.7071 14.2929L1.70711 0.292893L0.292893 1.70711Z" fill="#384B65"/>
+            </svg>
+        </div>
+    </div>
 </div>
diff --git a/web/satellite/src/components/errors/page40X.html b/web/satellite/src/components/errors/page40X.html
index f8a732b36..ff1adda9e 100644
--- a/web/satellite/src/components/errors/page40X.html
+++ b/web/satellite/src/components/errors/page40X.html
@@ -2,25 +2,25 @@
 <!--See LICENSE for copying information.-->
 
 <div class="error-container">
-	<a href="/" class="logo">
-		<svg class="header-container__left-area__logo__img" width="54" height="60" viewBox="0 0 54 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-			<path d="M54 17.4399C53.9172 19.3141 53.0892 20.6993 51.5161 21.6771C51.1849 21.8401 51.1021 22.003 51.1021 22.329C51.1021 27.4625 51.1021 32.596 51.1021 37.7295C51.1021 38.0555 51.1849 38.2184 51.4333 38.3814C53.2548 39.4407 54.2484 41.3963 53.9172 43.4334C53.586 45.389 52.0129 47.0187 49.9429 47.3447C48.7837 47.5891 47.6246 47.4262 46.5482 46.7743C46.217 46.6113 45.9686 46.6113 45.7202 46.7743C41.2491 49.3003 36.7781 51.9078 32.307 54.4338C31.9758 54.5968 31.893 54.7597 31.893 55.1672C31.893 57.6117 29.9887 59.8118 27.5875 59.9747C25.0208 60.2192 22.7025 58.671 22.2057 56.145C22.1229 55.7376 22.1229 55.4116 22.1229 55.0042C22.1229 54.7597 22.0401 54.5968 21.7917 54.4338C17.2378 51.8263 12.6839 49.3003 8.13005 46.6928C7.88166 46.5298 7.71606 46.5298 7.46767 46.6928C4.48695 48.4854 0.678253 46.7743 0.0986687 43.5149C-0.31532 41.4778 0.595455 39.5222 2.41701 38.3814C2.7482 38.2184 2.83099 38.0555 2.83099 37.648C2.83099 32.5145 2.83099 27.381 2.83099 22.2475C2.83099 21.9216 2.7482 21.7586 2.4998 21.5956C0.595455 20.5363 -0.31532 18.6622 0.0986687 16.5436C0.42986 14.425 2.08581 12.8768 4.23856 12.6323C5.39772 12.4694 6.4741 12.7138 7.46767 13.2842C7.71606 13.4472 7.88166 13.4472 8.13005 13.2842C12.6839 10.6767 17.155 8.15071 21.7089 5.54321C21.9573 5.38024 22.1229 5.21727 22.1229 4.89133C22.1229 2.03938 24.3584 -0.0792115 27.2563 0.00227286C29.4919 0.0837572 31.5618 1.87641 31.893 4.07649C31.893 4.23946 31.9758 4.40243 31.9758 4.64688C31.9758 5.21727 32.2242 5.54321 32.6382 5.78766C37.0265 8.23219 41.4147 10.7582 45.803 13.2842C46.1342 13.4472 46.2998 13.4472 46.631 13.2842C49.6117 11.573 53.2548 13.2027 53.9172 16.5436C54 16.8695 54 17.1955 54 17.4399ZM15.1679 35.0405C15.0851 35.0405 15.0851 35.122 15.0851 35.122C12.6011 36.5073 10.1172 37.8925 7.63326 39.3592C7.46767 39.4407 7.21927 39.4407 7.05368 39.3592C6.3913 38.9518 5.72892 38.7073 4.90094 38.7073C2.33421 38.6258 0.843848 40.663 0.761051 42.4556C0.761051 44.4927 2.33421 46.6113 4.90094 46.6113C7.13648 46.6113 8.87523 44.8187 8.87523 42.6186C8.87523 42.2112 8.95803 41.9667 9.37202 41.8037C12.0215 40.337 14.5883 38.8703 17.2378 37.3221C17.4862 37.1591 17.7346 37.1591 17.983 37.2406C19.6389 37.974 21.2949 38.1369 23.0336 37.648C23.1992 37.5665 23.4476 37.648 23.6132 37.7295C24.11 37.974 24.6068 38.2184 25.1036 38.3814C25.4348 38.4629 25.5176 38.6258 25.5176 38.9518C25.5176 43.026 25.5176 47.0187 25.5176 51.0929C25.5176 51.3374 25.4348 51.5004 25.1864 51.6633C23.7788 52.3152 22.7852 54.0264 23.0336 55.819C23.3648 57.9376 25.5176 59.4858 27.6703 59.0784C29.5747 58.7525 30.7338 57.4487 31.065 55.5746C31.2306 54.2708 30.5682 52.5597 28.9123 51.6633C28.6639 51.5819 28.5811 51.4189 28.5811 51.1744C28.5811 47.2632 28.5811 43.3519 28.5811 39.4407C28.5811 39.1147 28.7467 39.0333 29.0779 38.9518C29.9059 38.7888 30.7338 38.6258 31.479 38.4629C31.8102 38.3814 32.1414 38.3814 32.4726 38.4629C34.2113 39.1962 35.9501 39.1147 37.606 38.1369C37.8544 37.974 38.02 37.974 38.2684 38.1369C40.4212 39.3592 42.5739 40.5815 44.7267 41.8037C45.0578 41.9667 45.2234 42.2112 45.2234 42.6186C44.975 44.9001 47.1278 46.7743 49.5289 46.5298C51.9301 46.2854 53.586 44.0038 53.0064 41.7222C52.344 38.9518 49.3633 37.7295 46.8794 39.1962C46.631 39.3592 46.4654 39.3592 46.1342 39.1962C44.0643 37.974 41.9943 36.8332 39.9244 35.6924C39.5932 35.5294 39.5932 35.3665 39.676 35.0405C40.3384 33.0034 39.8416 31.1293 38.3512 29.5811C38.02 29.2551 36.6953 27.1366 36.4469 26.7291C36.2813 26.4032 36.3641 26.2402 36.6953 26.0773C39.8416 24.2846 42.9879 22.5734 46.0514 20.7808C46.2998 20.6178 46.4654 20.6178 46.7138 20.7808C47.6246 21.3512 48.6181 21.5141 49.6117 21.3512C51.5989 21.0252 53.0892 19.2326 52.9236 17.114C52.758 14.8324 50.4397 13.1212 48.1214 13.6102C46.1342 14.0176 44.8094 15.5658 44.8922 17.6029C44.8922 17.9288 44.8094 18.1733 44.4783 18.3362C41.3319 20.1289 38.1028 21.9216 34.9565 23.7142C34.7081 23.8772 34.5425 23.8772 34.2941 23.6327C32.8038 22.2475 30.9822 21.4326 28.9951 21.1882C28.3327 21.1067 28.3327 21.1067 28.3327 20.3734C28.3327 16.7066 28.3327 13.0398 28.3327 9.37297C28.3327 8.88406 28.4155 8.55813 28.9123 8.31367C30.651 7.33586 31.3134 5.21727 30.5682 3.34313C29.7403 1.55048 27.6703 0.491179 25.766 1.14305C24.0272 1.63196 23.0336 2.93571 22.868 4.64688C22.7025 6.03211 23.3648 7.58031 25.0208 8.39516C25.2692 8.55813 25.4348 8.63961 25.4348 8.96555C25.4348 13.0398 25.4348 17.0325 25.4348 21.1067C25.4348 21.4326 25.2692 21.5141 25.0208 21.6771C24.1928 22.0845 23.3648 22.4105 22.7025 22.9809C21.9573 23.6327 21.2121 23.9587 20.1357 23.9587C20.0529 23.9587 19.9701 23.9587 19.8873 23.9587C19.6389 23.9587 19.3077 23.9587 19.0594 23.7957C15.8302 22.003 12.6839 20.2104 9.45481 18.4177C8.95803 18.1733 8.79243 17.8473 8.87523 17.3584C8.87523 17.114 8.87523 16.951 8.79243 16.7066C8.46124 14.7509 6.55689 13.1212 4.23856 13.5287C1.92022 13.9361 0.512657 15.9732 0.843848 18.0918C1.34063 20.8623 4.56975 22.2475 6.97088 20.7808C7.21927 20.6178 7.46767 20.6178 7.71606 20.7808C10.1172 22.166 12.5183 23.5512 15.0023 24.9365C15.4163 25.1809 15.8302 25.4254 16.2442 25.6698C13.5119 28.5218 13.1807 31.6182 15.1679 35.0405Z" fill="#2683FF"/>
-			<path d="M22.4933 25.5491C23.1511 25.6323 23.3978 25.3828 23.8912 24.9671C25.8648 23.0547 28.2495 22.5558 30.7987 23.3873C33.3479 24.2188 34.9103 26.048 35.4037 28.7088C35.4859 29.2077 35.7326 29.5403 36.1438 29.7898C37.4595 30.5381 38.1996 32.2011 37.9529 33.5315C37.624 35.2776 36.4727 36.5249 34.8281 36.7743C33.9235 36.9406 33.1012 36.7743 32.3611 36.3586C32.0322 36.1091 31.7855 36.1923 31.3743 36.3586C29.0718 37.3564 26.9338 37.1901 24.7958 35.8597C24.4668 35.6934 24.2201 35.6102 23.8912 35.7765C20.9308 36.7743 17.8882 35.0282 17.1482 32.1179C16.3258 28.7088 19.0395 25.3828 22.4933 25.5491Z" fill="#2683FF"/>
-			<path d="M48 43C48 42.4286 48.4286 42 49 42C49.5714 42 50 42.4286 50 43C50 43.5 49.5 44 49 44C48.4286 44 48 43.5714 48 43Z" fill="#2683FF"/>
-			<path d="M26 5C26 4.42857 26.4444 4 27.037 4C27.5556 4 28 4.42857 28 5C28 5.5 27.5556 6 26.963 6C26.4444 5.92857 26 5.5 26 5Z" fill="#2683FF"/>
-			<path d="M6 43C6 43.5714 5.57143 44 5 44C4.5 44 4 43.5 4 43C4 42.5 4.5 42 5 42C5.57143 42 6 42.4286 6 43Z" fill="#2683FF"/>
-			<path d="M27 54C27.5714 54 28 54.6667 28 55.5556C28 56.4444 27.5714 57 27 57C26.4286 57 26 56.3333 26 55.4444C26 54.6667 26.4286 54 27 54Z" fill="#2683FF"/>
-			<path d="M5 19C4.42857 19 4 18.3333 4 17.5556C4 16.7778 4.42857 16 5 16C5.57143 16 6 16.5556 6 17.4444C5.92857 18.3333 5.57143 19 5 19Z" fill="#2683FF"/>
-			<path d="M48.9327 19C48.3635 19 47.9366 18.3333 48.0078 17.4444C48.0078 16.5556 48.4347 16 49.0039 16C49.5731 16 50 16.6667 50 17.5556C49.9288 18.3333 49.4308 19 48.9327 19Z" fill="#2683FF"/>
-		</svg>
-		<svg class="text" width="69" height="16" viewBox="0 0 69 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-			<path d="M4.5974 3.50249C4.28571 3.7413 4.12986 4.1393 4.12986 4.61692C4.12986 5.09453 4.36363 5.41293 4.75324 5.65174C5.14285 5.89055 6.07792 6.20896 7.48052 6.60697C8.88311 7.00498 10.0519 7.48259 10.8312 8.19901C11.6104 8.91542 12 9.95025 12 11.3831C12 12.7363 11.4545 13.8507 10.4416 14.7264C9.42857 15.602 8.10389 16 6.46753 16C4.05194 16 1.94805 15.1244 0 13.2935L2.02597 10.7463C3.66233 12.1791 5.14285 12.8955 6.54545 12.8955C7.16883 12.8955 7.63636 12.7363 8.02597 12.4975C8.41558 12.2587 8.57143 11.8607 8.57143 11.3831C8.57143 10.9055 8.41558 10.5871 8.02597 10.2687C7.63636 10.0299 6.93506 9.71144 5.76623 9.47264C3.97402 9.07463 2.72727 8.51741 1.94805 7.801C1.16883 7.08458 0.701294 6.04975 0.701294 4.61692C0.701294 3.18408 1.24675 1.99005 2.25974 1.19403C3.27272 0.39801 4.59739 0 6.07792 0C7.0909 0 8.1039 0.159205 9.11688 0.557215C10.1299 0.875623 10.987 1.43283 11.7662 2.06965L10.0519 4.61692C8.72727 3.58209 7.4026 3.10448 6 3.10448C5.37662 3.10448 4.90909 3.26368 4.5974 3.50249Z" fill="#2683FF"/>
-			<path d="M21.3268 3.13402V16H17.6732V3.13402H13V0H26V3.13402H21.3268Z" fill="#2683FF"/>
-			<path d="M40.5594 13.68C38.8762 15.2 36.8564 16 34.5 16C32.1436 16 30.0396 15.2 28.4406 13.68C26.7574 12.16 26 10.24 26 8C26 5.76 26.8416 3.84 28.4406 2.32C30.1238 0.800001 32.1436 0 34.5 0C36.9406 0 38.9604 0.800001 40.5594 2.32C42.2426 3.84 43 5.76 43 8C43 10.24 42.2426 12.16 40.5594 13.68ZM39.297 8C39.297 6.64 38.7921 5.44 37.8663 4.48C36.9406 3.52 35.7624 3.04 34.4158 3.04C33.0693 3.04 31.8911 3.52 30.9653 4.48C30.0396 5.44 29.5347 6.64 29.5347 8C29.5347 9.36 30.0396 10.56 30.9653 11.52C31.8911 12.48 33.0693 12.96 34.4158 12.96C35.7624 12.96 36.9406 12.48 37.8663 11.52C38.8762 10.56 39.297 9.36 39.297 8Z" fill="#2683FF"/>
-			<path d="M58.0059 5.36082C58.0059 7.91752 57.0118 9.56701 54.9408 10.3093L59 16H54.6095L51.0473 10.8866H48.5621V16H45V0H51.0473C53.5325 0 55.355 0.412371 56.3491 1.23711C57.5089 2.14433 58.0059 3.46392 58.0059 5.36082ZM53.6982 7.25773C54.1124 6.84536 54.3609 6.26804 54.3609 5.36082C54.3609 4.45361 54.1124 3.87629 53.6982 3.62887C53.2012 3.29897 52.4556 3.13402 51.2959 3.13402H48.645V7.83505H51.2959C52.4556 7.83505 53.284 7.58763 53.6982 7.25773Z" fill="#2683FF"/>
-			<path d="M60.92 3.11795V0H69V10.3385C69 12.2256 68.52 13.6205 67.56 14.6051C66.6 15.5077 65.4 16 63.88 16C62.04 16 60.36 15.2615 59 13.7846L60.76 11.241C61.72 12.3077 62.68 12.8 63.72 12.8C64.2 12.8 64.6 12.6359 65 12.2256C65.32 11.8154 65.56 11.241 65.56 10.5026V3.0359L60.92 3.11795Z" fill="#2683FF"/>
-		</svg>
-	</a>
-	<h1>404. Something Went Wrong</h1>
-	<img src="../../../static/images/team/404.svg" alt="">
+    <a href="/" class="logo">
+        <svg class="header-container__left-area__logo__img" width="54" height="60" viewBox="0 0 54 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M54 17.4399C53.9172 19.3141 53.0892 20.6993 51.5161 21.6771C51.1849 21.8401 51.1021 22.003 51.1021 22.329C51.1021 27.4625 51.1021 32.596 51.1021 37.7295C51.1021 38.0555 51.1849 38.2184 51.4333 38.3814C53.2548 39.4407 54.2484 41.3963 53.9172 43.4334C53.586 45.389 52.0129 47.0187 49.9429 47.3447C48.7837 47.5891 47.6246 47.4262 46.5482 46.7743C46.217 46.6113 45.9686 46.6113 45.7202 46.7743C41.2491 49.3003 36.7781 51.9078 32.307 54.4338C31.9758 54.5968 31.893 54.7597 31.893 55.1672C31.893 57.6117 29.9887 59.8118 27.5875 59.9747C25.0208 60.2192 22.7025 58.671 22.2057 56.145C22.1229 55.7376 22.1229 55.4116 22.1229 55.0042C22.1229 54.7597 22.0401 54.5968 21.7917 54.4338C17.2378 51.8263 12.6839 49.3003 8.13005 46.6928C7.88166 46.5298 7.71606 46.5298 7.46767 46.6928C4.48695 48.4854 0.678253 46.7743 0.0986687 43.5149C-0.31532 41.4778 0.595455 39.5222 2.41701 38.3814C2.7482 38.2184 2.83099 38.0555 2.83099 37.648C2.83099 32.5145 2.83099 27.381 2.83099 22.2475C2.83099 21.9216 2.7482 21.7586 2.4998 21.5956C0.595455 20.5363 -0.31532 18.6622 0.0986687 16.5436C0.42986 14.425 2.08581 12.8768 4.23856 12.6323C5.39772 12.4694 6.4741 12.7138 7.46767 13.2842C7.71606 13.4472 7.88166 13.4472 8.13005 13.2842C12.6839 10.6767 17.155 8.15071 21.7089 5.54321C21.9573 5.38024 22.1229 5.21727 22.1229 4.89133C22.1229 2.03938 24.3584 -0.0792115 27.2563 0.00227286C29.4919 0.0837572 31.5618 1.87641 31.893 4.07649C31.893 4.23946 31.9758 4.40243 31.9758 4.64688C31.9758 5.21727 32.2242 5.54321 32.6382 5.78766C37.0265 8.23219 41.4147 10.7582 45.803 13.2842C46.1342 13.4472 46.2998 13.4472 46.631 13.2842C49.6117 11.573 53.2548 13.2027 53.9172 16.5436C54 16.8695 54 17.1955 54 17.4399ZM15.1679 35.0405C15.0851 35.0405 15.0851 35.122 15.0851 35.122C12.6011 36.5073 10.1172 37.8925 7.63326 39.3592C7.46767 39.4407 7.21927 39.4407 7.05368 39.3592C6.3913 38.9518 5.72892 38.7073 4.90094 38.7073C2.33421 38.6258 0.843848 40.663 0.761051 42.4556C0.761051 44.4927 2.33421 46.6113 4.90094 46.6113C7.13648 46.6113 8.87523 44.8187 8.87523 42.6186C8.87523 42.2112 8.95803 41.9667 9.37202 41.8037C12.0215 40.337 14.5883 38.8703 17.2378 37.3221C17.4862 37.1591 17.7346 37.1591 17.983 37.2406C19.6389 37.974 21.2949 38.1369 23.0336 37.648C23.1992 37.5665 23.4476 37.648 23.6132 37.7295C24.11 37.974 24.6068 38.2184 25.1036 38.3814C25.4348 38.4629 25.5176 38.6258 25.5176 38.9518C25.5176 43.026 25.5176 47.0187 25.5176 51.0929C25.5176 51.3374 25.4348 51.5004 25.1864 51.6633C23.7788 52.3152 22.7852 54.0264 23.0336 55.819C23.3648 57.9376 25.5176 59.4858 27.6703 59.0784C29.5747 58.7525 30.7338 57.4487 31.065 55.5746C31.2306 54.2708 30.5682 52.5597 28.9123 51.6633C28.6639 51.5819 28.5811 51.4189 28.5811 51.1744C28.5811 47.2632 28.5811 43.3519 28.5811 39.4407C28.5811 39.1147 28.7467 39.0333 29.0779 38.9518C29.9059 38.7888 30.7338 38.6258 31.479 38.4629C31.8102 38.3814 32.1414 38.3814 32.4726 38.4629C34.2113 39.1962 35.9501 39.1147 37.606 38.1369C37.8544 37.974 38.02 37.974 38.2684 38.1369C40.4212 39.3592 42.5739 40.5815 44.7267 41.8037C45.0578 41.9667 45.2234 42.2112 45.2234 42.6186C44.975 44.9001 47.1278 46.7743 49.5289 46.5298C51.9301 46.2854 53.586 44.0038 53.0064 41.7222C52.344 38.9518 49.3633 37.7295 46.8794 39.1962C46.631 39.3592 46.4654 39.3592 46.1342 39.1962C44.0643 37.974 41.9943 36.8332 39.9244 35.6924C39.5932 35.5294 39.5932 35.3665 39.676 35.0405C40.3384 33.0034 39.8416 31.1293 38.3512 29.5811C38.02 29.2551 36.6953 27.1366 36.4469 26.7291C36.2813 26.4032 36.3641 26.2402 36.6953 26.0773C39.8416 24.2846 42.9879 22.5734 46.0514 20.7808C46.2998 20.6178 46.4654 20.6178 46.7138 20.7808C47.6246 21.3512 48.6181 21.5141 49.6117 21.3512C51.5989 21.0252 53.0892 19.2326 52.9236 17.114C52.758 14.8324 50.4397 13.1212 48.1214 13.6102C46.1342 14.0176 44.8094 15.5658 44.8922 17.6029C44.8922 17.9288 44.8094 18.1733 44.4783 18.3362C41.3319 20.1289 38.1028 21.9216 34.9565 23.7142C34.7081 23.8772 34.5425 23.8772 34.2941 23.6327C32.8038 22.2475 30.9822 21.4326 28.9951 21.1882C28.3327 21.1067 28.3327 21.1067 28.3327 20.3734C28.3327 16.7066 28.3327 13.0398 28.3327 9.37297C28.3327 8.88406 28.4155 8.55813 28.9123 8.31367C30.651 7.33586 31.3134 5.21727 30.5682 3.34313C29.7403 1.55048 27.6703 0.491179 25.766 1.14305C24.0272 1.63196 23.0336 2.93571 22.868 4.64688C22.7025 6.03211 23.3648 7.58031 25.0208 8.39516C25.2692 8.55813 25.4348 8.63961 25.4348 8.96555C25.4348 13.0398 25.4348 17.0325 25.4348 21.1067C25.4348 21.4326 25.2692 21.5141 25.0208 21.6771C24.1928 22.0845 23.3648 22.4105 22.7025 22.9809C21.9573 23.6327 21.2121 23.9587 20.1357 23.9587C20.0529 23.9587 19.9701 23.9587 19.8873 23.9587C19.6389 23.9587 19.3077 23.9587 19.0594 23.7957C15.8302 22.003 12.6839 20.2104 9.45481 18.4177C8.95803 18.1733 8.79243 17.8473 8.87523 17.3584C8.87523 17.114 8.87523 16.951 8.79243 16.7066C8.46124 14.7509 6.55689 13.1212 4.23856 13.5287C1.92022 13.9361 0.512657 15.9732 0.843848 18.0918C1.34063 20.8623 4.56975 22.2475 6.97088 20.7808C7.21927 20.6178 7.46767 20.6178 7.71606 20.7808C10.1172 22.166 12.5183 23.5512 15.0023 24.9365C15.4163 25.1809 15.8302 25.4254 16.2442 25.6698C13.5119 28.5218 13.1807 31.6182 15.1679 35.0405Z" fill="#2683FF"/>
+            <path d="M22.4933 25.5491C23.1511 25.6323 23.3978 25.3828 23.8912 24.9671C25.8648 23.0547 28.2495 22.5558 30.7987 23.3873C33.3479 24.2188 34.9103 26.048 35.4037 28.7088C35.4859 29.2077 35.7326 29.5403 36.1438 29.7898C37.4595 30.5381 38.1996 32.2011 37.9529 33.5315C37.624 35.2776 36.4727 36.5249 34.8281 36.7743C33.9235 36.9406 33.1012 36.7743 32.3611 36.3586C32.0322 36.1091 31.7855 36.1923 31.3743 36.3586C29.0718 37.3564 26.9338 37.1901 24.7958 35.8597C24.4668 35.6934 24.2201 35.6102 23.8912 35.7765C20.9308 36.7743 17.8882 35.0282 17.1482 32.1179C16.3258 28.7088 19.0395 25.3828 22.4933 25.5491Z" fill="#2683FF"/>
+            <path d="M48 43C48 42.4286 48.4286 42 49 42C49.5714 42 50 42.4286 50 43C50 43.5 49.5 44 49 44C48.4286 44 48 43.5714 48 43Z" fill="#2683FF"/>
+            <path d="M26 5C26 4.42857 26.4444 4 27.037 4C27.5556 4 28 4.42857 28 5C28 5.5 27.5556 6 26.963 6C26.4444 5.92857 26 5.5 26 5Z" fill="#2683FF"/>
+            <path d="M6 43C6 43.5714 5.57143 44 5 44C4.5 44 4 43.5 4 43C4 42.5 4.5 42 5 42C5.57143 42 6 42.4286 6 43Z" fill="#2683FF"/>
+            <path d="M27 54C27.5714 54 28 54.6667 28 55.5556C28 56.4444 27.5714 57 27 57C26.4286 57 26 56.3333 26 55.4444C26 54.6667 26.4286 54 27 54Z" fill="#2683FF"/>
+            <path d="M5 19C4.42857 19 4 18.3333 4 17.5556C4 16.7778 4.42857 16 5 16C5.57143 16 6 16.5556 6 17.4444C5.92857 18.3333 5.57143 19 5 19Z" fill="#2683FF"/>
+            <path d="M48.9327 19C48.3635 19 47.9366 18.3333 48.0078 17.4444C48.0078 16.5556 48.4347 16 49.0039 16C49.5731 16 50 16.6667 50 17.5556C49.9288 18.3333 49.4308 19 48.9327 19Z" fill="#2683FF"/>
+        </svg>
+        <svg class="text" width="69" height="16" viewBox="0 0 69 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M4.5974 3.50249C4.28571 3.7413 4.12986 4.1393 4.12986 4.61692C4.12986 5.09453 4.36363 5.41293 4.75324 5.65174C5.14285 5.89055 6.07792 6.20896 7.48052 6.60697C8.88311 7.00498 10.0519 7.48259 10.8312 8.19901C11.6104 8.91542 12 9.95025 12 11.3831C12 12.7363 11.4545 13.8507 10.4416 14.7264C9.42857 15.602 8.10389 16 6.46753 16C4.05194 16 1.94805 15.1244 0 13.2935L2.02597 10.7463C3.66233 12.1791 5.14285 12.8955 6.54545 12.8955C7.16883 12.8955 7.63636 12.7363 8.02597 12.4975C8.41558 12.2587 8.57143 11.8607 8.57143 11.3831C8.57143 10.9055 8.41558 10.5871 8.02597 10.2687C7.63636 10.0299 6.93506 9.71144 5.76623 9.47264C3.97402 9.07463 2.72727 8.51741 1.94805 7.801C1.16883 7.08458 0.701294 6.04975 0.701294 4.61692C0.701294 3.18408 1.24675 1.99005 2.25974 1.19403C3.27272 0.39801 4.59739 0 6.07792 0C7.0909 0 8.1039 0.159205 9.11688 0.557215C10.1299 0.875623 10.987 1.43283 11.7662 2.06965L10.0519 4.61692C8.72727 3.58209 7.4026 3.10448 6 3.10448C5.37662 3.10448 4.90909 3.26368 4.5974 3.50249Z" fill="#2683FF"/>
+            <path d="M21.3268 3.13402V16H17.6732V3.13402H13V0H26V3.13402H21.3268Z" fill="#2683FF"/>
+            <path d="M40.5594 13.68C38.8762 15.2 36.8564 16 34.5 16C32.1436 16 30.0396 15.2 28.4406 13.68C26.7574 12.16 26 10.24 26 8C26 5.76 26.8416 3.84 28.4406 2.32C30.1238 0.800001 32.1436 0 34.5 0C36.9406 0 38.9604 0.800001 40.5594 2.32C42.2426 3.84 43 5.76 43 8C43 10.24 42.2426 12.16 40.5594 13.68ZM39.297 8C39.297 6.64 38.7921 5.44 37.8663 4.48C36.9406 3.52 35.7624 3.04 34.4158 3.04C33.0693 3.04 31.8911 3.52 30.9653 4.48C30.0396 5.44 29.5347 6.64 29.5347 8C29.5347 9.36 30.0396 10.56 30.9653 11.52C31.8911 12.48 33.0693 12.96 34.4158 12.96C35.7624 12.96 36.9406 12.48 37.8663 11.52C38.8762 10.56 39.297 9.36 39.297 8Z" fill="#2683FF"/>
+            <path d="M58.0059 5.36082C58.0059 7.91752 57.0118 9.56701 54.9408 10.3093L59 16H54.6095L51.0473 10.8866H48.5621V16H45V0H51.0473C53.5325 0 55.355 0.412371 56.3491 1.23711C57.5089 2.14433 58.0059 3.46392 58.0059 5.36082ZM53.6982 7.25773C54.1124 6.84536 54.3609 6.26804 54.3609 5.36082C54.3609 4.45361 54.1124 3.87629 53.6982 3.62887C53.2012 3.29897 52.4556 3.13402 51.2959 3.13402H48.645V7.83505H51.2959C52.4556 7.83505 53.284 7.58763 53.6982 7.25773Z" fill="#2683FF"/>
+            <path d="M60.92 3.11795V0H69V10.3385C69 12.2256 68.52 13.6205 67.56 14.6051C66.6 15.5077 65.4 16 63.88 16C62.04 16 60.36 15.2615 59 13.7846L60.76 11.241C61.72 12.3077 62.68 12.8 63.72 12.8C64.2 12.8 64.6 12.6359 65 12.2256C65.32 11.8154 65.56 11.241 65.56 10.5026V3.0359L60.92 3.11795Z" fill="#2683FF"/>
+        </svg>
+    </a>
+    <h1>404. Something Went Wrong</h1>
+    <img src="../../../static/images/team/404.svg" alt="">
 </div>
diff --git a/web/satellite/src/components/errors/page50X.html b/web/satellite/src/components/errors/page50X.html
index 3eb366f61..1c646e9dc 100644
--- a/web/satellite/src/components/errors/page50X.html
+++ b/web/satellite/src/components/errors/page50X.html
@@ -2,25 +2,25 @@
 <!--See LICENSE for copying information.-->
 
 <div class="error-container">
-	<a href="/" class="logo">
-		<svg class="header-container__left-area__logo__img" width="54" height="60" viewBox="0 0 54 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-			<path d="M54 17.4399C53.9172 19.3141 53.0892 20.6993 51.5161 21.6771C51.1849 21.8401 51.1021 22.003 51.1021 22.329C51.1021 27.4625 51.1021 32.596 51.1021 37.7295C51.1021 38.0555 51.1849 38.2184 51.4333 38.3814C53.2548 39.4407 54.2484 41.3963 53.9172 43.4334C53.586 45.389 52.0129 47.0187 49.9429 47.3447C48.7837 47.5891 47.6246 47.4262 46.5482 46.7743C46.217 46.6113 45.9686 46.6113 45.7202 46.7743C41.2491 49.3003 36.7781 51.9078 32.307 54.4338C31.9758 54.5968 31.893 54.7597 31.893 55.1672C31.893 57.6117 29.9887 59.8118 27.5875 59.9747C25.0208 60.2192 22.7025 58.671 22.2057 56.145C22.1229 55.7376 22.1229 55.4116 22.1229 55.0042C22.1229 54.7597 22.0401 54.5968 21.7917 54.4338C17.2378 51.8263 12.6839 49.3003 8.13005 46.6928C7.88166 46.5298 7.71606 46.5298 7.46767 46.6928C4.48695 48.4854 0.678253 46.7743 0.0986687 43.5149C-0.31532 41.4778 0.595455 39.5222 2.41701 38.3814C2.7482 38.2184 2.83099 38.0555 2.83099 37.648C2.83099 32.5145 2.83099 27.381 2.83099 22.2475C2.83099 21.9216 2.7482 21.7586 2.4998 21.5956C0.595455 20.5363 -0.31532 18.6622 0.0986687 16.5436C0.42986 14.425 2.08581 12.8768 4.23856 12.6323C5.39772 12.4694 6.4741 12.7138 7.46767 13.2842C7.71606 13.4472 7.88166 13.4472 8.13005 13.2842C12.6839 10.6767 17.155 8.15071 21.7089 5.54321C21.9573 5.38024 22.1229 5.21727 22.1229 4.89133C22.1229 2.03938 24.3584 -0.0792115 27.2563 0.00227286C29.4919 0.0837572 31.5618 1.87641 31.893 4.07649C31.893 4.23946 31.9758 4.40243 31.9758 4.64688C31.9758 5.21727 32.2242 5.54321 32.6382 5.78766C37.0265 8.23219 41.4147 10.7582 45.803 13.2842C46.1342 13.4472 46.2998 13.4472 46.631 13.2842C49.6117 11.573 53.2548 13.2027 53.9172 16.5436C54 16.8695 54 17.1955 54 17.4399ZM15.1679 35.0405C15.0851 35.0405 15.0851 35.122 15.0851 35.122C12.6011 36.5073 10.1172 37.8925 7.63326 39.3592C7.46767 39.4407 7.21927 39.4407 7.05368 39.3592C6.3913 38.9518 5.72892 38.7073 4.90094 38.7073C2.33421 38.6258 0.843848 40.663 0.761051 42.4556C0.761051 44.4927 2.33421 46.6113 4.90094 46.6113C7.13648 46.6113 8.87523 44.8187 8.87523 42.6186C8.87523 42.2112 8.95803 41.9667 9.37202 41.8037C12.0215 40.337 14.5883 38.8703 17.2378 37.3221C17.4862 37.1591 17.7346 37.1591 17.983 37.2406C19.6389 37.974 21.2949 38.1369 23.0336 37.648C23.1992 37.5665 23.4476 37.648 23.6132 37.7295C24.11 37.974 24.6068 38.2184 25.1036 38.3814C25.4348 38.4629 25.5176 38.6258 25.5176 38.9518C25.5176 43.026 25.5176 47.0187 25.5176 51.0929C25.5176 51.3374 25.4348 51.5004 25.1864 51.6633C23.7788 52.3152 22.7852 54.0264 23.0336 55.819C23.3648 57.9376 25.5176 59.4858 27.6703 59.0784C29.5747 58.7525 30.7338 57.4487 31.065 55.5746C31.2306 54.2708 30.5682 52.5597 28.9123 51.6633C28.6639 51.5819 28.5811 51.4189 28.5811 51.1744C28.5811 47.2632 28.5811 43.3519 28.5811 39.4407C28.5811 39.1147 28.7467 39.0333 29.0779 38.9518C29.9059 38.7888 30.7338 38.6258 31.479 38.4629C31.8102 38.3814 32.1414 38.3814 32.4726 38.4629C34.2113 39.1962 35.9501 39.1147 37.606 38.1369C37.8544 37.974 38.02 37.974 38.2684 38.1369C40.4212 39.3592 42.5739 40.5815 44.7267 41.8037C45.0578 41.9667 45.2234 42.2112 45.2234 42.6186C44.975 44.9001 47.1278 46.7743 49.5289 46.5298C51.9301 46.2854 53.586 44.0038 53.0064 41.7222C52.344 38.9518 49.3633 37.7295 46.8794 39.1962C46.631 39.3592 46.4654 39.3592 46.1342 39.1962C44.0643 37.974 41.9943 36.8332 39.9244 35.6924C39.5932 35.5294 39.5932 35.3665 39.676 35.0405C40.3384 33.0034 39.8416 31.1293 38.3512 29.5811C38.02 29.2551 36.6953 27.1366 36.4469 26.7291C36.2813 26.4032 36.3641 26.2402 36.6953 26.0773C39.8416 24.2846 42.9879 22.5734 46.0514 20.7808C46.2998 20.6178 46.4654 20.6178 46.7138 20.7808C47.6246 21.3512 48.6181 21.5141 49.6117 21.3512C51.5989 21.0252 53.0892 19.2326 52.9236 17.114C52.758 14.8324 50.4397 13.1212 48.1214 13.6102C46.1342 14.0176 44.8094 15.5658 44.8922 17.6029C44.8922 17.9288 44.8094 18.1733 44.4783 18.3362C41.3319 20.1289 38.1028 21.9216 34.9565 23.7142C34.7081 23.8772 34.5425 23.8772 34.2941 23.6327C32.8038 22.2475 30.9822 21.4326 28.9951 21.1882C28.3327 21.1067 28.3327 21.1067 28.3327 20.3734C28.3327 16.7066 28.3327 13.0398 28.3327 9.37297C28.3327 8.88406 28.4155 8.55813 28.9123 8.31367C30.651 7.33586 31.3134 5.21727 30.5682 3.34313C29.7403 1.55048 27.6703 0.491179 25.766 1.14305C24.0272 1.63196 23.0336 2.93571 22.868 4.64688C22.7025 6.03211 23.3648 7.58031 25.0208 8.39516C25.2692 8.55813 25.4348 8.63961 25.4348 8.96555C25.4348 13.0398 25.4348 17.0325 25.4348 21.1067C25.4348 21.4326 25.2692 21.5141 25.0208 21.6771C24.1928 22.0845 23.3648 22.4105 22.7025 22.9809C21.9573 23.6327 21.2121 23.9587 20.1357 23.9587C20.0529 23.9587 19.9701 23.9587 19.8873 23.9587C19.6389 23.9587 19.3077 23.9587 19.0594 23.7957C15.8302 22.003 12.6839 20.2104 9.45481 18.4177C8.95803 18.1733 8.79243 17.8473 8.87523 17.3584C8.87523 17.114 8.87523 16.951 8.79243 16.7066C8.46124 14.7509 6.55689 13.1212 4.23856 13.5287C1.92022 13.9361 0.512657 15.9732 0.843848 18.0918C1.34063 20.8623 4.56975 22.2475 6.97088 20.7808C7.21927 20.6178 7.46767 20.6178 7.71606 20.7808C10.1172 22.166 12.5183 23.5512 15.0023 24.9365C15.4163 25.1809 15.8302 25.4254 16.2442 25.6698C13.5119 28.5218 13.1807 31.6182 15.1679 35.0405Z" fill="#2683FF"/>
-			<path d="M22.4933 25.5491C23.1511 25.6323 23.3978 25.3828 23.8912 24.9671C25.8648 23.0547 28.2495 22.5558 30.7987 23.3873C33.3479 24.2188 34.9103 26.048 35.4037 28.7088C35.4859 29.2077 35.7326 29.5403 36.1438 29.7898C37.4595 30.5381 38.1996 32.2011 37.9529 33.5315C37.624 35.2776 36.4727 36.5249 34.8281 36.7743C33.9235 36.9406 33.1012 36.7743 32.3611 36.3586C32.0322 36.1091 31.7855 36.1923 31.3743 36.3586C29.0718 37.3564 26.9338 37.1901 24.7958 35.8597C24.4668 35.6934 24.2201 35.6102 23.8912 35.7765C20.9308 36.7743 17.8882 35.0282 17.1482 32.1179C16.3258 28.7088 19.0395 25.3828 22.4933 25.5491Z" fill="#2683FF"/>
-			<path d="M48 43C48 42.4286 48.4286 42 49 42C49.5714 42 50 42.4286 50 43C50 43.5 49.5 44 49 44C48.4286 44 48 43.5714 48 43Z" fill="#2683FF"/>
-			<path d="M26 5C26 4.42857 26.4444 4 27.037 4C27.5556 4 28 4.42857 28 5C28 5.5 27.5556 6 26.963 6C26.4444 5.92857 26 5.5 26 5Z" fill="#2683FF"/>
-			<path d="M6 43C6 43.5714 5.57143 44 5 44C4.5 44 4 43.5 4 43C4 42.5 4.5 42 5 42C5.57143 42 6 42.4286 6 43Z" fill="#2683FF"/>
-			<path d="M27 54C27.5714 54 28 54.6667 28 55.5556C28 56.4444 27.5714 57 27 57C26.4286 57 26 56.3333 26 55.4444C26 54.6667 26.4286 54 27 54Z" fill="#2683FF"/>
-			<path d="M5 19C4.42857 19 4 18.3333 4 17.5556C4 16.7778 4.42857 16 5 16C5.57143 16 6 16.5556 6 17.4444C5.92857 18.3333 5.57143 19 5 19Z" fill="#2683FF"/>
-			<path d="M48.9327 19C48.3635 19 47.9366 18.3333 48.0078 17.4444C48.0078 16.5556 48.4347 16 49.0039 16C49.5731 16 50 16.6667 50 17.5556C49.9288 18.3333 49.4308 19 48.9327 19Z" fill="#2683FF"/>
-		</svg>
-		<svg class="text" width="69" height="16" viewBox="0 0 69 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-			<path d="M4.5974 3.50249C4.28571 3.7413 4.12986 4.1393 4.12986 4.61692C4.12986 5.09453 4.36363 5.41293 4.75324 5.65174C5.14285 5.89055 6.07792 6.20896 7.48052 6.60697C8.88311 7.00498 10.0519 7.48259 10.8312 8.19901C11.6104 8.91542 12 9.95025 12 11.3831C12 12.7363 11.4545 13.8507 10.4416 14.7264C9.42857 15.602 8.10389 16 6.46753 16C4.05194 16 1.94805 15.1244 0 13.2935L2.02597 10.7463C3.66233 12.1791 5.14285 12.8955 6.54545 12.8955C7.16883 12.8955 7.63636 12.7363 8.02597 12.4975C8.41558 12.2587 8.57143 11.8607 8.57143 11.3831C8.57143 10.9055 8.41558 10.5871 8.02597 10.2687C7.63636 10.0299 6.93506 9.71144 5.76623 9.47264C3.97402 9.07463 2.72727 8.51741 1.94805 7.801C1.16883 7.08458 0.701294 6.04975 0.701294 4.61692C0.701294 3.18408 1.24675 1.99005 2.25974 1.19403C3.27272 0.39801 4.59739 0 6.07792 0C7.0909 0 8.1039 0.159205 9.11688 0.557215C10.1299 0.875623 10.987 1.43283 11.7662 2.06965L10.0519 4.61692C8.72727 3.58209 7.4026 3.10448 6 3.10448C5.37662 3.10448 4.90909 3.26368 4.5974 3.50249Z" fill="#2683FF"/>
-			<path d="M21.3268 3.13402V16H17.6732V3.13402H13V0H26V3.13402H21.3268Z" fill="#2683FF"/>
-			<path d="M40.5594 13.68C38.8762 15.2 36.8564 16 34.5 16C32.1436 16 30.0396 15.2 28.4406 13.68C26.7574 12.16 26 10.24 26 8C26 5.76 26.8416 3.84 28.4406 2.32C30.1238 0.800001 32.1436 0 34.5 0C36.9406 0 38.9604 0.800001 40.5594 2.32C42.2426 3.84 43 5.76 43 8C43 10.24 42.2426 12.16 40.5594 13.68ZM39.297 8C39.297 6.64 38.7921 5.44 37.8663 4.48C36.9406 3.52 35.7624 3.04 34.4158 3.04C33.0693 3.04 31.8911 3.52 30.9653 4.48C30.0396 5.44 29.5347 6.64 29.5347 8C29.5347 9.36 30.0396 10.56 30.9653 11.52C31.8911 12.48 33.0693 12.96 34.4158 12.96C35.7624 12.96 36.9406 12.48 37.8663 11.52C38.8762 10.56 39.297 9.36 39.297 8Z" fill="#2683FF"/>
-			<path d="M58.0059 5.36082C58.0059 7.91752 57.0118 9.56701 54.9408 10.3093L59 16H54.6095L51.0473 10.8866H48.5621V16H45V0H51.0473C53.5325 0 55.355 0.412371 56.3491 1.23711C57.5089 2.14433 58.0059 3.46392 58.0059 5.36082ZM53.6982 7.25773C54.1124 6.84536 54.3609 6.26804 54.3609 5.36082C54.3609 4.45361 54.1124 3.87629 53.6982 3.62887C53.2012 3.29897 52.4556 3.13402 51.2959 3.13402H48.645V7.83505H51.2959C52.4556 7.83505 53.284 7.58763 53.6982 7.25773Z" fill="#2683FF"/>
-			<path d="M60.92 3.11795V0H69V10.3385C69 12.2256 68.52 13.6205 67.56 14.6051C66.6 15.5077 65.4 16 63.88 16C62.04 16 60.36 15.2615 59 13.7846L60.76 11.241C61.72 12.3077 62.68 12.8 63.72 12.8C64.2 12.8 64.6 12.6359 65 12.2256C65.32 11.8154 65.56 11.241 65.56 10.5026V3.0359L60.92 3.11795Z" fill="#2683FF"/>
-		</svg>
-	</a>
-	<h1>503 Unknown Error</h1>
-	<img src="../../../static/images/team/50X.svg" alt="">
+    <a href="/" class="logo">
+        <svg class="header-container__left-area__logo__img" width="54" height="60" viewBox="0 0 54 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M54 17.4399C53.9172 19.3141 53.0892 20.6993 51.5161 21.6771C51.1849 21.8401 51.1021 22.003 51.1021 22.329C51.1021 27.4625 51.1021 32.596 51.1021 37.7295C51.1021 38.0555 51.1849 38.2184 51.4333 38.3814C53.2548 39.4407 54.2484 41.3963 53.9172 43.4334C53.586 45.389 52.0129 47.0187 49.9429 47.3447C48.7837 47.5891 47.6246 47.4262 46.5482 46.7743C46.217 46.6113 45.9686 46.6113 45.7202 46.7743C41.2491 49.3003 36.7781 51.9078 32.307 54.4338C31.9758 54.5968 31.893 54.7597 31.893 55.1672C31.893 57.6117 29.9887 59.8118 27.5875 59.9747C25.0208 60.2192 22.7025 58.671 22.2057 56.145C22.1229 55.7376 22.1229 55.4116 22.1229 55.0042C22.1229 54.7597 22.0401 54.5968 21.7917 54.4338C17.2378 51.8263 12.6839 49.3003 8.13005 46.6928C7.88166 46.5298 7.71606 46.5298 7.46767 46.6928C4.48695 48.4854 0.678253 46.7743 0.0986687 43.5149C-0.31532 41.4778 0.595455 39.5222 2.41701 38.3814C2.7482 38.2184 2.83099 38.0555 2.83099 37.648C2.83099 32.5145 2.83099 27.381 2.83099 22.2475C2.83099 21.9216 2.7482 21.7586 2.4998 21.5956C0.595455 20.5363 -0.31532 18.6622 0.0986687 16.5436C0.42986 14.425 2.08581 12.8768 4.23856 12.6323C5.39772 12.4694 6.4741 12.7138 7.46767 13.2842C7.71606 13.4472 7.88166 13.4472 8.13005 13.2842C12.6839 10.6767 17.155 8.15071 21.7089 5.54321C21.9573 5.38024 22.1229 5.21727 22.1229 4.89133C22.1229 2.03938 24.3584 -0.0792115 27.2563 0.00227286C29.4919 0.0837572 31.5618 1.87641 31.893 4.07649C31.893 4.23946 31.9758 4.40243 31.9758 4.64688C31.9758 5.21727 32.2242 5.54321 32.6382 5.78766C37.0265 8.23219 41.4147 10.7582 45.803 13.2842C46.1342 13.4472 46.2998 13.4472 46.631 13.2842C49.6117 11.573 53.2548 13.2027 53.9172 16.5436C54 16.8695 54 17.1955 54 17.4399ZM15.1679 35.0405C15.0851 35.0405 15.0851 35.122 15.0851 35.122C12.6011 36.5073 10.1172 37.8925 7.63326 39.3592C7.46767 39.4407 7.21927 39.4407 7.05368 39.3592C6.3913 38.9518 5.72892 38.7073 4.90094 38.7073C2.33421 38.6258 0.843848 40.663 0.761051 42.4556C0.761051 44.4927 2.33421 46.6113 4.90094 46.6113C7.13648 46.6113 8.87523 44.8187 8.87523 42.6186C8.87523 42.2112 8.95803 41.9667 9.37202 41.8037C12.0215 40.337 14.5883 38.8703 17.2378 37.3221C17.4862 37.1591 17.7346 37.1591 17.983 37.2406C19.6389 37.974 21.2949 38.1369 23.0336 37.648C23.1992 37.5665 23.4476 37.648 23.6132 37.7295C24.11 37.974 24.6068 38.2184 25.1036 38.3814C25.4348 38.4629 25.5176 38.6258 25.5176 38.9518C25.5176 43.026 25.5176 47.0187 25.5176 51.0929C25.5176 51.3374 25.4348 51.5004 25.1864 51.6633C23.7788 52.3152 22.7852 54.0264 23.0336 55.819C23.3648 57.9376 25.5176 59.4858 27.6703 59.0784C29.5747 58.7525 30.7338 57.4487 31.065 55.5746C31.2306 54.2708 30.5682 52.5597 28.9123 51.6633C28.6639 51.5819 28.5811 51.4189 28.5811 51.1744C28.5811 47.2632 28.5811 43.3519 28.5811 39.4407C28.5811 39.1147 28.7467 39.0333 29.0779 38.9518C29.9059 38.7888 30.7338 38.6258 31.479 38.4629C31.8102 38.3814 32.1414 38.3814 32.4726 38.4629C34.2113 39.1962 35.9501 39.1147 37.606 38.1369C37.8544 37.974 38.02 37.974 38.2684 38.1369C40.4212 39.3592 42.5739 40.5815 44.7267 41.8037C45.0578 41.9667 45.2234 42.2112 45.2234 42.6186C44.975 44.9001 47.1278 46.7743 49.5289 46.5298C51.9301 46.2854 53.586 44.0038 53.0064 41.7222C52.344 38.9518 49.3633 37.7295 46.8794 39.1962C46.631 39.3592 46.4654 39.3592 46.1342 39.1962C44.0643 37.974 41.9943 36.8332 39.9244 35.6924C39.5932 35.5294 39.5932 35.3665 39.676 35.0405C40.3384 33.0034 39.8416 31.1293 38.3512 29.5811C38.02 29.2551 36.6953 27.1366 36.4469 26.7291C36.2813 26.4032 36.3641 26.2402 36.6953 26.0773C39.8416 24.2846 42.9879 22.5734 46.0514 20.7808C46.2998 20.6178 46.4654 20.6178 46.7138 20.7808C47.6246 21.3512 48.6181 21.5141 49.6117 21.3512C51.5989 21.0252 53.0892 19.2326 52.9236 17.114C52.758 14.8324 50.4397 13.1212 48.1214 13.6102C46.1342 14.0176 44.8094 15.5658 44.8922 17.6029C44.8922 17.9288 44.8094 18.1733 44.4783 18.3362C41.3319 20.1289 38.1028 21.9216 34.9565 23.7142C34.7081 23.8772 34.5425 23.8772 34.2941 23.6327C32.8038 22.2475 30.9822 21.4326 28.9951 21.1882C28.3327 21.1067 28.3327 21.1067 28.3327 20.3734C28.3327 16.7066 28.3327 13.0398 28.3327 9.37297C28.3327 8.88406 28.4155 8.55813 28.9123 8.31367C30.651 7.33586 31.3134 5.21727 30.5682 3.34313C29.7403 1.55048 27.6703 0.491179 25.766 1.14305C24.0272 1.63196 23.0336 2.93571 22.868 4.64688C22.7025 6.03211 23.3648 7.58031 25.0208 8.39516C25.2692 8.55813 25.4348 8.63961 25.4348 8.96555C25.4348 13.0398 25.4348 17.0325 25.4348 21.1067C25.4348 21.4326 25.2692 21.5141 25.0208 21.6771C24.1928 22.0845 23.3648 22.4105 22.7025 22.9809C21.9573 23.6327 21.2121 23.9587 20.1357 23.9587C20.0529 23.9587 19.9701 23.9587 19.8873 23.9587C19.6389 23.9587 19.3077 23.9587 19.0594 23.7957C15.8302 22.003 12.6839 20.2104 9.45481 18.4177C8.95803 18.1733 8.79243 17.8473 8.87523 17.3584C8.87523 17.114 8.87523 16.951 8.79243 16.7066C8.46124 14.7509 6.55689 13.1212 4.23856 13.5287C1.92022 13.9361 0.512657 15.9732 0.843848 18.0918C1.34063 20.8623 4.56975 22.2475 6.97088 20.7808C7.21927 20.6178 7.46767 20.6178 7.71606 20.7808C10.1172 22.166 12.5183 23.5512 15.0023 24.9365C15.4163 25.1809 15.8302 25.4254 16.2442 25.6698C13.5119 28.5218 13.1807 31.6182 15.1679 35.0405Z" fill="#2683FF"/>
+            <path d="M22.4933 25.5491C23.1511 25.6323 23.3978 25.3828 23.8912 24.9671C25.8648 23.0547 28.2495 22.5558 30.7987 23.3873C33.3479 24.2188 34.9103 26.048 35.4037 28.7088C35.4859 29.2077 35.7326 29.5403 36.1438 29.7898C37.4595 30.5381 38.1996 32.2011 37.9529 33.5315C37.624 35.2776 36.4727 36.5249 34.8281 36.7743C33.9235 36.9406 33.1012 36.7743 32.3611 36.3586C32.0322 36.1091 31.7855 36.1923 31.3743 36.3586C29.0718 37.3564 26.9338 37.1901 24.7958 35.8597C24.4668 35.6934 24.2201 35.6102 23.8912 35.7765C20.9308 36.7743 17.8882 35.0282 17.1482 32.1179C16.3258 28.7088 19.0395 25.3828 22.4933 25.5491Z" fill="#2683FF"/>
+            <path d="M48 43C48 42.4286 48.4286 42 49 42C49.5714 42 50 42.4286 50 43C50 43.5 49.5 44 49 44C48.4286 44 48 43.5714 48 43Z" fill="#2683FF"/>
+            <path d="M26 5C26 4.42857 26.4444 4 27.037 4C27.5556 4 28 4.42857 28 5C28 5.5 27.5556 6 26.963 6C26.4444 5.92857 26 5.5 26 5Z" fill="#2683FF"/>
+            <path d="M6 43C6 43.5714 5.57143 44 5 44C4.5 44 4 43.5 4 43C4 42.5 4.5 42 5 42C5.57143 42 6 42.4286 6 43Z" fill="#2683FF"/>
+            <path d="M27 54C27.5714 54 28 54.6667 28 55.5556C28 56.4444 27.5714 57 27 57C26.4286 57 26 56.3333 26 55.4444C26 54.6667 26.4286 54 27 54Z" fill="#2683FF"/>
+            <path d="M5 19C4.42857 19 4 18.3333 4 17.5556C4 16.7778 4.42857 16 5 16C5.57143 16 6 16.5556 6 17.4444C5.92857 18.3333 5.57143 19 5 19Z" fill="#2683FF"/>
+            <path d="M48.9327 19C48.3635 19 47.9366 18.3333 48.0078 17.4444C48.0078 16.5556 48.4347 16 49.0039 16C49.5731 16 50 16.6667 50 17.5556C49.9288 18.3333 49.4308 19 48.9327 19Z" fill="#2683FF"/>
+        </svg>
+        <svg class="text" width="69" height="16" viewBox="0 0 69 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M4.5974 3.50249C4.28571 3.7413 4.12986 4.1393 4.12986 4.61692C4.12986 5.09453 4.36363 5.41293 4.75324 5.65174C5.14285 5.89055 6.07792 6.20896 7.48052 6.60697C8.88311 7.00498 10.0519 7.48259 10.8312 8.19901C11.6104 8.91542 12 9.95025 12 11.3831C12 12.7363 11.4545 13.8507 10.4416 14.7264C9.42857 15.602 8.10389 16 6.46753 16C4.05194 16 1.94805 15.1244 0 13.2935L2.02597 10.7463C3.66233 12.1791 5.14285 12.8955 6.54545 12.8955C7.16883 12.8955 7.63636 12.7363 8.02597 12.4975C8.41558 12.2587 8.57143 11.8607 8.57143 11.3831C8.57143 10.9055 8.41558 10.5871 8.02597 10.2687C7.63636 10.0299 6.93506 9.71144 5.76623 9.47264C3.97402 9.07463 2.72727 8.51741 1.94805 7.801C1.16883 7.08458 0.701294 6.04975 0.701294 4.61692C0.701294 3.18408 1.24675 1.99005 2.25974 1.19403C3.27272 0.39801 4.59739 0 6.07792 0C7.0909 0 8.1039 0.159205 9.11688 0.557215C10.1299 0.875623 10.987 1.43283 11.7662 2.06965L10.0519 4.61692C8.72727 3.58209 7.4026 3.10448 6 3.10448C5.37662 3.10448 4.90909 3.26368 4.5974 3.50249Z" fill="#2683FF"/>
+            <path d="M21.3268 3.13402V16H17.6732V3.13402H13V0H26V3.13402H21.3268Z" fill="#2683FF"/>
+            <path d="M40.5594 13.68C38.8762 15.2 36.8564 16 34.5 16C32.1436 16 30.0396 15.2 28.4406 13.68C26.7574 12.16 26 10.24 26 8C26 5.76 26.8416 3.84 28.4406 2.32C30.1238 0.800001 32.1436 0 34.5 0C36.9406 0 38.9604 0.800001 40.5594 2.32C42.2426 3.84 43 5.76 43 8C43 10.24 42.2426 12.16 40.5594 13.68ZM39.297 8C39.297 6.64 38.7921 5.44 37.8663 4.48C36.9406 3.52 35.7624 3.04 34.4158 3.04C33.0693 3.04 31.8911 3.52 30.9653 4.48C30.0396 5.44 29.5347 6.64 29.5347 8C29.5347 9.36 30.0396 10.56 30.9653 11.52C31.8911 12.48 33.0693 12.96 34.4158 12.96C35.7624 12.96 36.9406 12.48 37.8663 11.52C38.8762 10.56 39.297 9.36 39.297 8Z" fill="#2683FF"/>
+            <path d="M58.0059 5.36082C58.0059 7.91752 57.0118 9.56701 54.9408 10.3093L59 16H54.6095L51.0473 10.8866H48.5621V16H45V0H51.0473C53.5325 0 55.355 0.412371 56.3491 1.23711C57.5089 2.14433 58.0059 3.46392 58.0059 5.36082ZM53.6982 7.25773C54.1124 6.84536 54.3609 6.26804 54.3609 5.36082C54.3609 4.45361 54.1124 3.87629 53.6982 3.62887C53.2012 3.29897 52.4556 3.13402 51.2959 3.13402H48.645V7.83505H51.2959C52.4556 7.83505 53.284 7.58763 53.6982 7.25773Z" fill="#2683FF"/>
+            <path d="M60.92 3.11795V0H69V10.3385C69 12.2256 68.52 13.6205 67.56 14.6051C66.6 15.5077 65.4 16 63.88 16C62.04 16 60.36 15.2615 59 13.7846L60.76 11.241C61.72 12.3077 62.68 12.8 63.72 12.8C64.2 12.8 64.6 12.6359 65 12.2256C65.32 11.8154 65.56 11.241 65.56 10.5026V3.0359L60.92 3.11795Z" fill="#2683FF"/>
+        </svg>
+    </a>
+    <h1>503 Unknown Error</h1>
+    <img src="../../../static/images/team/50X.svg" alt="">
 </div>
diff --git a/web/satellite/src/components/navigation/TabNavigation.vue b/web/satellite/src/components/navigation/TabNavigation.vue
index 958d80765..6ff3ca08e 100644
--- a/web/satellite/src/components/navigation/TabNavigation.vue
+++ b/web/satellite/src/components/navigation/TabNavigation.vue
@@ -2,11 +2,11 @@
 // See LICENSE for copying information.
 
 <template>
-	<div class="tab-navigation-container">
-		<router-link :to="navLink.path" class="tab-navigation-container__item" v-for="navLink in navigation" :key="navLink.name">
-			<p>{{navLink.name}}</p>
-		</router-link>
-	</div>
+    <div class="tab-navigation-container">
+        <router-link :to="navLink.path" class="tab-navigation-container__item" v-for="navLink in navigation" :key="navLink.name">
+            <p>{{navLink.name}}</p>
+        </router-link>
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/navigation/navigationArea.html b/web/satellite/src/components/navigation/navigationArea.html
index ac8508e7d..97b9edd64 100644
--- a/web/satellite/src/components/navigation/navigationArea.html
+++ b/web/satellite/src/components/navigation/navigationArea.html
@@ -2,60 +2,60 @@
 <!--See LICENSE for copying information.-->
 
 <div class="navigation-area">
-	<div class="navigation-area__wrap">
-		<div class="navigation-area__logo" v-on:click="onLogoClick">
-			<svg class="navigation-area__logo__img" width="54" height="60" viewBox="0 0 54 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-				<path d="M54 17.4399C53.9172 19.3141 53.0892 20.6993 51.5161 21.6771C51.1849 21.8401 51.1021 22.003 51.1021 22.329C51.1021 27.4625 51.1021 32.596 51.1021 37.7295C51.1021 38.0555 51.1849 38.2184 51.4333 38.3814C53.2548 39.4407 54.2484 41.3963 53.9172 43.4334C53.586 45.389 52.0129 47.0187 49.9429 47.3447C48.7837 47.5891 47.6246 47.4262 46.5482 46.7743C46.217 46.6113 45.9686 46.6113 45.7202 46.7743C41.2491 49.3003 36.7781 51.9078 32.307 54.4338C31.9758 54.5968 31.893 54.7597 31.893 55.1672C31.893 57.6117 29.9887 59.8118 27.5875 59.9747C25.0208 60.2192 22.7025 58.671 22.2057 56.145C22.1229 55.7376 22.1229 55.4116 22.1229 55.0042C22.1229 54.7597 22.0401 54.5968 21.7917 54.4338C17.2378 51.8263 12.6839 49.3003 8.13005 46.6928C7.88166 46.5298 7.71606 46.5298 7.46767 46.6928C4.48695 48.4854 0.678253 46.7743 0.0986687 43.5149C-0.31532 41.4778 0.595455 39.5222 2.41701 38.3814C2.7482 38.2184 2.83099 38.0555 2.83099 37.648C2.83099 32.5145 2.83099 27.381 2.83099 22.2475C2.83099 21.9216 2.7482 21.7586 2.4998 21.5956C0.595455 20.5363 -0.31532 18.6622 0.0986687 16.5436C0.42986 14.425 2.08581 12.8768 4.23856 12.6323C5.39772 12.4694 6.4741 12.7138 7.46767 13.2842C7.71606 13.4472 7.88166 13.4472 8.13005 13.2842C12.6839 10.6767 17.155 8.15071 21.7089 5.54321C21.9573 5.38024 22.1229 5.21727 22.1229 4.89133C22.1229 2.03938 24.3584 -0.0792115 27.2563 0.00227286C29.4919 0.0837572 31.5618 1.87641 31.893 4.07649C31.893 4.23946 31.9758 4.40243 31.9758 4.64688C31.9758 5.21727 32.2242 5.54321 32.6382 5.78766C37.0265 8.23219 41.4147 10.7582 45.803 13.2842C46.1342 13.4472 46.2998 13.4472 46.631 13.2842C49.6117 11.573 53.2548 13.2027 53.9172 16.5436C54 16.8695 54 17.1955 54 17.4399ZM15.1679 35.0405C15.0851 35.0405 15.0851 35.122 15.0851 35.122C12.6011 36.5073 10.1172 37.8925 7.63326 39.3592C7.46767 39.4407 7.21927 39.4407 7.05368 39.3592C6.3913 38.9518 5.72892 38.7073 4.90094 38.7073C2.33421 38.6258 0.843848 40.663 0.761051 42.4556C0.761051 44.4927 2.33421 46.6113 4.90094 46.6113C7.13648 46.6113 8.87523 44.8187 8.87523 42.6186C8.87523 42.2112 8.95803 41.9667 9.37202 41.8037C12.0215 40.337 14.5883 38.8703 17.2378 37.3221C17.4862 37.1591 17.7346 37.1591 17.983 37.2406C19.6389 37.974 21.2949 38.1369 23.0336 37.648C23.1992 37.5665 23.4476 37.648 23.6132 37.7295C24.11 37.974 24.6068 38.2184 25.1036 38.3814C25.4348 38.4629 25.5176 38.6258 25.5176 38.9518C25.5176 43.026 25.5176 47.0187 25.5176 51.0929C25.5176 51.3374 25.4348 51.5004 25.1864 51.6633C23.7788 52.3152 22.7852 54.0264 23.0336 55.819C23.3648 57.9376 25.5176 59.4858 27.6703 59.0784C29.5747 58.7525 30.7338 57.4487 31.065 55.5746C31.2306 54.2708 30.5682 52.5597 28.9123 51.6633C28.6639 51.5819 28.5811 51.4189 28.5811 51.1744C28.5811 47.2632 28.5811 43.3519 28.5811 39.4407C28.5811 39.1147 28.7467 39.0333 29.0779 38.9518C29.9059 38.7888 30.7338 38.6258 31.479 38.4629C31.8102 38.3814 32.1414 38.3814 32.4726 38.4629C34.2113 39.1962 35.9501 39.1147 37.606 38.1369C37.8544 37.974 38.02 37.974 38.2684 38.1369C40.4212 39.3592 42.5739 40.5815 44.7267 41.8037C45.0578 41.9667 45.2234 42.2112 45.2234 42.6186C44.975 44.9001 47.1278 46.7743 49.5289 46.5298C51.9301 46.2854 53.586 44.0038 53.0064 41.7222C52.344 38.9518 49.3633 37.7295 46.8794 39.1962C46.631 39.3592 46.4654 39.3592 46.1342 39.1962C44.0643 37.974 41.9943 36.8332 39.9244 35.6924C39.5932 35.5294 39.5932 35.3665 39.676 35.0405C40.3384 33.0034 39.8416 31.1293 38.3512 29.5811C38.02 29.2551 36.6953 27.1366 36.4469 26.7291C36.2813 26.4032 36.3641 26.2402 36.6953 26.0773C39.8416 24.2846 42.9879 22.5734 46.0514 20.7808C46.2998 20.6178 46.4654 20.6178 46.7138 20.7808C47.6246 21.3512 48.6181 21.5141 49.6117 21.3512C51.5989 21.0252 53.0892 19.2326 52.9236 17.114C52.758 14.8324 50.4397 13.1212 48.1214 13.6102C46.1342 14.0176 44.8094 15.5658 44.8922 17.6029C44.8922 17.9288 44.8094 18.1733 44.4783 18.3362C41.3319 20.1289 38.1028 21.9216 34.9565 23.7142C34.7081 23.8772 34.5425 23.8772 34.2941 23.6327C32.8038 22.2475 30.9822 21.4326 28.9951 21.1882C28.3327 21.1067 28.3327 21.1067 28.3327 20.3734C28.3327 16.7066 28.3327 13.0398 28.3327 9.37297C28.3327 8.88406 28.4155 8.55813 28.9123 8.31367C30.651 7.33586 31.3134 5.21727 30.5682 3.34313C29.7403 1.55048 27.6703 0.491179 25.766 1.14305C24.0272 1.63196 23.0336 2.93571 22.868 4.64688C22.7025 6.03211 23.3648 7.58031 25.0208 8.39516C25.2692 8.55813 25.4348 8.63961 25.4348 8.96555C25.4348 13.0398 25.4348 17.0325 25.4348 21.1067C25.4348 21.4326 25.2692 21.5141 25.0208 21.6771C24.1928 22.0845 23.3648 22.4105 22.7025 22.9809C21.9573 23.6327 21.2121 23.9587 20.1357 23.9587C20.0529 23.9587 19.9701 23.9587 19.8873 23.9587C19.6389 23.9587 19.3077 23.9587 19.0594 23.7957C15.8302 22.003 12.6839 20.2104 9.45481 18.4177C8.95803 18.1733 8.79243 17.8473 8.87523 17.3584C8.87523 17.114 8.87523 16.951 8.79243 16.7066C8.46124 14.7509 6.55689 13.1212 4.23856 13.5287C1.92022 13.9361 0.512657 15.9732 0.843848 18.0918C1.34063 20.8623 4.56975 22.2475 6.97088 20.7808C7.21927 20.6178 7.46767 20.6178 7.71606 20.7808C10.1172 22.166 12.5183 23.5512 15.0023 24.9365C15.4163 25.1809 15.8302 25.4254 16.2442 25.6698C13.5119 28.5218 13.1807 31.6182 15.1679 35.0405Z" fill="#2683FF"/>
-				<path d="M22.4933 25.5491C23.1511 25.6323 23.3978 25.3828 23.8912 24.9671C25.8648 23.0547 28.2495 22.5558 30.7987 23.3873C33.3479 24.2188 34.9103 26.048 35.4037 28.7088C35.4859 29.2077 35.7326 29.5403 36.1438 29.7898C37.4595 30.5381 38.1996 32.2011 37.9529 33.5315C37.624 35.2776 36.4727 36.5249 34.8281 36.7743C33.9235 36.9406 33.1012 36.7743 32.3611 36.3586C32.0322 36.1091 31.7855 36.1923 31.3743 36.3586C29.0718 37.3564 26.9338 37.1901 24.7958 35.8597C24.4668 35.6934 24.2201 35.6102 23.8912 35.7765C20.9308 36.7743 17.8882 35.0282 17.1482 32.1179C16.3258 28.7088 19.0395 25.3828 22.4933 25.5491Z" fill="#2683FF"/>
-				<path d="M48 43C48 42.4286 48.4286 42 49 42C49.5714 42 50 42.4286 50 43C50 43.5 49.5 44 49 44C48.4286 44 48 43.5714 48 43Z" fill="#2683FF"/>
-				<path d="M26 5C26 4.42857 26.4444 4 27.037 4C27.5556 4 28 4.42857 28 5C28 5.5 27.5556 6 26.963 6C26.4444 5.92857 26 5.5 26 5Z" fill="#2683FF"/>
-				<path d="M6 43C6 43.5714 5.57143 44 5 44C4.5 44 4 43.5 4 43C4 42.5 4.5 42 5 42C5.57143 42 6 42.4286 6 43Z" fill="#2683FF"/>
-				<path d="M27 54C27.5714 54 28 54.6667 28 55.5556C28 56.4444 27.5714 57 27 57C26.4286 57 26 56.3333 26 55.4444C26 54.6667 26.4286 54 27 54Z" fill="#2683FF"/>
-				<path d="M5 19C4.42857 19 4 18.3333 4 17.5556C4 16.7778 4.42857 16 5 16C5.57143 16 6 16.5556 6 17.4444C5.92857 18.3333 5.57143 19 5 19Z" fill="#2683FF"/>
-				<path d="M48.9327 19C48.3635 19 47.9366 18.3333 48.0078 17.4444C48.0078 16.5556 48.4347 16 49.0039 16C49.5731 16 50 16.6667 50 17.5556C49.9288 18.3333 49.4308 19 48.9327 19Z" fill="#2683FF"/>
-			</svg>
-			<svg class="navigation-area__logo__text" width="69" height="16" viewBox="0 0 69 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-				<path d="M4.5974 3.50249C4.28571 3.7413 4.12986 4.1393 4.12986 4.61692C4.12986 5.09453 4.36363 5.41293 4.75324 5.65174C5.14285 5.89055 6.07792 6.20896 7.48052 6.60697C8.88311 7.00498 10.0519 7.48259 10.8312 8.19901C11.6104 8.91542 12 9.95025 12 11.3831C12 12.7363 11.4545 13.8507 10.4416 14.7264C9.42857 15.602 8.10389 16 6.46753 16C4.05194 16 1.94805 15.1244 0 13.2935L2.02597 10.7463C3.66233 12.1791 5.14285 12.8955 6.54545 12.8955C7.16883 12.8955 7.63636 12.7363 8.02597 12.4975C8.41558 12.2587 8.57143 11.8607 8.57143 11.3831C8.57143 10.9055 8.41558 10.5871 8.02597 10.2687C7.63636 10.0299 6.93506 9.71144 5.76623 9.47264C3.97402 9.07463 2.72727 8.51741 1.94805 7.801C1.16883 7.08458 0.701294 6.04975 0.701294 4.61692C0.701294 3.18408 1.24675 1.99005 2.25974 1.19403C3.27272 0.39801 4.59739 0 6.07792 0C7.0909 0 8.1039 0.159205 9.11688 0.557215C10.1299 0.875623 10.987 1.43283 11.7662 2.06965L10.0519 4.61692C8.72727 3.58209 7.4026 3.10448 6 3.10448C5.37662 3.10448 4.90909 3.26368 4.5974 3.50249Z" fill="#2683FF"/>
-				<path d="M21.3268 3.13402V16H17.6732V3.13402H13V0H26V3.13402H21.3268Z" fill="#2683FF"/>
-				<path d="M40.5594 13.68C38.8762 15.2 36.8564 16 34.5 16C32.1436 16 30.0396 15.2 28.4406 13.68C26.7574 12.16 26 10.24 26 8C26 5.76 26.8416 3.84 28.4406 2.32C30.1238 0.800001 32.1436 0 34.5 0C36.9406 0 38.9604 0.800001 40.5594 2.32C42.2426 3.84 43 5.76 43 8C43 10.24 42.2426 12.16 40.5594 13.68ZM39.297 8C39.297 6.64 38.7921 5.44 37.8663 4.48C36.9406 3.52 35.7624 3.04 34.4158 3.04C33.0693 3.04 31.8911 3.52 30.9653 4.48C30.0396 5.44 29.5347 6.64 29.5347 8C29.5347 9.36 30.0396 10.56 30.9653 11.52C31.8911 12.48 33.0693 12.96 34.4158 12.96C35.7624 12.96 36.9406 12.48 37.8663 11.52C38.8762 10.56 39.297 9.36 39.297 8Z" fill="#2683FF"/>
-				<path d="M58.0059 5.36082C58.0059 7.91752 57.0118 9.56701 54.9408 10.3093L59 16H54.6095L51.0473 10.8866H48.5621V16H45V0H51.0473C53.5325 0 55.355 0.412371 56.3491 1.23711C57.5089 2.14433 58.0059 3.46392 58.0059 5.36082ZM53.6982 7.25773C54.1124 6.84536 54.3609 6.26804 54.3609 5.36082C54.3609 4.45361 54.1124 3.87629 53.6982 3.62887C53.2012 3.29897 52.4556 3.13402 51.2959 3.13402H48.645V7.83505H51.2959C52.4556 7.83505 53.284 7.58763 53.6982 7.25773Z" fill="#2683FF"/>
-				<path d="M60.92 3.11795V0H69V10.3385C69 12.2256 68.52 13.6205 67.56 14.6051C66.6 15.5077 65.4 16 63.88 16C62.04 16 60.36 15.2615 59 13.7846L60.76 11.241C61.72 12.3077 62.68 12.8 63.72 12.8C64.2 12.8 64.6 12.6359 65 12.2256C65.32 11.8154 65.56 11.241 65.56 10.5026V3.0359L60.92 3.11795Z" fill="#2683FF"/>
-			</svg>
-		</div>
-		<router-link class="navigation-area__item-container" v-bind:class="{disabled: isProjectNotSelected && navItem.path !== '/project-details'}" v-for="navItem in navigation" v-bind:key="navItem.label" :to="navItem.path">
-			<div class="navigation-area__item-container__link-container" >
-				<div v-html="navItem.svg"></div>
-				<h1>{{navItem.label}}</h1>
-				<div class="navigation-area__item-container__link-container__add-button" id="addTeamMemberPopupButtonSVG" v-if="navItem.label === 'Team'">
-					<div v-on:click="togglePopup">
-						<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-							<rect width="40" height="40" rx="20" fill="#2683FF"/>
-							<path d="M25 18.977V21.046H20.9722V25H19.0046V21.046H15V18.977H19.0046V15H20.9722V18.977H25Z" fill="white"/>
-						</svg>
-					</div>
-				</div>
-			</div>
-		</router-link>
-		<a class="navigation-area__item-container" href="https://github.com/storj/docs/blob/master/Vanguard-Release-Setup-Instructions.md" target="_blank">
-			<div class="navigation-area__item-container__link-container">
-				<svg class="svg" width="19" height="24" viewBox="0 0 19 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-					<path d="M17.975 5.74811C17.9448 5.71786 17.9448 5.68878 17.9157 5.65853L17.8854 5.62828L17.8261 5.56895C17.7959 5.53871 17.7668 5.50962 17.7365 5.47937L13.0017 0.744565C12.9715 0.714318 12.9424 0.685233 12.9121 0.654985C12.9121 0.656149 12.8819 0.625901 12.8528 0.625901L12.8226 0.595654C12.7923 0.565407 12.7632 0.565407 12.733 0.536321C12.2862 0.179171 11.7209 0 11.1543 0H3.35157C1.92178 0 0.760742 1.16104 0.760742 2.59083V20.7277C0.760742 22.1575 1.92178 23.3186 3.35157 23.3186H15.9195C17.3493 23.3186 18.5103 22.1575 18.5103 20.7277L18.5115 7.32683C18.5115 6.76144 18.3032 6.19486 17.9751 5.74812L17.975 5.74811ZM16.2183 20.6986C16.2183 20.8475 16.0997 20.9964 15.9205 20.9964H3.35143C3.20252 20.9964 3.05361 20.8777 3.05361 20.6986V2.59177C3.05361 2.44286 3.17227 2.29395 3.35143 2.29395H10.1117V5.77819C10.1117 7.20799 11.2728 8.36902 12.7026 8.36902H16.1868L16.188 20.6983L16.2183 20.6986Z" fill="#354049"/>
-					<path d="M7.46108 12.5629C7.46108 13.3151 7.25209 13.88 6.85591 14.2795C6.46064 14.679 5.8791 14.8912 5.15762 14.8912H3.73828V10.4238H5.27393C5.97178 10.4238 6.52969 10.6121 6.90224 10.9648C7.27571 11.3405 7.46106 11.8814 7.46106 12.5629L7.46108 12.5629ZM6.22893 12.6107C6.22893 12.2111 6.15897 11.9053 5.99632 11.694C5.83367 11.4828 5.60105 11.3882 5.27483 11.3882L4.92591 11.3873V13.8801H5.18216C5.55472 13.8801 5.81004 13.7625 5.97268 13.5513C6.13533 13.3391 6.22893 13.0571 6.22893 12.6108V12.6107Z" fill="#354049"/>
-					<path d="M11.9283 12.6459C11.9283 13.3788 11.7339 13.9292 11.3696 14.3185C11.0054 14.7077 10.4231 14.8912 9.69462 14.8912C8.96618 14.8912 8.40752 14.7077 8.0433 14.3185C7.65441 13.9292 7.46094 13.3788 7.46094 12.6459C7.46094 11.9129 7.65538 11.3626 8.0433 10.9966C8.43219 10.6073 8.98988 10.4238 9.71832 10.4238C10.4468 10.4238 11.0054 10.6073 11.3933 10.9966C11.7338 11.3626 11.9283 11.9129 11.9283 12.6459H11.9283ZM8.74794 12.6459C8.74794 13.4933 9.06379 13.9059 9.67082 13.9059C9.98667 13.9059 10.2295 13.8146 10.3746 13.6079C10.5207 13.4021 10.5927 13.0808 10.5927 12.6459C10.5927 12.211 10.5197 11.8897 10.3499 11.6839C10.1802 11.478 9.96104 11.3635 9.66986 11.3635C9.06283 11.3859 8.74793 11.7984 8.74793 12.6459L8.74794 12.6459Z" fill="#354049"/>
-					<path d="M14.173 11.3808C13.8773 11.3808 13.6307 11.4948 13.4583 11.7227C13.2859 11.9506 13.2117 12.2693 13.2117 12.6575C13.2117 13.4783 13.5565 13.911 14.2472 13.911C14.4446 13.911 14.6662 13.8878 14.8386 13.8424C15.036 13.797 15.2335 13.7285 15.43 13.6599V14.6401C15.0351 14.7995 14.592 14.8912 14.0988 14.8912C13.3841 14.8912 12.8409 14.7087 12.471 14.3214C12.1011 13.9333 11.9287 13.3635 11.9287 12.6566C11.9287 12.2008 12.027 11.8135 12.2003 11.4717C12.3728 11.1298 12.6444 10.8787 12.9892 10.6971C13.334 10.5146 13.729 10.4238 14.1971 10.4238C14.6902 10.4238 15.1834 10.5146 15.6515 10.7203L15.2566 11.6319C15.0842 11.5634 14.9118 11.4948 14.7384 11.4494C14.5669 11.4031 14.3695 11.3809 14.173 11.3809L14.173 11.3808Z" fill="#354049"/>
-				</svg>
-				<h1>Docs</h1>
-			</div>
-		</a>
-		<a class="navigation-area__item-container" href="mailto:support@storj.io" target="_blank">
-			<div class="navigation-area__item-container__link-container">
-				<svg class="svg" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-					<path d="M18.8333 3.56068H7.0359C5.11538 3.56068 3.56068 5.11538 3.56068 7.0359V16.7299L1.91453 18.1932V6.85299C1.91453 4.1094 4.1094 2.00598 6.85299 2.00598H16.1812C16.7299 2.00598 17.1872 2.18889 17.6444 2.46325C17.8274 2.64615 18.1932 2.5547 18.3761 2.37179C18.559 2.18889 18.4675 1.82308 18.2846 1.64017C17.6444 1.18291 17.0043 1 16.2727 1H6.94444C3.65214 1 1 3.65214 1 6.85299V19.2906C1 19.4735 1.09145 19.6564 1.27436 19.7479C1.45726 19.8393 1.64017 19.7479 1.82308 19.6564L3.56068 18.1017V21.8513C3.56068 22.0342 3.65214 22.2171 3.83504 22.3085C3.9265 22.3085 3.9265 22.3085 4.01795 22.3085C4.1094 22.3085 4.29231 22.3085 4.38376 22.2171L7.31026 19.565C7.40171 19.4735 7.49316 19.3821 7.58462 19.3821C7.76752 19.2906 7.85897 19.1077 7.85897 19.1077C7.85897 19.1077 8.04188 19.1077 8.22479 19.1077C8.31624 19.1077 8.40769 19.1077 8.5906 19.1077H18.7419C20.6624 19.1077 22.2171 17.553 22.2171 15.6325V7.0359C22.2171 5.11538 20.7538 3.56068 18.8333 3.56068ZM17.7359 14.0778C17.2786 14.9009 16.6385 15.2667 16.1812 14.9923L15.541 14.7179C15.2667 14.9009 14.9923 15.0838 14.6265 15.2667L14.535 16.0897C14.535 16.6385 13.8949 16.9128 12.9803 16.9128C12.0658 16.9128 11.4256 16.547 11.4256 16.0897L11.3342 15.2667C10.9684 15.1752 10.694 14.9923 10.4197 14.7179L9.68803 15.0838C9.50513 15.1752 9.13932 15.2667 8.7735 14.9009C8.5906 14.7179 8.31624 14.4436 8.22479 14.1692C7.76752 13.3462 7.67607 12.6145 8.13333 12.3402L8.7735 11.8829C8.7735 11.7 8.7735 11.5171 8.7735 11.3342C8.7735 11.1513 8.7735 10.9684 8.7735 10.7855L8.13333 10.3282C7.67607 10.0538 7.76752 9.32222 8.22479 8.49915C8.40769 8.22479 8.5906 7.95043 8.7735 7.76752C9.23077 7.40171 9.50513 7.49316 9.68803 7.58462L10.4197 7.95043C10.694 7.76752 10.9684 7.58462 11.3342 7.40171L11.4256 6.57863C11.4256 6.02991 12.0658 5.75556 12.9803 5.75556C13.9863 5.75556 14.535 6.12137 14.535 6.57863L14.6265 7.40171C14.9923 7.58462 15.2667 7.67607 15.541 7.95043L16.2727 7.58462C16.7299 7.31026 17.2786 7.67607 17.8274 8.49915C18.0103 8.7735 18.1017 9.13932 18.1932 9.41368C18.2846 9.96239 18.1017 10.2368 17.9188 10.3282L17.2786 10.7855C17.2786 10.9684 17.2786 11.1513 17.2786 11.3342C17.2786 11.5171 17.2786 11.7 17.2786 11.8829L17.9188 12.3402C18.2846 12.6145 18.2846 13.2547 17.7359 14.0778Z" fill="#354049"/>
-					<path d="M12.8893 13.2551C13.9499 13.2551 14.8098 12.3952 14.8098 11.3346C14.8098 10.2739 13.9499 9.41406 12.8893 9.41406C11.8286 9.41406 10.9688 10.2739 10.9688 11.3346C10.9688 12.3952 11.8286 13.2551 12.8893 13.2551Z" fill="#354049"/>
-				</svg>
-				<h1>Support</h1>
-			</div>
-		</a>
-	</div>
-	<AddUserPopup v-if="isAddTeamMembersPopupShown"/>
+    <div class="navigation-area__wrap">
+        <div class="navigation-area__logo" v-on:click="onLogoClick">
+            <svg class="navigation-area__logo__img" width="54" height="60" viewBox="0 0 54 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M54 17.4399C53.9172 19.3141 53.0892 20.6993 51.5161 21.6771C51.1849 21.8401 51.1021 22.003 51.1021 22.329C51.1021 27.4625 51.1021 32.596 51.1021 37.7295C51.1021 38.0555 51.1849 38.2184 51.4333 38.3814C53.2548 39.4407 54.2484 41.3963 53.9172 43.4334C53.586 45.389 52.0129 47.0187 49.9429 47.3447C48.7837 47.5891 47.6246 47.4262 46.5482 46.7743C46.217 46.6113 45.9686 46.6113 45.7202 46.7743C41.2491 49.3003 36.7781 51.9078 32.307 54.4338C31.9758 54.5968 31.893 54.7597 31.893 55.1672C31.893 57.6117 29.9887 59.8118 27.5875 59.9747C25.0208 60.2192 22.7025 58.671 22.2057 56.145C22.1229 55.7376 22.1229 55.4116 22.1229 55.0042C22.1229 54.7597 22.0401 54.5968 21.7917 54.4338C17.2378 51.8263 12.6839 49.3003 8.13005 46.6928C7.88166 46.5298 7.71606 46.5298 7.46767 46.6928C4.48695 48.4854 0.678253 46.7743 0.0986687 43.5149C-0.31532 41.4778 0.595455 39.5222 2.41701 38.3814C2.7482 38.2184 2.83099 38.0555 2.83099 37.648C2.83099 32.5145 2.83099 27.381 2.83099 22.2475C2.83099 21.9216 2.7482 21.7586 2.4998 21.5956C0.595455 20.5363 -0.31532 18.6622 0.0986687 16.5436C0.42986 14.425 2.08581 12.8768 4.23856 12.6323C5.39772 12.4694 6.4741 12.7138 7.46767 13.2842C7.71606 13.4472 7.88166 13.4472 8.13005 13.2842C12.6839 10.6767 17.155 8.15071 21.7089 5.54321C21.9573 5.38024 22.1229 5.21727 22.1229 4.89133C22.1229 2.03938 24.3584 -0.0792115 27.2563 0.00227286C29.4919 0.0837572 31.5618 1.87641 31.893 4.07649C31.893 4.23946 31.9758 4.40243 31.9758 4.64688C31.9758 5.21727 32.2242 5.54321 32.6382 5.78766C37.0265 8.23219 41.4147 10.7582 45.803 13.2842C46.1342 13.4472 46.2998 13.4472 46.631 13.2842C49.6117 11.573 53.2548 13.2027 53.9172 16.5436C54 16.8695 54 17.1955 54 17.4399ZM15.1679 35.0405C15.0851 35.0405 15.0851 35.122 15.0851 35.122C12.6011 36.5073 10.1172 37.8925 7.63326 39.3592C7.46767 39.4407 7.21927 39.4407 7.05368 39.3592C6.3913 38.9518 5.72892 38.7073 4.90094 38.7073C2.33421 38.6258 0.843848 40.663 0.761051 42.4556C0.761051 44.4927 2.33421 46.6113 4.90094 46.6113C7.13648 46.6113 8.87523 44.8187 8.87523 42.6186C8.87523 42.2112 8.95803 41.9667 9.37202 41.8037C12.0215 40.337 14.5883 38.8703 17.2378 37.3221C17.4862 37.1591 17.7346 37.1591 17.983 37.2406C19.6389 37.974 21.2949 38.1369 23.0336 37.648C23.1992 37.5665 23.4476 37.648 23.6132 37.7295C24.11 37.974 24.6068 38.2184 25.1036 38.3814C25.4348 38.4629 25.5176 38.6258 25.5176 38.9518C25.5176 43.026 25.5176 47.0187 25.5176 51.0929C25.5176 51.3374 25.4348 51.5004 25.1864 51.6633C23.7788 52.3152 22.7852 54.0264 23.0336 55.819C23.3648 57.9376 25.5176 59.4858 27.6703 59.0784C29.5747 58.7525 30.7338 57.4487 31.065 55.5746C31.2306 54.2708 30.5682 52.5597 28.9123 51.6633C28.6639 51.5819 28.5811 51.4189 28.5811 51.1744C28.5811 47.2632 28.5811 43.3519 28.5811 39.4407C28.5811 39.1147 28.7467 39.0333 29.0779 38.9518C29.9059 38.7888 30.7338 38.6258 31.479 38.4629C31.8102 38.3814 32.1414 38.3814 32.4726 38.4629C34.2113 39.1962 35.9501 39.1147 37.606 38.1369C37.8544 37.974 38.02 37.974 38.2684 38.1369C40.4212 39.3592 42.5739 40.5815 44.7267 41.8037C45.0578 41.9667 45.2234 42.2112 45.2234 42.6186C44.975 44.9001 47.1278 46.7743 49.5289 46.5298C51.9301 46.2854 53.586 44.0038 53.0064 41.7222C52.344 38.9518 49.3633 37.7295 46.8794 39.1962C46.631 39.3592 46.4654 39.3592 46.1342 39.1962C44.0643 37.974 41.9943 36.8332 39.9244 35.6924C39.5932 35.5294 39.5932 35.3665 39.676 35.0405C40.3384 33.0034 39.8416 31.1293 38.3512 29.5811C38.02 29.2551 36.6953 27.1366 36.4469 26.7291C36.2813 26.4032 36.3641 26.2402 36.6953 26.0773C39.8416 24.2846 42.9879 22.5734 46.0514 20.7808C46.2998 20.6178 46.4654 20.6178 46.7138 20.7808C47.6246 21.3512 48.6181 21.5141 49.6117 21.3512C51.5989 21.0252 53.0892 19.2326 52.9236 17.114C52.758 14.8324 50.4397 13.1212 48.1214 13.6102C46.1342 14.0176 44.8094 15.5658 44.8922 17.6029C44.8922 17.9288 44.8094 18.1733 44.4783 18.3362C41.3319 20.1289 38.1028 21.9216 34.9565 23.7142C34.7081 23.8772 34.5425 23.8772 34.2941 23.6327C32.8038 22.2475 30.9822 21.4326 28.9951 21.1882C28.3327 21.1067 28.3327 21.1067 28.3327 20.3734C28.3327 16.7066 28.3327 13.0398 28.3327 9.37297C28.3327 8.88406 28.4155 8.55813 28.9123 8.31367C30.651 7.33586 31.3134 5.21727 30.5682 3.34313C29.7403 1.55048 27.6703 0.491179 25.766 1.14305C24.0272 1.63196 23.0336 2.93571 22.868 4.64688C22.7025 6.03211 23.3648 7.58031 25.0208 8.39516C25.2692 8.55813 25.4348 8.63961 25.4348 8.96555C25.4348 13.0398 25.4348 17.0325 25.4348 21.1067C25.4348 21.4326 25.2692 21.5141 25.0208 21.6771C24.1928 22.0845 23.3648 22.4105 22.7025 22.9809C21.9573 23.6327 21.2121 23.9587 20.1357 23.9587C20.0529 23.9587 19.9701 23.9587 19.8873 23.9587C19.6389 23.9587 19.3077 23.9587 19.0594 23.7957C15.8302 22.003 12.6839 20.2104 9.45481 18.4177C8.95803 18.1733 8.79243 17.8473 8.87523 17.3584C8.87523 17.114 8.87523 16.951 8.79243 16.7066C8.46124 14.7509 6.55689 13.1212 4.23856 13.5287C1.92022 13.9361 0.512657 15.9732 0.843848 18.0918C1.34063 20.8623 4.56975 22.2475 6.97088 20.7808C7.21927 20.6178 7.46767 20.6178 7.71606 20.7808C10.1172 22.166 12.5183 23.5512 15.0023 24.9365C15.4163 25.1809 15.8302 25.4254 16.2442 25.6698C13.5119 28.5218 13.1807 31.6182 15.1679 35.0405Z" fill="#2683FF"/>
+                <path d="M22.4933 25.5491C23.1511 25.6323 23.3978 25.3828 23.8912 24.9671C25.8648 23.0547 28.2495 22.5558 30.7987 23.3873C33.3479 24.2188 34.9103 26.048 35.4037 28.7088C35.4859 29.2077 35.7326 29.5403 36.1438 29.7898C37.4595 30.5381 38.1996 32.2011 37.9529 33.5315C37.624 35.2776 36.4727 36.5249 34.8281 36.7743C33.9235 36.9406 33.1012 36.7743 32.3611 36.3586C32.0322 36.1091 31.7855 36.1923 31.3743 36.3586C29.0718 37.3564 26.9338 37.1901 24.7958 35.8597C24.4668 35.6934 24.2201 35.6102 23.8912 35.7765C20.9308 36.7743 17.8882 35.0282 17.1482 32.1179C16.3258 28.7088 19.0395 25.3828 22.4933 25.5491Z" fill="#2683FF"/>
+                <path d="M48 43C48 42.4286 48.4286 42 49 42C49.5714 42 50 42.4286 50 43C50 43.5 49.5 44 49 44C48.4286 44 48 43.5714 48 43Z" fill="#2683FF"/>
+                <path d="M26 5C26 4.42857 26.4444 4 27.037 4C27.5556 4 28 4.42857 28 5C28 5.5 27.5556 6 26.963 6C26.4444 5.92857 26 5.5 26 5Z" fill="#2683FF"/>
+                <path d="M6 43C6 43.5714 5.57143 44 5 44C4.5 44 4 43.5 4 43C4 42.5 4.5 42 5 42C5.57143 42 6 42.4286 6 43Z" fill="#2683FF"/>
+                <path d="M27 54C27.5714 54 28 54.6667 28 55.5556C28 56.4444 27.5714 57 27 57C26.4286 57 26 56.3333 26 55.4444C26 54.6667 26.4286 54 27 54Z" fill="#2683FF"/>
+                <path d="M5 19C4.42857 19 4 18.3333 4 17.5556C4 16.7778 4.42857 16 5 16C5.57143 16 6 16.5556 6 17.4444C5.92857 18.3333 5.57143 19 5 19Z" fill="#2683FF"/>
+                <path d="M48.9327 19C48.3635 19 47.9366 18.3333 48.0078 17.4444C48.0078 16.5556 48.4347 16 49.0039 16C49.5731 16 50 16.6667 50 17.5556C49.9288 18.3333 49.4308 19 48.9327 19Z" fill="#2683FF"/>
+            </svg>
+            <svg class="navigation-area__logo__text" width="69" height="16" viewBox="0 0 69 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M4.5974 3.50249C4.28571 3.7413 4.12986 4.1393 4.12986 4.61692C4.12986 5.09453 4.36363 5.41293 4.75324 5.65174C5.14285 5.89055 6.07792 6.20896 7.48052 6.60697C8.88311 7.00498 10.0519 7.48259 10.8312 8.19901C11.6104 8.91542 12 9.95025 12 11.3831C12 12.7363 11.4545 13.8507 10.4416 14.7264C9.42857 15.602 8.10389 16 6.46753 16C4.05194 16 1.94805 15.1244 0 13.2935L2.02597 10.7463C3.66233 12.1791 5.14285 12.8955 6.54545 12.8955C7.16883 12.8955 7.63636 12.7363 8.02597 12.4975C8.41558 12.2587 8.57143 11.8607 8.57143 11.3831C8.57143 10.9055 8.41558 10.5871 8.02597 10.2687C7.63636 10.0299 6.93506 9.71144 5.76623 9.47264C3.97402 9.07463 2.72727 8.51741 1.94805 7.801C1.16883 7.08458 0.701294 6.04975 0.701294 4.61692C0.701294 3.18408 1.24675 1.99005 2.25974 1.19403C3.27272 0.39801 4.59739 0 6.07792 0C7.0909 0 8.1039 0.159205 9.11688 0.557215C10.1299 0.875623 10.987 1.43283 11.7662 2.06965L10.0519 4.61692C8.72727 3.58209 7.4026 3.10448 6 3.10448C5.37662 3.10448 4.90909 3.26368 4.5974 3.50249Z" fill="#2683FF"/>
+                <path d="M21.3268 3.13402V16H17.6732V3.13402H13V0H26V3.13402H21.3268Z" fill="#2683FF"/>
+                <path d="M40.5594 13.68C38.8762 15.2 36.8564 16 34.5 16C32.1436 16 30.0396 15.2 28.4406 13.68C26.7574 12.16 26 10.24 26 8C26 5.76 26.8416 3.84 28.4406 2.32C30.1238 0.800001 32.1436 0 34.5 0C36.9406 0 38.9604 0.800001 40.5594 2.32C42.2426 3.84 43 5.76 43 8C43 10.24 42.2426 12.16 40.5594 13.68ZM39.297 8C39.297 6.64 38.7921 5.44 37.8663 4.48C36.9406 3.52 35.7624 3.04 34.4158 3.04C33.0693 3.04 31.8911 3.52 30.9653 4.48C30.0396 5.44 29.5347 6.64 29.5347 8C29.5347 9.36 30.0396 10.56 30.9653 11.52C31.8911 12.48 33.0693 12.96 34.4158 12.96C35.7624 12.96 36.9406 12.48 37.8663 11.52C38.8762 10.56 39.297 9.36 39.297 8Z" fill="#2683FF"/>
+                <path d="M58.0059 5.36082C58.0059 7.91752 57.0118 9.56701 54.9408 10.3093L59 16H54.6095L51.0473 10.8866H48.5621V16H45V0H51.0473C53.5325 0 55.355 0.412371 56.3491 1.23711C57.5089 2.14433 58.0059 3.46392 58.0059 5.36082ZM53.6982 7.25773C54.1124 6.84536 54.3609 6.26804 54.3609 5.36082C54.3609 4.45361 54.1124 3.87629 53.6982 3.62887C53.2012 3.29897 52.4556 3.13402 51.2959 3.13402H48.645V7.83505H51.2959C52.4556 7.83505 53.284 7.58763 53.6982 7.25773Z" fill="#2683FF"/>
+                <path d="M60.92 3.11795V0H69V10.3385C69 12.2256 68.52 13.6205 67.56 14.6051C66.6 15.5077 65.4 16 63.88 16C62.04 16 60.36 15.2615 59 13.7846L60.76 11.241C61.72 12.3077 62.68 12.8 63.72 12.8C64.2 12.8 64.6 12.6359 65 12.2256C65.32 11.8154 65.56 11.241 65.56 10.5026V3.0359L60.92 3.11795Z" fill="#2683FF"/>
+            </svg>
+        </div>
+        <router-link class="navigation-area__item-container" v-bind:class="{disabled: isProjectNotSelected && navItem.path !== '/project-details'}" v-for="navItem in navigation" v-bind:key="navItem.label" :to="navItem.path">
+            <div class="navigation-area__item-container__link-container" >
+                <div v-html="navItem.svg"></div>
+                <h1>{{navItem.label}}</h1>
+                <div class="navigation-area__item-container__link-container__add-button" id="addTeamMemberPopupButtonSVG" v-if="navItem.label === 'Team'">
+                    <div v-on:click="togglePopup">
+                        <svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <rect width="40" height="40" rx="20" fill="#2683FF"/>
+                            <path d="M25 18.977V21.046H20.9722V25H19.0046V21.046H15V18.977H19.0046V15H20.9722V18.977H25Z" fill="white"/>
+                        </svg>
+                    </div>
+                </div>
+            </div>
+        </router-link>
+        <a class="navigation-area__item-container" href="https://github.com/storj/docs/blob/master/Vanguard-Release-Setup-Instructions.md" target="_blank">
+            <div class="navigation-area__item-container__link-container">
+                <svg class="svg" width="19" height="24" viewBox="0 0 19 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M17.975 5.74811C17.9448 5.71786 17.9448 5.68878 17.9157 5.65853L17.8854 5.62828L17.8261 5.56895C17.7959 5.53871 17.7668 5.50962 17.7365 5.47937L13.0017 0.744565C12.9715 0.714318 12.9424 0.685233 12.9121 0.654985C12.9121 0.656149 12.8819 0.625901 12.8528 0.625901L12.8226 0.595654C12.7923 0.565407 12.7632 0.565407 12.733 0.536321C12.2862 0.179171 11.7209 0 11.1543 0H3.35157C1.92178 0 0.760742 1.16104 0.760742 2.59083V20.7277C0.760742 22.1575 1.92178 23.3186 3.35157 23.3186H15.9195C17.3493 23.3186 18.5103 22.1575 18.5103 20.7277L18.5115 7.32683C18.5115 6.76144 18.3032 6.19486 17.9751 5.74812L17.975 5.74811ZM16.2183 20.6986C16.2183 20.8475 16.0997 20.9964 15.9205 20.9964H3.35143C3.20252 20.9964 3.05361 20.8777 3.05361 20.6986V2.59177C3.05361 2.44286 3.17227 2.29395 3.35143 2.29395H10.1117V5.77819C10.1117 7.20799 11.2728 8.36902 12.7026 8.36902H16.1868L16.188 20.6983L16.2183 20.6986Z" fill="#354049"/>
+                    <path d="M7.46108 12.5629C7.46108 13.3151 7.25209 13.88 6.85591 14.2795C6.46064 14.679 5.8791 14.8912 5.15762 14.8912H3.73828V10.4238H5.27393C5.97178 10.4238 6.52969 10.6121 6.90224 10.9648C7.27571 11.3405 7.46106 11.8814 7.46106 12.5629L7.46108 12.5629ZM6.22893 12.6107C6.22893 12.2111 6.15897 11.9053 5.99632 11.694C5.83367 11.4828 5.60105 11.3882 5.27483 11.3882L4.92591 11.3873V13.8801H5.18216C5.55472 13.8801 5.81004 13.7625 5.97268 13.5513C6.13533 13.3391 6.22893 13.0571 6.22893 12.6108V12.6107Z" fill="#354049"/>
+                    <path d="M11.9283 12.6459C11.9283 13.3788 11.7339 13.9292 11.3696 14.3185C11.0054 14.7077 10.4231 14.8912 9.69462 14.8912C8.96618 14.8912 8.40752 14.7077 8.0433 14.3185C7.65441 13.9292 7.46094 13.3788 7.46094 12.6459C7.46094 11.9129 7.65538 11.3626 8.0433 10.9966C8.43219 10.6073 8.98988 10.4238 9.71832 10.4238C10.4468 10.4238 11.0054 10.6073 11.3933 10.9966C11.7338 11.3626 11.9283 11.9129 11.9283 12.6459H11.9283ZM8.74794 12.6459C8.74794 13.4933 9.06379 13.9059 9.67082 13.9059C9.98667 13.9059 10.2295 13.8146 10.3746 13.6079C10.5207 13.4021 10.5927 13.0808 10.5927 12.6459C10.5927 12.211 10.5197 11.8897 10.3499 11.6839C10.1802 11.478 9.96104 11.3635 9.66986 11.3635C9.06283 11.3859 8.74793 11.7984 8.74793 12.6459L8.74794 12.6459Z" fill="#354049"/>
+                    <path d="M14.173 11.3808C13.8773 11.3808 13.6307 11.4948 13.4583 11.7227C13.2859 11.9506 13.2117 12.2693 13.2117 12.6575C13.2117 13.4783 13.5565 13.911 14.2472 13.911C14.4446 13.911 14.6662 13.8878 14.8386 13.8424C15.036 13.797 15.2335 13.7285 15.43 13.6599V14.6401C15.0351 14.7995 14.592 14.8912 14.0988 14.8912C13.3841 14.8912 12.8409 14.7087 12.471 14.3214C12.1011 13.9333 11.9287 13.3635 11.9287 12.6566C11.9287 12.2008 12.027 11.8135 12.2003 11.4717C12.3728 11.1298 12.6444 10.8787 12.9892 10.6971C13.334 10.5146 13.729 10.4238 14.1971 10.4238C14.6902 10.4238 15.1834 10.5146 15.6515 10.7203L15.2566 11.6319C15.0842 11.5634 14.9118 11.4948 14.7384 11.4494C14.5669 11.4031 14.3695 11.3809 14.173 11.3809L14.173 11.3808Z" fill="#354049"/>
+                </svg>
+                <h1>Docs</h1>
+            </div>
+        </a>
+        <a class="navigation-area__item-container" href="mailto:support@storj.io" target="_blank">
+            <div class="navigation-area__item-container__link-container">
+                <svg class="svg" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M18.8333 3.56068H7.0359C5.11538 3.56068 3.56068 5.11538 3.56068 7.0359V16.7299L1.91453 18.1932V6.85299C1.91453 4.1094 4.1094 2.00598 6.85299 2.00598H16.1812C16.7299 2.00598 17.1872 2.18889 17.6444 2.46325C17.8274 2.64615 18.1932 2.5547 18.3761 2.37179C18.559 2.18889 18.4675 1.82308 18.2846 1.64017C17.6444 1.18291 17.0043 1 16.2727 1H6.94444C3.65214 1 1 3.65214 1 6.85299V19.2906C1 19.4735 1.09145 19.6564 1.27436 19.7479C1.45726 19.8393 1.64017 19.7479 1.82308 19.6564L3.56068 18.1017V21.8513C3.56068 22.0342 3.65214 22.2171 3.83504 22.3085C3.9265 22.3085 3.9265 22.3085 4.01795 22.3085C4.1094 22.3085 4.29231 22.3085 4.38376 22.2171L7.31026 19.565C7.40171 19.4735 7.49316 19.3821 7.58462 19.3821C7.76752 19.2906 7.85897 19.1077 7.85897 19.1077C7.85897 19.1077 8.04188 19.1077 8.22479 19.1077C8.31624 19.1077 8.40769 19.1077 8.5906 19.1077H18.7419C20.6624 19.1077 22.2171 17.553 22.2171 15.6325V7.0359C22.2171 5.11538 20.7538 3.56068 18.8333 3.56068ZM17.7359 14.0778C17.2786 14.9009 16.6385 15.2667 16.1812 14.9923L15.541 14.7179C15.2667 14.9009 14.9923 15.0838 14.6265 15.2667L14.535 16.0897C14.535 16.6385 13.8949 16.9128 12.9803 16.9128C12.0658 16.9128 11.4256 16.547 11.4256 16.0897L11.3342 15.2667C10.9684 15.1752 10.694 14.9923 10.4197 14.7179L9.68803 15.0838C9.50513 15.1752 9.13932 15.2667 8.7735 14.9009C8.5906 14.7179 8.31624 14.4436 8.22479 14.1692C7.76752 13.3462 7.67607 12.6145 8.13333 12.3402L8.7735 11.8829C8.7735 11.7 8.7735 11.5171 8.7735 11.3342C8.7735 11.1513 8.7735 10.9684 8.7735 10.7855L8.13333 10.3282C7.67607 10.0538 7.76752 9.32222 8.22479 8.49915C8.40769 8.22479 8.5906 7.95043 8.7735 7.76752C9.23077 7.40171 9.50513 7.49316 9.68803 7.58462L10.4197 7.95043C10.694 7.76752 10.9684 7.58462 11.3342 7.40171L11.4256 6.57863C11.4256 6.02991 12.0658 5.75556 12.9803 5.75556C13.9863 5.75556 14.535 6.12137 14.535 6.57863L14.6265 7.40171C14.9923 7.58462 15.2667 7.67607 15.541 7.95043L16.2727 7.58462C16.7299 7.31026 17.2786 7.67607 17.8274 8.49915C18.0103 8.7735 18.1017 9.13932 18.1932 9.41368C18.2846 9.96239 18.1017 10.2368 17.9188 10.3282L17.2786 10.7855C17.2786 10.9684 17.2786 11.1513 17.2786 11.3342C17.2786 11.5171 17.2786 11.7 17.2786 11.8829L17.9188 12.3402C18.2846 12.6145 18.2846 13.2547 17.7359 14.0778Z" fill="#354049"/>
+                    <path d="M12.8893 13.2551C13.9499 13.2551 14.8098 12.3952 14.8098 11.3346C14.8098 10.2739 13.9499 9.41406 12.8893 9.41406C11.8286 9.41406 10.9688 10.2739 10.9688 11.3346C10.9688 12.3952 11.8286 13.2551 12.8893 13.2551Z" fill="#354049"/>
+                </svg>
+                <h1>Support</h1>
+            </div>
+        </a>
+    </div>
+    <AddUserPopup v-if="isAddTeamMembersPopupShown"/>
 </div>
diff --git a/web/satellite/src/components/project/AddPaymentMethodPopup.vue b/web/satellite/src/components/project/AddPaymentMethodPopup.vue
index 795ef0348..9443f8caf 100644
--- a/web/satellite/src/components/project/AddPaymentMethodPopup.vue
+++ b/web/satellite/src/components/project/AddPaymentMethodPopup.vue
@@ -2,44 +2,44 @@
 // See LICENSE for copying information.
 
 <template>
-	<div class="add-payment-popup-overflow" v-on:keyup.enter="onDoneClick" v-on:keyup.esc="onCloseClick">
-		<div class="add-payment-popup-container">
-			<h1 class="add-payment-popup-container__title">Add Payment Method</h1>
-			<div class="add-payment-popup-container__chosen-card-container">
-				<Card
-					isChosen
-					lastDigits="0000"
-					fullName="Shawn Wilkinson"
-					expireLabel="Storj Labs"
-					expireDate="12/2020" />
-				<Button
-					label="Default"
-					width="91px"
-					height="36px"
-					isDisabled />
-			</div>
-			<div class="add-payment-popup-container__border"></div>
-			<div class="add-payment-popup-container__expanded-area"></div>
-			<div class="add-payment-popup-container__footer">
-				<div class="add-payment-popup-container__footer__new-card-button" @click="onNewCardClick">
-					<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-						<path d="M20 7.26316V3.87134C20 3.40351 19.7938 2.93567 19.4845 2.5848C19.1753 2.23392 18.7629 2 18.3505 2H1.64948C1.23711 2 0.824742 2.23392 0.515464 2.5848C0.206186 2.93567 0 3.40351 0 3.87134V7.26316H20Z" fill="#2683FF"/>
-						<path d="M0 9.36816V16.1852C0 16.5862 0.206186 16.9872 0.515464 17.288C0.824742 17.5887 1.23711 17.7892 1.64948 17.7892H18.3505C18.7629 17.7892 19.1753 17.5887 19.4845 17.288C19.7938 16.9872 20 16.5862 20 16.1852V9.36816H0ZM5.36083 15.1827H2.68041V13.8794H5.36083V15.1827ZM10.7217 15.1827H6.70103V13.8794H10.7217V15.1827Z" fill="#2683FF"/>
-					</svg>
-					<p class="add-payment-popup-container__footer__new-card-button__label">+ New Card</p>
-				</div>
-				<Button
-					label="Done"
-					width="205px"
-					height="48px" />
-			</div>
-			<div class="cross" @click="onCloseClick">
-				<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-					<path d="M15.7071 1.70711C16.0976 1.31658 16.0976 0.683417 15.7071 0.292893C15.3166 -0.0976311 14.6834 -0.0976311 14.2929 0.292893L15.7071 1.70711ZM0.292893 14.2929C-0.0976311 14.6834 -0.0976311 15.3166 0.292893 15.7071C0.683417 16.0976 1.31658 16.0976 1.70711 15.7071L0.292893 14.2929ZM1.70711 0.292893C1.31658 -0.0976311 0.683417 -0.0976311 0.292893 0.292893C-0.0976311 0.683417 -0.0976311 1.31658 0.292893 1.70711L1.70711 0.292893ZM14.2929 15.7071C14.6834 16.0976 15.3166 16.0976 15.7071 15.7071C16.0976 15.3166 16.0976 14.6834 15.7071 14.2929L14.2929 15.7071ZM14.2929 0.292893L0.292893 14.2929L1.70711 15.7071L15.7071 1.70711L14.2929 0.292893ZM0.292893 1.70711L14.2929 15.7071L15.7071 14.2929L1.70711 0.292893L0.292893 1.70711Z" fill="#384B65"/>
-				</svg>
-			</div>
-		</div>
-	</div>
+    <div class="add-payment-popup-overflow" v-on:keyup.enter="onDoneClick" v-on:keyup.esc="onCloseClick">
+        <div class="add-payment-popup-container">
+            <h1 class="add-payment-popup-container__title">Add Payment Method</h1>
+            <div class="add-payment-popup-container__chosen-card-container">
+                <Card
+                    isChosen
+                    lastDigits="0000"
+                    fullName="Shawn Wilkinson"
+                    expireLabel="Storj Labs"
+                    expireDate="12/2020" />
+                <Button
+                    label="Default"
+                    width="91px"
+                    height="36px"
+                    isDisabled />
+            </div>
+            <div class="add-payment-popup-container__border"></div>
+            <div class="add-payment-popup-container__expanded-area"></div>
+            <div class="add-payment-popup-container__footer">
+                <div class="add-payment-popup-container__footer__new-card-button" @click="onNewCardClick">
+                    <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M20 7.26316V3.87134C20 3.40351 19.7938 2.93567 19.4845 2.5848C19.1753 2.23392 18.7629 2 18.3505 2H1.64948C1.23711 2 0.824742 2.23392 0.515464 2.5848C0.206186 2.93567 0 3.40351 0 3.87134V7.26316H20Z" fill="#2683FF"/>
+                        <path d="M0 9.36816V16.1852C0 16.5862 0.206186 16.9872 0.515464 17.288C0.824742 17.5887 1.23711 17.7892 1.64948 17.7892H18.3505C18.7629 17.7892 19.1753 17.5887 19.4845 17.288C19.7938 16.9872 20 16.5862 20 16.1852V9.36816H0ZM5.36083 15.1827H2.68041V13.8794H5.36083V15.1827ZM10.7217 15.1827H6.70103V13.8794H10.7217V15.1827Z" fill="#2683FF"/>
+                    </svg>
+                    <p class="add-payment-popup-container__footer__new-card-button__label">+ New Card</p>
+                </div>
+                <Button
+                    label="Done"
+                    width="205px"
+                    height="48px" />
+            </div>
+            <div class="cross" @click="onCloseClick">
+                <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M15.7071 1.70711C16.0976 1.31658 16.0976 0.683417 15.7071 0.292893C15.3166 -0.0976311 14.6834 -0.0976311 14.2929 0.292893L15.7071 1.70711ZM0.292893 14.2929C-0.0976311 14.6834 -0.0976311 15.3166 0.292893 15.7071C0.683417 16.0976 1.31658 16.0976 1.70711 15.7071L0.292893 14.2929ZM1.70711 0.292893C1.31658 -0.0976311 0.683417 -0.0976311 0.292893 0.292893C-0.0976311 0.683417 -0.0976311 1.31658 0.292893 1.70711L1.70711 0.292893ZM14.2929 15.7071C14.6834 16.0976 15.3166 16.0976 15.7071 15.7071C16.0976 15.3166 16.0976 14.6834 15.7071 14.2929L14.2929 15.7071ZM14.2929 0.292893L0.292893 14.2929L1.70711 15.7071L15.7071 1.70711L14.2929 0.292893ZM0.292893 1.70711L14.2929 15.7071L15.7071 14.2929L1.70711 0.292893L0.292893 1.70711Z" fill="#384B65"/>
+                </svg>
+            </div>
+        </div>
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/project/CardChoiceItem.vue b/web/satellite/src/components/project/CardChoiceItem.vue
index 2546e485d..6c967009e 100644
--- a/web/satellite/src/components/project/CardChoiceItem.vue
+++ b/web/satellite/src/components/project/CardChoiceItem.vue
@@ -2,35 +2,35 @@
 // See LICENSE for copying information.
 
 <template>
-	<div class="chosen-card-container">
-		<div v-if="isChosen">
-			<svg class="chosen-card-container__mark" width="14" height="13" viewBox="0 0 14 13" fill="none" xmlns="http://www.w3.org/2000/svg">
-				<path d="M13.5542 2.9984C14.1056 2.38014 14.0514 1.43194 13.4332 0.88054C12.8149 0.329137 11.8667 0.383336 11.3153 1.0016L13.5542 2.9984ZM4.40803 11L3.28906 11.999C3.57374 12.3178 3.98094 12.5001 4.4084 12.5C4.83586 12.4999 5.24297 12.3174 5.52749 11.9984L4.40803 11ZM3.11896 7.30374C2.56725 6.68575 1.61903 6.63202 1.00104 7.18373C0.383054 7.73544 0.329326 8.68367 0.881036 9.30166L3.11896 7.30374ZM11.3153 1.0016L3.28857 10.0016L5.52749 11.9984L13.5542 2.9984L11.3153 1.0016ZM5.52699 10.001L3.11896 7.30374L0.881036 9.30166L3.28906 11.999L5.52699 10.001Z" fill="#2683FF"/>
-			</svg>
-		</div>
-		<div v-if="!logoPath">
-			<svg class="chosen-card-container__logo" width="38" height="42" viewBox="0 0 38 42" fill="none" xmlns="http://www.w3.org/2000/svg">
-				<path d="M37.8 12.2079C37.742 13.5198 37.1624 14.4895 36.0612 15.1739C35.8294 15.288 35.7714 15.4021 35.7714 15.6303C35.7714 19.2237 35.7714 22.8172 35.7714 26.4106C35.7714 26.6388 35.8294 26.7528 36.0033 26.8669C37.2783 27.6084 37.9738 28.9774 37.742 30.4033C37.5102 31.7723 36.409 32.913 34.96 33.1412C34.1486 33.3123 33.3372 33.1982 32.5837 32.7419C32.3519 32.6279 32.178 32.6279 32.0041 32.7419C28.8744 34.5101 25.7446 36.3354 22.6149 38.1036C22.3831 38.2177 22.3251 38.3317 22.3251 38.6169C22.3251 40.3281 20.9921 41.8682 19.3113 41.9822C17.5146 42.1534 15.8917 41.0696 15.544 39.3014C15.486 39.0162 15.486 38.7881 15.486 38.5029C15.486 38.3317 15.4281 38.2177 15.2542 38.1036C12.0665 36.2783 8.87877 34.5101 5.69106 32.6849C5.51719 32.5708 5.40127 32.5708 5.22739 32.6849C3.1409 33.9398 0.474813 32.7419 0.0691047 30.4604C-0.220687 29.0344 0.416854 27.6655 1.69194 26.8669C1.92377 26.7528 1.98173 26.6388 1.98173 26.3536C1.98173 22.7601 1.98173 19.1667 1.98173 15.5732C1.98173 15.3451 1.92377 15.231 1.7499 15.1169C0.416854 14.3754 -0.220687 13.0635 0.0691047 11.5805C0.300938 10.0975 1.4601 9.01374 2.96702 8.84262C3.77844 8.72855 4.53189 8.89966 5.22739 9.29893C5.40127 9.41301 5.51719 9.41301 5.69106 9.29893C8.87877 7.47369 12.0085 5.70548 15.1962 3.88024C15.3701 3.76616 15.486 3.65208 15.486 3.42393C15.486 1.42756 17.0509 -0.0554479 19.0794 0.001591C20.6443 0.0586299 22.0933 1.31349 22.3251 2.85354C22.3251 2.96761 22.3831 3.08169 22.3831 3.25281C22.3831 3.65208 22.5569 3.88024 22.8467 4.05135C25.9185 5.76252 28.9903 7.53073 32.0621 9.29893C32.2939 9.41301 32.4098 9.41301 32.6417 9.29893C34.7282 8.10112 37.2783 9.2419 37.742 11.5805C37.8 11.8086 37.8 12.0368 37.8 12.2079ZM10.6175 24.5283C10.5596 24.5283 10.5596 24.5854 10.5596 24.5854C8.82081 25.555 7.08206 26.5247 5.34331 27.5514C5.22739 27.6084 5.05352 27.6084 4.9376 27.5514C4.47394 27.2662 4.01027 27.0951 3.43069 27.0951C1.63398 27.038 0.590729 28.464 0.532771 29.7189C0.532771 31.1448 1.63398 32.6279 3.43069 32.6279C4.99556 32.6279 6.21269 31.373 6.21269 29.8329C6.21269 29.5478 6.27064 29.3766 6.56044 29.2626C8.4151 28.2359 10.2118 27.2092 12.0665 26.1254C12.2404 26.0113 12.4142 26.0113 12.5881 26.0684C13.7473 26.5817 14.9064 26.6958 16.1236 26.3536C16.2395 26.2965 16.4133 26.3536 16.5293 26.4106C16.877 26.5817 17.2248 26.7528 17.5725 26.8669C17.8043 26.924 17.8623 27.038 17.8623 27.2662C17.8623 30.1181 17.8623 32.913 17.8623 35.765C17.8623 35.9361 17.8043 36.0502 17.6305 36.1643C16.6452 36.6206 15.9497 37.8184 16.1236 39.0733C16.3554 40.5563 17.8623 41.64 19.3692 41.3548C20.7023 41.1267 21.5137 40.214 21.7455 38.9021C21.8614 37.9895 21.3978 36.7917 20.2386 36.1643C20.0647 36.1072 20.0068 35.9932 20.0068 35.822C20.0068 33.0842 20.0068 30.3463 20.0068 27.6084C20.0068 27.3803 20.1227 27.3232 20.3545 27.2662C20.9341 27.1521 21.5137 27.038 22.0353 26.924C22.2671 26.8669 22.499 26.8669 22.7308 26.924C23.9479 27.4373 25.1651 27.3803 26.3242 26.6958C26.4981 26.5817 26.614 26.5817 26.7879 26.6958C28.2948 27.5514 29.8017 28.407 31.3086 29.2626C31.5405 29.3766 31.6564 29.5478 31.6564 29.8329C31.4825 31.43 32.9894 32.7419 34.6702 32.5708C36.351 32.3997 37.5102 30.8026 37.1045 29.2055C36.6408 27.2662 34.5543 26.4106 32.8156 27.4373C32.6417 27.5514 32.5258 27.5514 32.2939 27.4373C30.845 26.5817 29.396 25.7832 27.9471 24.9846C27.7152 24.8706 27.7152 24.7565 27.7732 24.5283C28.2368 23.1024 27.8891 21.7905 26.8458 20.7067C26.614 20.4786 25.6867 18.9956 25.5128 18.7104C25.3969 18.4822 25.4548 18.3681 25.6867 18.254C27.8891 16.9992 30.0915 15.8014 32.236 14.5465C32.4098 14.4324 32.5258 14.4324 32.6996 14.5465C33.3372 14.9458 34.0327 15.0599 34.7282 14.9458C36.1192 14.7176 37.1624 13.4628 37.0465 11.9798C36.9306 10.3827 35.3078 9.18486 33.6849 9.52709C32.2939 9.81229 31.3666 10.896 31.4245 12.322C31.4245 12.5502 31.3666 12.7213 31.1348 12.8353C28.9323 14.0902 26.672 15.3451 24.4696 16.5999C24.2957 16.714 24.1798 16.714 24.0059 16.5429C22.9626 15.5732 21.6876 15.0028 20.2966 14.8317C19.8329 14.7747 19.8329 14.7747 19.8329 14.2613C19.8329 11.6946 19.8329 9.12782 19.8329 6.56107C19.8329 6.21883 19.8908 5.99068 20.2386 5.81956C21.4557 5.13509 21.9194 3.65208 21.3978 2.34019C20.8182 1.08533 19.3692 0.343824 18.0362 0.800136C16.8191 1.14237 16.1236 2.05499 16.0076 3.25281C15.8917 4.22247 16.3554 5.30621 17.5146 5.8766C17.6884 5.99068 17.8043 6.04772 17.8043 6.27587C17.8043 9.12782 17.8043 11.9227 17.8043 14.7747C17.8043 15.0028 17.6884 15.0599 17.5146 15.1739C16.935 15.4591 16.3554 15.6873 15.8917 16.0866C15.3701 16.5429 14.8485 16.771 14.095 16.771C14.0371 16.771 13.9791 16.771 13.9211 16.771C13.7473 16.771 13.5154 16.771 13.3416 16.657C11.0812 15.4021 8.87877 14.1472 6.61839 12.8924C6.27064 12.7213 6.15473 12.4931 6.21269 12.1509C6.21269 11.9798 6.21269 11.8657 6.15473 11.6946C5.92289 10.3256 4.58985 9.18486 2.96702 9.47005C1.34419 9.75525 0.358896 11.1812 0.590729 12.6642C0.938479 14.6036 3.19885 15.5732 4.87964 14.5465C5.05352 14.4324 5.22739 14.4324 5.40127 14.5465C7.08206 15.5162 8.76285 16.4858 10.5016 17.4555C10.7914 17.6266 11.0812 17.7977 11.371 17.9689C9.45835 19.9652 9.22652 22.1327 10.6175 24.5283Z" fill="#2683FF"/>
-				<path d="M15.7454 17.8843C16.2059 17.9425 16.3786 17.7678 16.7239 17.4768C18.1054 16.1381 19.7747 15.7889 21.5592 16.3709C23.3436 16.953 24.4373 18.2335 24.7827 20.096C24.8402 20.4452 25.0129 20.6781 25.3007 20.8527C26.2217 21.3765 26.7398 22.5406 26.5671 23.4719C26.3369 24.6942 25.531 25.5672 24.3797 25.7419C23.7465 25.8583 23.1709 25.7419 22.6529 25.4508C22.4226 25.2762 22.2499 25.3344 21.9621 25.4508C20.3504 26.1493 18.8537 26.0329 17.3571 25.1016C17.1269 24.9852 16.9542 24.927 16.7239 25.0434C14.6517 25.7419 12.5219 24.5196 12.0038 22.4824C11.4282 20.096 13.3277 17.7678 15.7454 17.8843Z" fill="#2683FF"/>
-				<path d="M33.5999 30.1001C33.5999 29.7001 33.8999 29.4001 34.2999 29.4001C34.6999 29.4001 34.9999 29.7001 34.9999 30.1001C34.9999 30.4501 34.6499 30.8001 34.2999 30.8001C33.8999 30.8001 33.5999 30.5001 33.5999 30.1001Z" fill="#2683FF"/>
-				<path d="M18.2 3.4998C18.2 3.0998 18.5111 2.7998 18.9259 2.7998C19.2889 2.7998 19.6 3.0998 19.6 3.4998C19.6 3.8498 19.2889 4.1998 18.8741 4.1998C18.5111 4.1498 18.2 3.8498 18.2 3.4998Z" fill="#2683FF"/>
-				<path d="M4.19994 30.1001C4.19994 30.5001 3.89994 30.8001 3.49994 30.8001C3.14994 30.8001 2.79994 30.4501 2.79994 30.1001C2.79994 29.7501 3.14994 29.4001 3.49994 29.4001C3.89994 29.4001 4.19994 29.7001 4.19994 30.1001Z" fill="#2683FF"/>
-				<path d="M18.9 37.7998C19.3 37.7998 19.6 38.2665 19.6 38.8887C19.6 39.5109 19.3 39.8998 18.9 39.8998C18.5 39.8998 18.2 39.4331 18.2 38.8109C18.2 38.2665 18.5 37.7998 18.9 37.7998Z" fill="#2683FF"/>
-				<path d="M3.49994 13.2999C3.09994 13.2999 2.79994 12.8333 2.79994 12.2888C2.79994 11.7444 3.09994 11.2 3.49994 11.2C3.89994 11.2 4.19994 11.5888 4.19994 12.2111C4.14994 12.8333 3.89994 13.2999 3.49994 13.2999Z" fill="#2683FF"/>
-				<path d="M34.2528 13.2999C33.8543 13.2999 33.5555 12.8333 33.6053 12.2111C33.6053 11.5888 33.9041 11.2 34.3026 11.2C34.701 11.2 34.9999 11.6666 34.9999 12.2888C34.9501 12.8333 34.6014 13.2999 34.2528 13.2999Z" fill="#2683FF"/>
-			</svg>
-		</div>
-		<img v-if="logoPath" :src="logoPath" alt="card-logo" class="chosen-card-container__logo">
-		<div class="chosen-card-container__credentials">
-			<p class="chosen-card-container__credentials__number">xxxx<span>{{lastDigits}}</span></p>
-			<p class="chosen-card-container__credentials__name">{{fullName}}</p>
-		</div>
-		<div class="chosen-card-container__border"></div>
-		<div class="chosen-card-container__expire-container">
-			<p class="chosen-card-container__expire-container__label">{{expireLabel}}</p>
-			<p class="chosen-card-container__expire-container__date">{{expireDate}}</p>
-		</div>
-	</div>
+    <div class="chosen-card-container">
+        <div v-if="isChosen">
+            <svg class="chosen-card-container__mark" width="14" height="13" viewBox="0 0 14 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M13.5542 2.9984C14.1056 2.38014 14.0514 1.43194 13.4332 0.88054C12.8149 0.329137 11.8667 0.383336 11.3153 1.0016L13.5542 2.9984ZM4.40803 11L3.28906 11.999C3.57374 12.3178 3.98094 12.5001 4.4084 12.5C4.83586 12.4999 5.24297 12.3174 5.52749 11.9984L4.40803 11ZM3.11896 7.30374C2.56725 6.68575 1.61903 6.63202 1.00104 7.18373C0.383054 7.73544 0.329326 8.68367 0.881036 9.30166L3.11896 7.30374ZM11.3153 1.0016L3.28857 10.0016L5.52749 11.9984L13.5542 2.9984L11.3153 1.0016ZM5.52699 10.001L3.11896 7.30374L0.881036 9.30166L3.28906 11.999L5.52699 10.001Z" fill="#2683FF"/>
+            </svg>
+        </div>
+        <div v-if="!logoPath">
+            <svg class="chosen-card-container__logo" width="38" height="42" viewBox="0 0 38 42" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M37.8 12.2079C37.742 13.5198 37.1624 14.4895 36.0612 15.1739C35.8294 15.288 35.7714 15.4021 35.7714 15.6303C35.7714 19.2237 35.7714 22.8172 35.7714 26.4106C35.7714 26.6388 35.8294 26.7528 36.0033 26.8669C37.2783 27.6084 37.9738 28.9774 37.742 30.4033C37.5102 31.7723 36.409 32.913 34.96 33.1412C34.1486 33.3123 33.3372 33.1982 32.5837 32.7419C32.3519 32.6279 32.178 32.6279 32.0041 32.7419C28.8744 34.5101 25.7446 36.3354 22.6149 38.1036C22.3831 38.2177 22.3251 38.3317 22.3251 38.6169C22.3251 40.3281 20.9921 41.8682 19.3113 41.9822C17.5146 42.1534 15.8917 41.0696 15.544 39.3014C15.486 39.0162 15.486 38.7881 15.486 38.5029C15.486 38.3317 15.4281 38.2177 15.2542 38.1036C12.0665 36.2783 8.87877 34.5101 5.69106 32.6849C5.51719 32.5708 5.40127 32.5708 5.22739 32.6849C3.1409 33.9398 0.474813 32.7419 0.0691047 30.4604C-0.220687 29.0344 0.416854 27.6655 1.69194 26.8669C1.92377 26.7528 1.98173 26.6388 1.98173 26.3536C1.98173 22.7601 1.98173 19.1667 1.98173 15.5732C1.98173 15.3451 1.92377 15.231 1.7499 15.1169C0.416854 14.3754 -0.220687 13.0635 0.0691047 11.5805C0.300938 10.0975 1.4601 9.01374 2.96702 8.84262C3.77844 8.72855 4.53189 8.89966 5.22739 9.29893C5.40127 9.41301 5.51719 9.41301 5.69106 9.29893C8.87877 7.47369 12.0085 5.70548 15.1962 3.88024C15.3701 3.76616 15.486 3.65208 15.486 3.42393C15.486 1.42756 17.0509 -0.0554479 19.0794 0.001591C20.6443 0.0586299 22.0933 1.31349 22.3251 2.85354C22.3251 2.96761 22.3831 3.08169 22.3831 3.25281C22.3831 3.65208 22.5569 3.88024 22.8467 4.05135C25.9185 5.76252 28.9903 7.53073 32.0621 9.29893C32.2939 9.41301 32.4098 9.41301 32.6417 9.29893C34.7282 8.10112 37.2783 9.2419 37.742 11.5805C37.8 11.8086 37.8 12.0368 37.8 12.2079ZM10.6175 24.5283C10.5596 24.5283 10.5596 24.5854 10.5596 24.5854C8.82081 25.555 7.08206 26.5247 5.34331 27.5514C5.22739 27.6084 5.05352 27.6084 4.9376 27.5514C4.47394 27.2662 4.01027 27.0951 3.43069 27.0951C1.63398 27.038 0.590729 28.464 0.532771 29.7189C0.532771 31.1448 1.63398 32.6279 3.43069 32.6279C4.99556 32.6279 6.21269 31.373 6.21269 29.8329C6.21269 29.5478 6.27064 29.3766 6.56044 29.2626C8.4151 28.2359 10.2118 27.2092 12.0665 26.1254C12.2404 26.0113 12.4142 26.0113 12.5881 26.0684C13.7473 26.5817 14.9064 26.6958 16.1236 26.3536C16.2395 26.2965 16.4133 26.3536 16.5293 26.4106C16.877 26.5817 17.2248 26.7528 17.5725 26.8669C17.8043 26.924 17.8623 27.038 17.8623 27.2662C17.8623 30.1181 17.8623 32.913 17.8623 35.765C17.8623 35.9361 17.8043 36.0502 17.6305 36.1643C16.6452 36.6206 15.9497 37.8184 16.1236 39.0733C16.3554 40.5563 17.8623 41.64 19.3692 41.3548C20.7023 41.1267 21.5137 40.214 21.7455 38.9021C21.8614 37.9895 21.3978 36.7917 20.2386 36.1643C20.0647 36.1072 20.0068 35.9932 20.0068 35.822C20.0068 33.0842 20.0068 30.3463 20.0068 27.6084C20.0068 27.3803 20.1227 27.3232 20.3545 27.2662C20.9341 27.1521 21.5137 27.038 22.0353 26.924C22.2671 26.8669 22.499 26.8669 22.7308 26.924C23.9479 27.4373 25.1651 27.3803 26.3242 26.6958C26.4981 26.5817 26.614 26.5817 26.7879 26.6958C28.2948 27.5514 29.8017 28.407 31.3086 29.2626C31.5405 29.3766 31.6564 29.5478 31.6564 29.8329C31.4825 31.43 32.9894 32.7419 34.6702 32.5708C36.351 32.3997 37.5102 30.8026 37.1045 29.2055C36.6408 27.2662 34.5543 26.4106 32.8156 27.4373C32.6417 27.5514 32.5258 27.5514 32.2939 27.4373C30.845 26.5817 29.396 25.7832 27.9471 24.9846C27.7152 24.8706 27.7152 24.7565 27.7732 24.5283C28.2368 23.1024 27.8891 21.7905 26.8458 20.7067C26.614 20.4786 25.6867 18.9956 25.5128 18.7104C25.3969 18.4822 25.4548 18.3681 25.6867 18.254C27.8891 16.9992 30.0915 15.8014 32.236 14.5465C32.4098 14.4324 32.5258 14.4324 32.6996 14.5465C33.3372 14.9458 34.0327 15.0599 34.7282 14.9458C36.1192 14.7176 37.1624 13.4628 37.0465 11.9798C36.9306 10.3827 35.3078 9.18486 33.6849 9.52709C32.2939 9.81229 31.3666 10.896 31.4245 12.322C31.4245 12.5502 31.3666 12.7213 31.1348 12.8353C28.9323 14.0902 26.672 15.3451 24.4696 16.5999C24.2957 16.714 24.1798 16.714 24.0059 16.5429C22.9626 15.5732 21.6876 15.0028 20.2966 14.8317C19.8329 14.7747 19.8329 14.7747 19.8329 14.2613C19.8329 11.6946 19.8329 9.12782 19.8329 6.56107C19.8329 6.21883 19.8908 5.99068 20.2386 5.81956C21.4557 5.13509 21.9194 3.65208 21.3978 2.34019C20.8182 1.08533 19.3692 0.343824 18.0362 0.800136C16.8191 1.14237 16.1236 2.05499 16.0076 3.25281C15.8917 4.22247 16.3554 5.30621 17.5146 5.8766C17.6884 5.99068 17.8043 6.04772 17.8043 6.27587C17.8043 9.12782 17.8043 11.9227 17.8043 14.7747C17.8043 15.0028 17.6884 15.0599 17.5146 15.1739C16.935 15.4591 16.3554 15.6873 15.8917 16.0866C15.3701 16.5429 14.8485 16.771 14.095 16.771C14.0371 16.771 13.9791 16.771 13.9211 16.771C13.7473 16.771 13.5154 16.771 13.3416 16.657C11.0812 15.4021 8.87877 14.1472 6.61839 12.8924C6.27064 12.7213 6.15473 12.4931 6.21269 12.1509C6.21269 11.9798 6.21269 11.8657 6.15473 11.6946C5.92289 10.3256 4.58985 9.18486 2.96702 9.47005C1.34419 9.75525 0.358896 11.1812 0.590729 12.6642C0.938479 14.6036 3.19885 15.5732 4.87964 14.5465C5.05352 14.4324 5.22739 14.4324 5.40127 14.5465C7.08206 15.5162 8.76285 16.4858 10.5016 17.4555C10.7914 17.6266 11.0812 17.7977 11.371 17.9689C9.45835 19.9652 9.22652 22.1327 10.6175 24.5283Z" fill="#2683FF"/>
+                <path d="M15.7454 17.8843C16.2059 17.9425 16.3786 17.7678 16.7239 17.4768C18.1054 16.1381 19.7747 15.7889 21.5592 16.3709C23.3436 16.953 24.4373 18.2335 24.7827 20.096C24.8402 20.4452 25.0129 20.6781 25.3007 20.8527C26.2217 21.3765 26.7398 22.5406 26.5671 23.4719C26.3369 24.6942 25.531 25.5672 24.3797 25.7419C23.7465 25.8583 23.1709 25.7419 22.6529 25.4508C22.4226 25.2762 22.2499 25.3344 21.9621 25.4508C20.3504 26.1493 18.8537 26.0329 17.3571 25.1016C17.1269 24.9852 16.9542 24.927 16.7239 25.0434C14.6517 25.7419 12.5219 24.5196 12.0038 22.4824C11.4282 20.096 13.3277 17.7678 15.7454 17.8843Z" fill="#2683FF"/>
+                <path d="M33.5999 30.1001C33.5999 29.7001 33.8999 29.4001 34.2999 29.4001C34.6999 29.4001 34.9999 29.7001 34.9999 30.1001C34.9999 30.4501 34.6499 30.8001 34.2999 30.8001C33.8999 30.8001 33.5999 30.5001 33.5999 30.1001Z" fill="#2683FF"/>
+                <path d="M18.2 3.4998C18.2 3.0998 18.5111 2.7998 18.9259 2.7998C19.2889 2.7998 19.6 3.0998 19.6 3.4998C19.6 3.8498 19.2889 4.1998 18.8741 4.1998C18.5111 4.1498 18.2 3.8498 18.2 3.4998Z" fill="#2683FF"/>
+                <path d="M4.19994 30.1001C4.19994 30.5001 3.89994 30.8001 3.49994 30.8001C3.14994 30.8001 2.79994 30.4501 2.79994 30.1001C2.79994 29.7501 3.14994 29.4001 3.49994 29.4001C3.89994 29.4001 4.19994 29.7001 4.19994 30.1001Z" fill="#2683FF"/>
+                <path d="M18.9 37.7998C19.3 37.7998 19.6 38.2665 19.6 38.8887C19.6 39.5109 19.3 39.8998 18.9 39.8998C18.5 39.8998 18.2 39.4331 18.2 38.8109C18.2 38.2665 18.5 37.7998 18.9 37.7998Z" fill="#2683FF"/>
+                <path d="M3.49994 13.2999C3.09994 13.2999 2.79994 12.8333 2.79994 12.2888C2.79994 11.7444 3.09994 11.2 3.49994 11.2C3.89994 11.2 4.19994 11.5888 4.19994 12.2111C4.14994 12.8333 3.89994 13.2999 3.49994 13.2999Z" fill="#2683FF"/>
+                <path d="M34.2528 13.2999C33.8543 13.2999 33.5555 12.8333 33.6053 12.2111C33.6053 11.5888 33.9041 11.2 34.3026 11.2C34.701 11.2 34.9999 11.6666 34.9999 12.2888C34.9501 12.8333 34.6014 13.2999 34.2528 13.2999Z" fill="#2683FF"/>
+            </svg>
+        </div>
+        <img v-if="logoPath" :src="logoPath" alt="card-logo" class="chosen-card-container__logo">
+        <div class="chosen-card-container__credentials">
+            <p class="chosen-card-container__credentials__number">xxxx<span>{{lastDigits}}</span></p>
+            <p class="chosen-card-container__credentials__name">{{fullName}}</p>
+        </div>
+        <div class="chosen-card-container__border"></div>
+        <div class="chosen-card-container__expire-container">
+            <p class="chosen-card-container__expire-container__label">{{expireLabel}}</p>
+            <p class="chosen-card-container__expire-container__date">{{expireDate}}</p>
+        </div>
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/project/DeleteProjectPopup.vue b/web/satellite/src/components/project/DeleteProjectPopup.vue
index 589a9661b..41a44141d 100644
--- a/web/satellite/src/components/project/DeleteProjectPopup.vue
+++ b/web/satellite/src/components/project/DeleteProjectPopup.vue
@@ -22,7 +22,6 @@
                         v-model="projectName"
                         v-on:keyup="resetError" >
                 </div>
-                
                 <div class="delete-project-popup__form-container__button-container">
                     <Button label="Cancel" width="205px" height="48px" :onPress="onCloseClick" isWhite/>
                     <Button 
diff --git a/web/satellite/src/components/project/ProjectCreationSuccessPopup.vue b/web/satellite/src/components/project/ProjectCreationSuccessPopup.vue
index f588df471..7550ee81f 100644
--- a/web/satellite/src/components/project/ProjectCreationSuccessPopup.vue
+++ b/web/satellite/src/components/project/ProjectCreationSuccessPopup.vue
@@ -2,50 +2,50 @@
 // See LICENSE for copying information.
 
 <template>
-	<div v-if="isPopupShown" class="project-creation-success-popup-container">
-		<div  class="project-creation-success-popup" id='successfulProjectCreationPopup'>
-			<div class="project-creation-success-popup__info-panel-container">
-				<svg width="300" height="233" viewBox="0 0 300 233" fill="none" xmlns="http://www.w3.org/2000/svg">
-					<path d="M175.712 232.904C239.885 232.904 291.878 180.748 291.878 116.411C291.878 52.0744 239.885 0 175.712 0C111.539 0 59.5459 52.1561 59.5459 116.493C59.5459 180.83 111.539 232.904 175.712 232.904Z" fill="#2683FF"/>
-					<path d="M239.721 179.603H113.173C107.614 179.603 103.036 175.025 103.036 169.466V68.9143C103.036 63.3553 107.614 58.7773 113.173 58.7773H239.639C245.198 58.7773 249.776 63.3553 249.776 68.9143V169.466C249.776 175.025 245.28 179.603 239.721 179.603Z" fill="#499FFC"/>
-					<path d="M233.428 168.897H121.186C118.161 168.897 115.627 166.363 115.627 163.338V77.8285C115.627 74.8038 118.161 72.2695 121.186 72.2695H233.428C236.453 72.2695 238.987 74.8038 238.987 77.8285V163.338C238.987 166.363 236.453 168.897 233.428 168.897Z" fill="white"/>
-					<path d="M162.06 161.538C161.406 161.538 160.834 160.966 160.834 160.312V80.361C160.834 79.707 161.406 79.1348 162.06 79.1348C162.714 79.1348 163.286 79.707 163.286 80.361V160.312C163.286 160.966 162.714 161.538 162.06 161.538Z" fill="black"/>
-					<path d="M191.326 133.416L171.788 119.11L191.326 103.251C191.898 102.76 191.98 101.943 191.49 101.37C190.999 100.798 190.182 100.716 189.609 101.207L168.845 118.129C168.518 118.374 168.354 118.783 168.354 119.192C168.354 119.6 168.6 120.009 168.927 120.254L189.855 135.542C190.1 135.705 190.345 135.787 190.672 135.787C191.081 135.787 191.49 135.623 191.735 135.215C192.062 134.642 191.898 133.825 191.326 133.416Z" fill="#2683FF"/>
-					<path d="M232.772 118.127L211.844 101.123C211.272 100.632 210.454 100.714 209.964 101.286C209.473 101.859 209.555 102.676 210.127 103.167L229.666 119.026L210.127 133.332C209.555 133.741 209.392 134.558 209.882 135.212C210.127 135.539 210.536 135.785 210.945 135.785C211.19 135.785 211.517 135.703 211.762 135.539L232.69 120.252C233.017 120.007 233.181 119.598 233.263 119.189C233.263 118.781 233.099 118.372 232.772 118.127Z" fill="#2683FF"/>
-					<path d="M204.487 97.3635C203.751 97.2 203.097 97.6905 202.934 98.4263L195.249 139.464C195.086 140.2 195.576 140.854 196.312 141.018C196.476 141.018 196.639 141.018 196.803 141.018C197.293 140.936 197.784 140.527 197.865 139.955L205.55 98.9168C205.713 98.2628 205.223 97.527 204.487 97.3635Z" fill="#2683FF"/>
-					<path d="M159.852 69.403H118.242C116.607 69.403 115.217 68.0132 115.217 66.3782C115.217 64.7433 116.607 63.3535 118.242 63.3535H159.852C161.487 63.3535 162.877 64.7433 162.877 66.3782C162.877 68.0132 161.569 69.403 159.852 69.403Z" fill="white"/>
-					<path fill-rule="evenodd" clip-rule="evenodd" d="M298.253 150.664C299.806 150.664 300.951 151.89 300.951 153.444C300.215 174.535 291.304 193.583 277.325 207.562C263.346 221.541 244.299 230.451 223.207 231.187C221.654 231.269 220.428 230.043 220.428 228.49V204.537C220.428 203.065 221.572 201.921 223.044 201.839C236.124 201.185 247.896 195.544 256.643 186.879C265.39 178.132 270.949 166.36 271.603 153.28C271.685 151.809 272.829 150.664 274.301 150.664H298.253Z" fill="#DEDEFC"/>
-					<path d="M221.655 225.058C226.892 225.058 231.138 220.812 231.138 215.575C231.138 210.337 226.892 206.092 221.655 206.092C216.418 206.092 212.172 210.337 212.172 215.575C212.172 220.812 216.418 225.058 221.655 225.058Z" fill="#499FFC"/>
-					<path d="M67.3937 30.902C74.3424 30.902 80.0649 25.016 80.0649 17.8221C80.0649 10.6281 74.3424 4.74219 67.3937 4.74219C60.445 4.74219 54.7225 10.6281 54.7225 17.8221C54.6408 25.0978 60.3633 30.902 67.3937 30.902Z" fill="#499FFC"/>
-					<path d="M67.3943 23.5445C70.5008 23.5445 73.1168 21.0103 73.1168 17.8221C73.1168 14.7156 70.5826 12.0996 67.3943 12.0996C64.2879 12.0996 61.6719 14.6338 61.6719 17.8221C61.6719 21.0103 64.2061 23.5445 67.3943 23.5445Z" fill="white"/>
-					<path fill-rule="evenodd" clip-rule="evenodd" d="M138.843 36.3769C141.786 36.3769 144.238 33.9244 144.238 30.9814C144.238 28.0384 141.786 25.5859 138.843 25.5859C135.9 25.5859 133.447 28.0384 133.447 30.9814C133.366 33.9244 135.818 36.3769 138.843 36.3769Z" fill="#6CB9FF"/>
-					<path fill-rule="evenodd" clip-rule="evenodd" d="M102.383 207.398C105.326 207.398 107.778 204.946 107.778 202.003C107.778 199.06 105.326 196.607 102.383 196.607C99.4398 196.607 96.9873 199.06 96.9873 202.003C96.9873 205.028 99.358 207.398 102.383 207.398Z" fill="white"/>
-					<path fill-rule="evenodd" clip-rule="evenodd" d="M117.916 207.398C120.859 207.398 123.311 204.946 123.311 202.003C123.311 199.06 120.859 196.607 117.916 196.607C114.973 196.607 112.521 199.06 112.521 202.003C112.439 205.028 114.891 207.398 117.916 207.398Z" fill="white"/>
-					<path fill-rule="evenodd" clip-rule="evenodd" d="M133.366 207.398C136.309 207.398 138.762 204.946 138.762 202.003C138.762 199.06 136.309 196.607 133.366 196.607C130.423 196.607 127.971 199.06 127.971 202.003C127.971 205.028 130.423 207.398 133.366 207.398Z" fill="#6CB9FF"/>
-					<path d="M124.781 110.036H140.068C141.622 110.036 142.93 108.81 142.93 107.338C142.93 105.867 141.622 104.641 140.068 104.641H124.781C123.228 104.641 121.92 105.867 121.92 107.338C121.92 108.81 123.228 110.036 124.781 110.036Z" fill="#0F002D"/>
-					<path d="M124.699 99.2448H151.513C153.066 99.2448 154.374 97.855 154.374 96.22C154.374 94.5851 153.066 93.1953 151.513 93.1953H124.781C123.228 93.1953 121.92 94.5851 121.92 96.22C121.92 97.855 123.146 99.2448 124.699 99.2448Z" fill="#0F002D"/>
-					<path d="M126.09 125.405H127.888C129.441 125.405 130.749 124.015 130.749 122.38C130.749 120.663 129.523 119.355 127.888 119.355H126.09C124.537 119.355 123.229 120.745 123.229 122.38C123.31 124.097 124.537 125.405 126.09 125.405Z" fill="#2683FF"/>
-					<path d="M136.881 125.405H138.679C140.232 125.405 141.54 124.015 141.54 122.38C141.54 120.663 140.314 119.355 138.679 119.355H136.881C135.328 119.355 134.02 120.745 134.02 122.38C134.101 124.097 135.328 125.405 136.881 125.405Z" fill="#2683FF"/>
-					<path d="M116.361 136.03C115.952 136.03 115.625 136.03 115.298 136.111C114.644 136.193 113.99 135.784 113.745 135.212C106.061 121.233 91.1824 111.75 74.015 111.75C58.4826 111.75 44.7487 119.516 36.6555 131.37C36.2468 131.942 35.511 132.187 34.857 132.106C32.8133 131.697 30.6878 131.452 28.5623 131.452C12.5395 131.37 -0.376953 144.123 -0.376953 159.982C-0.376953 159.982 -0.376953 159.982 -0.376953 160.064C-0.376953 160.963 0.358791 161.699 1.33978 161.699H138.761C139.66 161.699 140.477 160.963 140.477 160.064V159.982C140.477 146.739 129.686 136.03 116.361 136.03Z" fill="#DEDEFC"/>
-				</svg>
-			</div>
-			<div class="project-creation-success-popup__form-container">
-				<h2 class="project-creation-success-popup__form-container__main-label-text">Congrats!</h2>
-				<p>You just created your project. Next, we recommend you create your first API Key for this project. API Keys allow developers to manage their projects and build applications on top of the Storj network through our
-					<a href="https://github.com/storj/storj/wiki/Uplink-CLI" target="_blank">Uplink CLI.</a>
-				</p>
-				<div class="project-creation-success-popup__form-container__button-container">
-					<Button label="I will do it later" width="214px" height="50px" :onPress="onCloseClick" isWhite />
-					<Button label="Create first API Key" width="214px" height="50px" :onPress="onCreateAPIKeyClick" />
-				</div>
-			</div>
-			<div class="project-creation-success-popup__close-cross-container" v-on:click="onCloseClick">
-				<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" >
-					<path d="M15.7071 1.70711C16.0976 1.31658 16.0976 0.683417 15.7071 0.292893C15.3166 -0.0976311 14.6834 -0.0976311 14.2929 0.292893L15.7071 1.70711ZM0.292893 14.2929C-0.0976311 14.6834 -0.0976311 15.3166 0.292893 15.7071C0.683417 16.0976 1.31658 16.0976 1.70711 15.7071L0.292893 14.2929ZM1.70711 0.292893C1.31658 -0.0976311 0.683417 -0.0976311 0.292893 0.292893C-0.0976311 0.683417 -0.0976311 1.31658 0.292893 1.70711L1.70711 0.292893ZM14.2929 15.7071C14.6834 16.0976 15.3166 16.0976 15.7071 15.7071C16.0976 15.3166 16.0976 14.6834 15.7071 14.2929L14.2929 15.7071ZM14.2929 0.292893L0.292893 14.2929L1.70711 15.7071L15.7071 1.70711L14.2929 0.292893ZM0.292893 1.70711L14.2929 15.7071L15.7071 14.2929L1.70711 0.292893L0.292893 1.70711Z" fill="#384B65"/>
-				</svg>
-			</div>
-		</div>
-	</div>
+    <div v-if="isPopupShown" class="project-creation-success-popup-container">
+        <div  class="project-creation-success-popup" id='successfulProjectCreationPopup'>
+            <div class="project-creation-success-popup__info-panel-container">
+                <svg width="300" height="233" viewBox="0 0 300 233" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M175.712 232.904C239.885 232.904 291.878 180.748 291.878 116.411C291.878 52.0744 239.885 0 175.712 0C111.539 0 59.5459 52.1561 59.5459 116.493C59.5459 180.83 111.539 232.904 175.712 232.904Z" fill="#2683FF"/>
+                    <path d="M239.721 179.603H113.173C107.614 179.603 103.036 175.025 103.036 169.466V68.9143C103.036 63.3553 107.614 58.7773 113.173 58.7773H239.639C245.198 58.7773 249.776 63.3553 249.776 68.9143V169.466C249.776 175.025 245.28 179.603 239.721 179.603Z" fill="#499FFC"/>
+                    <path d="M233.428 168.897H121.186C118.161 168.897 115.627 166.363 115.627 163.338V77.8285C115.627 74.8038 118.161 72.2695 121.186 72.2695H233.428C236.453 72.2695 238.987 74.8038 238.987 77.8285V163.338C238.987 166.363 236.453 168.897 233.428 168.897Z" fill="white"/>
+                    <path d="M162.06 161.538C161.406 161.538 160.834 160.966 160.834 160.312V80.361C160.834 79.707 161.406 79.1348 162.06 79.1348C162.714 79.1348 163.286 79.707 163.286 80.361V160.312C163.286 160.966 162.714 161.538 162.06 161.538Z" fill="black"/>
+                    <path d="M191.326 133.416L171.788 119.11L191.326 103.251C191.898 102.76 191.98 101.943 191.49 101.37C190.999 100.798 190.182 100.716 189.609 101.207L168.845 118.129C168.518 118.374 168.354 118.783 168.354 119.192C168.354 119.6 168.6 120.009 168.927 120.254L189.855 135.542C190.1 135.705 190.345 135.787 190.672 135.787C191.081 135.787 191.49 135.623 191.735 135.215C192.062 134.642 191.898 133.825 191.326 133.416Z" fill="#2683FF"/>
+                    <path d="M232.772 118.127L211.844 101.123C211.272 100.632 210.454 100.714 209.964 101.286C209.473 101.859 209.555 102.676 210.127 103.167L229.666 119.026L210.127 133.332C209.555 133.741 209.392 134.558 209.882 135.212C210.127 135.539 210.536 135.785 210.945 135.785C211.19 135.785 211.517 135.703 211.762 135.539L232.69 120.252C233.017 120.007 233.181 119.598 233.263 119.189C233.263 118.781 233.099 118.372 232.772 118.127Z" fill="#2683FF"/>
+                    <path d="M204.487 97.3635C203.751 97.2 203.097 97.6905 202.934 98.4263L195.249 139.464C195.086 140.2 195.576 140.854 196.312 141.018C196.476 141.018 196.639 141.018 196.803 141.018C197.293 140.936 197.784 140.527 197.865 139.955L205.55 98.9168C205.713 98.2628 205.223 97.527 204.487 97.3635Z" fill="#2683FF"/>
+                    <path d="M159.852 69.403H118.242C116.607 69.403 115.217 68.0132 115.217 66.3782C115.217 64.7433 116.607 63.3535 118.242 63.3535H159.852C161.487 63.3535 162.877 64.7433 162.877 66.3782C162.877 68.0132 161.569 69.403 159.852 69.403Z" fill="white"/>
+                    <path fill-rule="evenodd" clip-rule="evenodd" d="M298.253 150.664C299.806 150.664 300.951 151.89 300.951 153.444C300.215 174.535 291.304 193.583 277.325 207.562C263.346 221.541 244.299 230.451 223.207 231.187C221.654 231.269 220.428 230.043 220.428 228.49V204.537C220.428 203.065 221.572 201.921 223.044 201.839C236.124 201.185 247.896 195.544 256.643 186.879C265.39 178.132 270.949 166.36 271.603 153.28C271.685 151.809 272.829 150.664 274.301 150.664H298.253Z" fill="#DEDEFC"/>
+                    <path d="M221.655 225.058C226.892 225.058 231.138 220.812 231.138 215.575C231.138 210.337 226.892 206.092 221.655 206.092C216.418 206.092 212.172 210.337 212.172 215.575C212.172 220.812 216.418 225.058 221.655 225.058Z" fill="#499FFC"/>
+                    <path d="M67.3937 30.902C74.3424 30.902 80.0649 25.016 80.0649 17.8221C80.0649 10.6281 74.3424 4.74219 67.3937 4.74219C60.445 4.74219 54.7225 10.6281 54.7225 17.8221C54.6408 25.0978 60.3633 30.902 67.3937 30.902Z" fill="#499FFC"/>
+                    <path d="M67.3943 23.5445C70.5008 23.5445 73.1168 21.0103 73.1168 17.8221C73.1168 14.7156 70.5826 12.0996 67.3943 12.0996C64.2879 12.0996 61.6719 14.6338 61.6719 17.8221C61.6719 21.0103 64.2061 23.5445 67.3943 23.5445Z" fill="white"/>
+                    <path fill-rule="evenodd" clip-rule="evenodd" d="M138.843 36.3769C141.786 36.3769 144.238 33.9244 144.238 30.9814C144.238 28.0384 141.786 25.5859 138.843 25.5859C135.9 25.5859 133.447 28.0384 133.447 30.9814C133.366 33.9244 135.818 36.3769 138.843 36.3769Z" fill="#6CB9FF"/>
+                    <path fill-rule="evenodd" clip-rule="evenodd" d="M102.383 207.398C105.326 207.398 107.778 204.946 107.778 202.003C107.778 199.06 105.326 196.607 102.383 196.607C99.4398 196.607 96.9873 199.06 96.9873 202.003C96.9873 205.028 99.358 207.398 102.383 207.398Z" fill="white"/>
+                    <path fill-rule="evenodd" clip-rule="evenodd" d="M117.916 207.398C120.859 207.398 123.311 204.946 123.311 202.003C123.311 199.06 120.859 196.607 117.916 196.607C114.973 196.607 112.521 199.06 112.521 202.003C112.439 205.028 114.891 207.398 117.916 207.398Z" fill="white"/>
+                    <path fill-rule="evenodd" clip-rule="evenodd" d="M133.366 207.398C136.309 207.398 138.762 204.946 138.762 202.003C138.762 199.06 136.309 196.607 133.366 196.607C130.423 196.607 127.971 199.06 127.971 202.003C127.971 205.028 130.423 207.398 133.366 207.398Z" fill="#6CB9FF"/>
+                    <path d="M124.781 110.036H140.068C141.622 110.036 142.93 108.81 142.93 107.338C142.93 105.867 141.622 104.641 140.068 104.641H124.781C123.228 104.641 121.92 105.867 121.92 107.338C121.92 108.81 123.228 110.036 124.781 110.036Z" fill="#0F002D"/>
+                    <path d="M124.699 99.2448H151.513C153.066 99.2448 154.374 97.855 154.374 96.22C154.374 94.5851 153.066 93.1953 151.513 93.1953H124.781C123.228 93.1953 121.92 94.5851 121.92 96.22C121.92 97.855 123.146 99.2448 124.699 99.2448Z" fill="#0F002D"/>
+                    <path d="M126.09 125.405H127.888C129.441 125.405 130.749 124.015 130.749 122.38C130.749 120.663 129.523 119.355 127.888 119.355H126.09C124.537 119.355 123.229 120.745 123.229 122.38C123.31 124.097 124.537 125.405 126.09 125.405Z" fill="#2683FF"/>
+                    <path d="M136.881 125.405H138.679C140.232 125.405 141.54 124.015 141.54 122.38C141.54 120.663 140.314 119.355 138.679 119.355H136.881C135.328 119.355 134.02 120.745 134.02 122.38C134.101 124.097 135.328 125.405 136.881 125.405Z" fill="#2683FF"/>
+                    <path d="M116.361 136.03C115.952 136.03 115.625 136.03 115.298 136.111C114.644 136.193 113.99 135.784 113.745 135.212C106.061 121.233 91.1824 111.75 74.015 111.75C58.4826 111.75 44.7487 119.516 36.6555 131.37C36.2468 131.942 35.511 132.187 34.857 132.106C32.8133 131.697 30.6878 131.452 28.5623 131.452C12.5395 131.37 -0.376953 144.123 -0.376953 159.982C-0.376953 159.982 -0.376953 159.982 -0.376953 160.064C-0.376953 160.963 0.358791 161.699 1.33978 161.699H138.761C139.66 161.699 140.477 160.963 140.477 160.064V159.982C140.477 146.739 129.686 136.03 116.361 136.03Z" fill="#DEDEFC"/>
+                </svg>
+            </div>
+            <div class="project-creation-success-popup__form-container">
+                <h2 class="project-creation-success-popup__form-container__main-label-text">Congrats!</h2>
+                <p>You just created your project. Next, we recommend you create your first API Key for this project. API Keys allow developers to manage their projects and build applications on top of the Storj network through our
+                    <a href="https://github.com/storj/storj/wiki/Uplink-CLI" target="_blank">Uplink CLI.</a>
+                </p>
+                <div class="project-creation-success-popup__form-container__button-container">
+                    <Button label="I will do it later" width="214px" height="50px" :onPress="onCloseClick" isWhite />
+                    <Button label="Create first API Key" width="214px" height="50px" :onPress="onCreateAPIKeyClick" />
+                </div>
+            </div>
+            <div class="project-creation-success-popup__close-cross-container" v-on:click="onCloseClick">
+                <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" >
+                    <path d="M15.7071 1.70711C16.0976 1.31658 16.0976 0.683417 15.7071 0.292893C15.3166 -0.0976311 14.6834 -0.0976311 14.2929 0.292893L15.7071 1.70711ZM0.292893 14.2929C-0.0976311 14.6834 -0.0976311 15.3166 0.292893 15.7071C0.683417 16.0976 1.31658 16.0976 1.70711 15.7071L0.292893 14.2929ZM1.70711 0.292893C1.31658 -0.0976311 0.683417 -0.0976311 0.292893 0.292893C-0.0976311 0.683417 -0.0976311 1.31658 0.292893 1.70711L1.70711 0.292893ZM14.2929 15.7071C14.6834 16.0976 15.3166 16.0976 15.7071 15.7071C16.0976 15.3166 16.0976 14.6834 15.7071 14.2929L14.2929 15.7071ZM14.2929 0.292893L0.292893 14.2929L1.70711 15.7071L15.7071 1.70711L14.2929 0.292893ZM0.292893 1.70711L14.2929 15.7071L15.7071 14.2929L1.70711 0.292893L0.292893 1.70711Z" fill="#384B65"/>
+                </svg>
+            </div>
+        </div>
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/project/ProjectDetails.vue b/web/satellite/src/components/project/ProjectDetails.vue
index 194f9d34c..1b3038164 100644
--- a/web/satellite/src/components/project/ProjectDetails.vue
+++ b/web/satellite/src/components/project/ProjectDetails.vue
@@ -2,48 +2,48 @@
 // See LICENSE for copying information.
 
 <template>
-	<div>
-		<div class="project-details">
-			<h1>Project Details</h1>
-			<div class="project-details-info-container">
-				<div class="project-details-info-container__name-container">
-					<h2>Project Name</h2>
-					<h3>{{name}}</h3>
-				</div>
-			</div>
-			<div class="project-details-info-container">
-				<div class="project-details-info-container__description-container" v-if="!isEditing">
-					<div class="project-details-info-container__description-container__text">
-						<h2>Description</h2>
-						<h3>{{description}}</h3>
-					</div>
-					<div title="Edit">
-						<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg" v-on:click="toggleEditing">
-							<rect width="40" height="40" rx="4" fill="#E2ECF7"/>
-							<path d="M19.0901 21.4605C19.3416 21.7259 19.6695 21.8576 19.9995 21.8576C20.3295 21.8576 20.6574 21.7259 20.9089 21.4605L28.6228 13.3181C29.1257 12.7871 29.1257 11.9291 28.6228 11.3982C28.1198 10.8673 27.3069 10.8673 26.8039 11.3982L19.0901 19.5406C18.5891 20.0715 18.5891 20.9295 19.0901 21.4605ZM27.7134 19.1435C27.0031 19.1435 26.4277 19.7509 26.4277 20.5005V27.2859H13.5713V13.7152H19.9995C20.7097 13.7152 21.2851 13.1078 21.2851 12.3581C21.2851 11.6085 20.7097 11.0011 19.9995 11.0011H13.5713C12.1508 11.0011 11 12.2158 11 13.7152V27.2859C11 28.7852 12.1508 30 13.5713 30H26.4277C27.8482 30 28.999 28.7852 28.999 27.2859V20.5005C28.999 19.7509 28.4236 19.1435 27.7134 19.1435Z" fill="#2683FF"/>
-						</svg>
-					</div>
-				</div>
-				<div class="project-details-info-container__description-container--editing" v-if="isEditing">
-					<HeaderedInput
-						label="Description"
-						placeholder ="Enter Description"
-						width="70vw"
-						height="10vh"
-						isMultiline
-						@setData="setNewDescription" />
-					<div class="project-details-info-container__description-container__buttons-area">
-						<Button label="Cancel" width="180px" height="48px" :onPress="toggleEditing" isWhite/>
-						<Button label="Save" width="180px" height="48px" :onPress="onSaveButtonClick"/>
-					</div>
-				</div>
-			</div>
-			<div class="project-details__button-area" id="deleteProjectPopupButton">
-				<Button class="delete-project" label="Delete project" width="180px" height="48px" :onPress="toggleDeleteDialog" isDeletion/>
-			</div>
-		</div>
-		<DeleteProjectPopup v-if="isPopupShown" />
-	</div>
+    <div>
+        <div class="project-details">
+            <h1>Project Details</h1>
+            <div class="project-details-info-container">
+                <div class="project-details-info-container__name-container">
+                    <h2>Project Name</h2>
+                    <h3>{{name}}</h3>
+                </div>
+            </div>
+            <div class="project-details-info-container">
+                <div class="project-details-info-container__description-container" v-if="!isEditing">
+                    <div class="project-details-info-container__description-container__text">
+                        <h2>Description</h2>
+                        <h3>{{description}}</h3>
+                    </div>
+                    <div title="Edit">
+                        <svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg" v-on:click="toggleEditing">
+                            <rect width="40" height="40" rx="4" fill="#E2ECF7"/>
+                            <path d="M19.0901 21.4605C19.3416 21.7259 19.6695 21.8576 19.9995 21.8576C20.3295 21.8576 20.6574 21.7259 20.9089 21.4605L28.6228 13.3181C29.1257 12.7871 29.1257 11.9291 28.6228 11.3982C28.1198 10.8673 27.3069 10.8673 26.8039 11.3982L19.0901 19.5406C18.5891 20.0715 18.5891 20.9295 19.0901 21.4605ZM27.7134 19.1435C27.0031 19.1435 26.4277 19.7509 26.4277 20.5005V27.2859H13.5713V13.7152H19.9995C20.7097 13.7152 21.2851 13.1078 21.2851 12.3581C21.2851 11.6085 20.7097 11.0011 19.9995 11.0011H13.5713C12.1508 11.0011 11 12.2158 11 13.7152V27.2859C11 28.7852 12.1508 30 13.5713 30H26.4277C27.8482 30 28.999 28.7852 28.999 27.2859V20.5005C28.999 19.7509 28.4236 19.1435 27.7134 19.1435Z" fill="#2683FF"/>
+                        </svg>
+                    </div>
+                </div>
+                <div class="project-details-info-container__description-container--editing" v-if="isEditing">
+                    <HeaderedInput
+                        label="Description"
+                        placeholder ="Enter Description"
+                        width="70vw"
+                        height="10vh"
+                        isMultiline
+                        @setData="setNewDescription" />
+                    <div class="project-details-info-container__description-container__buttons-area">
+                        <Button label="Cancel" width="180px" height="48px" :onPress="toggleEditing" isWhite/>
+                        <Button label="Save" width="180px" height="48px" :onPress="onSaveButtonClick"/>
+                    </div>
+                </div>
+            </div>
+            <div class="project-details__button-area" id="deleteProjectPopupButton">
+                <Button class="delete-project" label="Delete project" width="180px" height="48px" :onPress="toggleDeleteDialog" isDeletion/>
+            </div>
+        </div>
+        <DeleteProjectPopup v-if="isPopupShown" />
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/project/ProjectPaymentMethods.vue b/web/satellite/src/components/project/ProjectPaymentMethods.vue
index 5fb46cb18..a84ef667b 100644
--- a/web/satellite/src/components/project/ProjectPaymentMethods.vue
+++ b/web/satellite/src/components/project/ProjectPaymentMethods.vue
@@ -2,46 +2,46 @@
 // See LICENSE for copying information.
 
 <template>
-	<div class="payment-methods-container">
-		<p class="payment-methods-container__title">Credit or Debit Cards</p>
-		<div class="payment-methods-container__card-container">
-			<div class="payment-methods-container__card-container__info-area">
-				<img class="payment-methods-container__card-container__info-area__card-logo" src="../../../static/images/Logo.svg">
-				<div class="payment-methods-container__card-container__info-area__info-container">
-					<h1>xxxx 0000</h1>
-					<h2>Shawn Wilkinson</h2>
-				</div>
-				<div class="payment-methods-container__card-container__info-area__expire-container">
-					<h2>Expires</h2>
-					<h1>12/2020</h1>
-				</div>
-				<h3 class="payment-methods-container__card-container__info-area__added-text">Added on 29 May 2019</h3>
-			</div>
-			<div class="payment-methods-container__card-container__default-button" v-if="true">
-				<p class="payment-methods-container__card-container__default-button__label">Default</p>
-			</div>
-			<div class="payment-methods-container__card-container__button-area" v-if="false">
-				<div class="payment-methods-container__card-container__button-area__make-button">
-					<p class="payment-methods-container__card-container__button-area__make-button__label">Make Default</p>
-				</div>
-				<svg class="payment-methods-container__card-container__button-area__delete-button"
-				     width="34"
-				     height="34"
-				     viewBox="0 0 34 34"
-				     fill="none"
-				     xmlns="http://www.w3.org/2000/svg">
-					<rect width="34" height="34" rx="17" fill="#EB5757"/>
-					<path d="M19.7834 11.9727V11.409C19.7834 10.6576 19.1215 10 18.2706 10H16.0014C15.1504 10 14.4886 10.6576 14.4886 11.409V11.9727H10.7065V13.1938H12.0302V22.3057C12.0302 23.5269 12.9758 24.4662 14.0158 24.4662H20.1616C21.2962 24.4662 22.1471 23.5269 22.1471 22.3057V13.1938H23.4709V11.9727H19.7834ZM16.6632 22.3057H15.3395V14.2271H16.6632V22.3057ZM18.9324 22.3057H17.6087V14.2271H18.9324V22.3057Z" fill="white"/>
-				</svg>
-			</div>
-		</div>
-		<Button
-			class="payment-methods-container__add-button"
-			label="Add Card"
-			width="140px"
-			height="48px"
-			isDisabled />
-	</div>
+    <div class="payment-methods-container">
+        <p class="payment-methods-container__title">Credit or Debit Cards</p>
+        <div class="payment-methods-container__card-container">
+            <div class="payment-methods-container__card-container__info-area">
+                <img class="payment-methods-container__card-container__info-area__card-logo" src="../../../static/images/Logo.svg">
+                <div class="payment-methods-container__card-container__info-area__info-container">
+                    <h1>xxxx 0000</h1>
+                    <h2>Shawn Wilkinson</h2>
+                </div>
+                <div class="payment-methods-container__card-container__info-area__expire-container">
+                    <h2>Expires</h2>
+                    <h1>12/2020</h1>
+                </div>
+                <h3 class="payment-methods-container__card-container__info-area__added-text">Added on 29 May 2019</h3>
+            </div>
+            <div class="payment-methods-container__card-container__default-button" v-if="true">
+                <p class="payment-methods-container__card-container__default-button__label">Default</p>
+            </div>
+            <div class="payment-methods-container__card-container__button-area" v-if="false">
+                <div class="payment-methods-container__card-container__button-area__make-button">
+                    <p class="payment-methods-container__card-container__button-area__make-button__label">Make Default</p>
+                </div>
+                <svg class="payment-methods-container__card-container__button-area__delete-button"
+                    width="34"
+                    height="34"
+                    viewBox="0 0 34 34"
+                    fill="none"
+                    xmlns="http://www.w3.org/2000/svg">
+                        <rect width="34" height="34" rx="17" fill="#EB5757"/>
+                        <path d="M19.7834 11.9727V11.409C19.7834 10.6576 19.1215 10 18.2706 10H16.0014C15.1504 10 14.4886 10.6576 14.4886 11.409V11.9727H10.7065V13.1938H12.0302V22.3057C12.0302 23.5269 12.9758 24.4662 14.0158 24.4662H20.1616C21.2962 24.4662 22.1471 23.5269 22.1471 22.3057V13.1938H23.4709V11.9727H19.7834ZM16.6632 22.3057H15.3395V14.2271H16.6632V22.3057ZM18.9324 22.3057H17.6087V14.2271H18.9324V22.3057Z" fill="white"/>
+                </svg>
+            </div>
+        </div>
+        <Button
+            class="payment-methods-container__add-button"
+            label="Add Card"
+            width="140px"
+            height="48px"
+            isDisabled />
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/project/UsageReport.vue b/web/satellite/src/components/project/UsageReport.vue
index ffae599aa..f9cba90ff 100644
--- a/web/satellite/src/components/project/UsageReport.vue
+++ b/web/satellite/src/components/project/UsageReport.vue
@@ -2,58 +2,58 @@
 // See LICENSE for copying information.
 
 <template>
-	<div class="usage-report-container">
-		<div class="usage-report-container__header">
-			<p>Report</p>
-		</div>
-		<div class="usage-report-container__options-area">
-			<div class="usage-report-container__options-area__option active" @click.prevent="onCurrentRollupClick">
-				<p>Current Billing Period</p>
-			</div>
-			<div class="usage-report-container__options-area__option" @click.prevent="onPreviousRollupClick">
-				<p>Previous Billing Period</p>
-			</div>
-			<div class="usage-report-container__options-area__option" @click.prevent.self="onCustomDateClick">
-				<p @click.prevent.self="onCustomDateClick">Custom Date Range</p>
-				<Datepicker ref="datePicker" :date="startTime" @change="getDates"/>
-				<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" @click.prevent.self="onCustomDateClick">
-					<path d="M16.3213 2.28026H14.8009V1.50058C14.8009 1.10058 14.4806 0.760742 14.0611 0.760742C13.6611 0.760742 13.3213 1.08106 13.3213 1.50058V2.28026H6.66106V1.50058C6.66106 1.10058 6.34074 0.760742 5.92122 0.760742C5.5009 0.760742 5.2009 1.10058 5.2009 1.50058V2.28026H3.68058C1.92042 2.28026 0.500977 3.70058 0.500977 5.45986V16.0599C0.500977 17.82 1.9213 19.2395 3.68058 19.2395H16.3204C18.0805 19.2395 19.5 17.8191 19.5 16.0599V5.45986C19.5008 3.70048 18.0804 2.28026 16.321 2.28026H16.3213ZM3.68066 3.74042H5.20098V4.5201C5.20098 4.9201 5.5213 5.25994 5.94082 5.25994C6.36114 5.25994 6.68066 4.93962 6.68066 4.5201V3.74042H13.3603V4.5201C13.3603 4.9201 13.6806 5.25994 14.1001 5.25994C14.5001 5.25994 14.8399 4.93962 14.8399 4.5201V3.74042H16.3603C17.3001 3.74042 18.0806 4.50058 18.0806 5.46074V7.06074H1.96098V5.46074C1.96098 4.5209 2.74066 3.74042 3.68052 3.74042H3.68066ZM9.62126 14.2006H10.4009C11.0213 14.2006 11.5213 14.7006 11.5213 15.3209C11.5213 15.9413 11.0213 16.4413 10.4009 16.4413H9.62126C9.00094 16.4413 8.50094 15.9413 8.50094 15.3209C8.50094 14.7006 9.00094 14.2006 9.62126 14.2006ZM8.50094 10.8404C8.50094 10.2201 9.00094 9.7201 9.62126 9.7201L10.4009 9.72088C11.0213 9.72088 11.5213 10.2209 11.5213 10.8412C11.5213 11.4615 11.0213 11.9615 10.4009 11.9615H9.62126C9.00094 11.9607 8.50094 11.4607 8.50094 10.8404V10.8404ZM14.8407 14.2006H15.6204C16.2407 14.2006 16.7407 14.7006 16.7407 15.3209C16.7407 15.9413 16.2407 16.4413 15.6204 16.4413H14.8407C14.2204 16.4413 13.7204 15.9413 13.7204 15.3209C13.7212 14.7006 14.2212 14.2006 14.8407 14.2006ZM13.7212 10.8404C13.7212 10.2201 14.2212 9.7201 14.8415 9.7201H15.6212C16.2415 9.7201 16.7415 10.2201 16.7415 10.8404C16.7415 11.4607 16.2415 11.9607 15.6212 11.9607H14.8415C14.2212 11.9607 13.7212 11.4607 13.7212 10.8404ZM6.2806 10.8404C6.2806 11.4607 5.7806 11.9607 5.16028 11.9607H4.3806C3.76028 11.9607 3.26028 11.4607 3.26028 10.8404C3.26028 10.2201 3.76028 9.7201 4.3806 9.7201H5.16028C5.7806 9.72088 6.2806 10.2209 6.2806 10.8404ZM4.3806 14.2006H5.16028C5.7806 14.2006 6.2806 14.7006 6.2806 15.3209C6.2806 15.9413 5.7806 16.4413 5.16028 16.4413H4.3806C3.76028 16.4413 3.26028 15.9413 3.26028 15.3209C3.26106 14.7006 3.76106 14.2006 4.3806 14.2006Z" fill="#2683FF"/>
-				</svg>
-			</div>
-		</div>
-		<div class="usage-report-container__main-area">
-			<div class="usage-report-container__main-area__info-area">
-				<div class="usage-report-container__main-area__info-area__item">
-					<h1>Storage, GBh</h1>
-					<h2>{{storage}}</h2>
-				</div>
-				<div class="usage-report-container__main-area__info-area__item">
-					<h1>Egress, GB</h1>
-					<h2>{{egress}}</h2>
-				</div>
-				<div class="usage-report-container__main-area__info-area__item">
-					<h1>Object Hours</h1>
-					<h2>{{objectsCount}}</h2>
-				</div>
-			</div>
-			<div class="usage-report-container__main-area__footer">
-				<p>Current Roll Up Period <b>{{toLocaleDateString(startDate)}}</b> to <b>{{toLocaleDateString(endDate)}}</b></p>
-				<div class="usage-report-container__main-area__footer__report-area">
-					<p>Download Advanced Report</p>
-					<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg" @click.prevent="onReportClick">
-						<rect class="background" width="40" height="40" rx="4"/>
-						<path class="blue" d="M25.6491 19.2809L21.2192 23.5281C20.891 23.8427 20.3988 24 20.0707 24C19.7425 24 19.2503 23.8427 19.0862 23.5281L14.4922 19.2809C13.8359 18.6517 13.8359 17.8652 14.4922 17.236C14.8204 16.9213 15.1485 16.9213 15.6407 16.9213C15.9689 16.9213 16.4611 17.0787 16.6252 17.3933L18.594 19.1236L18.594 11.4157C18.594 10.6292 19.2503 10 20.0707 10C20.891 10 21.5473 10.6292 21.5473 11.4157L21.5473 19.1236L23.5162 17.236C23.6803 16.9213 24.1725 16.9213 24.5006 16.9213C24.8288 16.9213 25.321 17.0787 25.4851 17.3933C26.1414 17.8652 26.1414 18.809 25.6491 19.2809Z"/>
-						<rect class="blue" x="11" y="28" width="18" height="2" rx="1"/>
-						<defs>
-							<clipPath id="clip0">
-								<rect width="22" height="22" fill="white" transform="translate(10 10)"/>
-							</clipPath>
-						</defs>
-					</svg>
-				</div>
-			</div>
-		</div>
-	</div>
+    <div class="usage-report-container">
+        <div class="usage-report-container__header">
+            <p>Report</p>
+        </div>
+        <div class="usage-report-container__options-area">
+            <div class="usage-report-container__options-area__option active" @click.prevent="onCurrentRollupClick">
+                <p>Current Billing Period</p>
+            </div>
+            <div class="usage-report-container__options-area__option" @click.prevent="onPreviousRollupClick">
+                <p>Previous Billing Period</p>
+            </div>
+            <div class="usage-report-container__options-area__option" @click.prevent.self="onCustomDateClick">
+                <p @click.prevent.self="onCustomDateClick">Custom Date Range</p>
+                <Datepicker ref="datePicker" :date="startTime" @change="getDates"/>
+                <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" @click.prevent.self="onCustomDateClick">
+                    <path d="M16.3213 2.28026H14.8009V1.50058C14.8009 1.10058 14.4806 0.760742 14.0611 0.760742C13.6611 0.760742 13.3213 1.08106 13.3213 1.50058V2.28026H6.66106V1.50058C6.66106 1.10058 6.34074 0.760742 5.92122 0.760742C5.5009 0.760742 5.2009 1.10058 5.2009 1.50058V2.28026H3.68058C1.92042 2.28026 0.500977 3.70058 0.500977 5.45986V16.0599C0.500977 17.82 1.9213 19.2395 3.68058 19.2395H16.3204C18.0805 19.2395 19.5 17.8191 19.5 16.0599V5.45986C19.5008 3.70048 18.0804 2.28026 16.321 2.28026H16.3213ZM3.68066 3.74042H5.20098V4.5201C5.20098 4.9201 5.5213 5.25994 5.94082 5.25994C6.36114 5.25994 6.68066 4.93962 6.68066 4.5201V3.74042H13.3603V4.5201C13.3603 4.9201 13.6806 5.25994 14.1001 5.25994C14.5001 5.25994 14.8399 4.93962 14.8399 4.5201V3.74042H16.3603C17.3001 3.74042 18.0806 4.50058 18.0806 5.46074V7.06074H1.96098V5.46074C1.96098 4.5209 2.74066 3.74042 3.68052 3.74042H3.68066ZM9.62126 14.2006H10.4009C11.0213 14.2006 11.5213 14.7006 11.5213 15.3209C11.5213 15.9413 11.0213 16.4413 10.4009 16.4413H9.62126C9.00094 16.4413 8.50094 15.9413 8.50094 15.3209C8.50094 14.7006 9.00094 14.2006 9.62126 14.2006ZM8.50094 10.8404C8.50094 10.2201 9.00094 9.7201 9.62126 9.7201L10.4009 9.72088C11.0213 9.72088 11.5213 10.2209 11.5213 10.8412C11.5213 11.4615 11.0213 11.9615 10.4009 11.9615H9.62126C9.00094 11.9607 8.50094 11.4607 8.50094 10.8404V10.8404ZM14.8407 14.2006H15.6204C16.2407 14.2006 16.7407 14.7006 16.7407 15.3209C16.7407 15.9413 16.2407 16.4413 15.6204 16.4413H14.8407C14.2204 16.4413 13.7204 15.9413 13.7204 15.3209C13.7212 14.7006 14.2212 14.2006 14.8407 14.2006ZM13.7212 10.8404C13.7212 10.2201 14.2212 9.7201 14.8415 9.7201H15.6212C16.2415 9.7201 16.7415 10.2201 16.7415 10.8404C16.7415 11.4607 16.2415 11.9607 15.6212 11.9607H14.8415C14.2212 11.9607 13.7212 11.4607 13.7212 10.8404ZM6.2806 10.8404C6.2806 11.4607 5.7806 11.9607 5.16028 11.9607H4.3806C3.76028 11.9607 3.26028 11.4607 3.26028 10.8404C3.26028 10.2201 3.76028 9.7201 4.3806 9.7201H5.16028C5.7806 9.72088 6.2806 10.2209 6.2806 10.8404ZM4.3806 14.2006H5.16028C5.7806 14.2006 6.2806 14.7006 6.2806 15.3209C6.2806 15.9413 5.7806 16.4413 5.16028 16.4413H4.3806C3.76028 16.4413 3.26028 15.9413 3.26028 15.3209C3.26106 14.7006 3.76106 14.2006 4.3806 14.2006Z" fill="#2683FF"/>
+                </svg>
+            </div>
+        </div>
+        <div class="usage-report-container__main-area">
+            <div class="usage-report-container__main-area__info-area">
+                <div class="usage-report-container__main-area__info-area__item">
+                    <h1>Storage, GBh</h1>
+                    <h2>{{storage}}</h2>
+                </div>
+                <div class="usage-report-container__main-area__info-area__item">
+                    <h1>Egress, GB</h1>
+                    <h2>{{egress}}</h2>
+                </div>
+                <div class="usage-report-container__main-area__info-area__item">
+                    <h1>Object Hours</h1>
+                    <h2>{{objectsCount}}</h2>
+                </div>
+            </div>
+            <div class="usage-report-container__main-area__footer">
+                <p>Current Roll Up Period <b>{{toLocaleDateString(startDate)}}</b> to <b>{{toLocaleDateString(endDate)}}</b></p>
+                <div class="usage-report-container__main-area__footer__report-area">
+                    <p>Download Advanced Report</p>
+                    <svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg" @click.prevent="onReportClick">
+                        <rect class="background" width="40" height="40" rx="4"/>
+                        <path class="blue" d="M25.6491 19.2809L21.2192 23.5281C20.891 23.8427 20.3988 24 20.0707 24C19.7425 24 19.2503 23.8427 19.0862 23.5281L14.4922 19.2809C13.8359 18.6517 13.8359 17.8652 14.4922 17.236C14.8204 16.9213 15.1485 16.9213 15.6407 16.9213C15.9689 16.9213 16.4611 17.0787 16.6252 17.3933L18.594 19.1236L18.594 11.4157C18.594 10.6292 19.2503 10 20.0707 10C20.891 10 21.5473 10.6292 21.5473 11.4157L21.5473 19.1236L23.5162 17.236C23.6803 16.9213 24.1725 16.9213 24.5006 16.9213C24.8288 16.9213 25.321 17.0787 25.4851 17.3933C26.1414 17.8652 26.1414 18.809 25.6491 19.2809Z"/>
+                        <rect class="blue" x="11" y="28" width="18" height="2" rx="1"/>
+                        <defs>
+                            <clipPath id="clip0">
+                                <rect width="22" height="22" fill="white" transform="translate(10 10)"/>
+                            </clipPath>
+                        </defs>
+                    </svg>
+                </div>
+            </div>
+        </div>
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/project/billing/BillingArea.vue b/web/satellite/src/components/project/billing/BillingArea.vue
index 4df50d6a5..a78a0e861 100644
--- a/web/satellite/src/components/project/billing/BillingArea.vue
+++ b/web/satellite/src/components/project/billing/BillingArea.vue
@@ -2,22 +2,22 @@
 // See LICENSE for copying information.
 
 <template>
-	<div>
-		<div v-if="billing > 0" class="billing-overflow">
-			<div class="billing-header">
-				<p>Billing</p>
-			</div>
-			<div class="billing-container">
-				<div class="billing-container__table-holder">
-					<table class="billing-container__table">
-						<SortingHeader />
-						<BillingItem />
-					</table>
-				</div>
-				<PaginationArea />
-			</div>
-		</div>
-	</div>
+    <div>
+        <div v-if="billing > 0" class="billing-overflow">
+            <div class="billing-header">
+                <p>Billing</p>
+            </div>
+            <div class="billing-container">
+                <div class="billing-container__table-holder">
+                    <table class="billing-container__table">
+                        <SortingHeader />
+                        <BillingItem />
+                    </table>
+                </div>
+                <PaginationArea />
+            </div>
+        </div>
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/project/billing/BillingItem.vue b/web/satellite/src/components/project/billing/BillingItem.vue
index 8c3b1efc5..90f0b3636 100644
--- a/web/satellite/src/components/project/billing/BillingItem.vue
+++ b/web/satellite/src/components/project/billing/BillingItem.vue
@@ -2,37 +2,37 @@
 // See LICENSE for copying information.
 
 <template>
-	<tr class="container">
-		<td class="container__item bold">test</td>
-		<td class="container__item">test</td>
-		<td class="container__item">
-			<div class="row justify-start">
-				<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-					<path d="M20 7.26316V3.87134C20 3.40351 19.7938 2.93567 19.4845 2.5848C19.1753 2.23392 18.7629 2 18.3505 2H1.64948C1.23711 2 0.824742 2.23392 0.515464 2.5848C0.206186 2.93567 0 3.40351 0 3.87134V7.26316H20Z" fill="#2683FF"/>
-					<path d="M0 9.36816V16.1852C0 16.5862 0.206186 16.9872 0.515464 17.288C0.824742 17.5887 1.23711 17.7892 1.64948 17.7892H18.3505C18.7629 17.7892 19.1753 17.5887 19.4845 17.288C19.7938 16.9872 20 16.5862 20 16.1852V9.36816H0ZM5.36083 15.1827H2.68041V13.8794H5.36083V15.1827ZM10.7217 15.1827H6.70103V13.8794H10.7217V15.1827Z" fill="#2683FF"/>
-				</svg>
-				<p>test</p>
-			</div>
-		</td>
-		<td class="container__item">
-			<div class="row justify-start">
-				<svg width="16" height="12" viewBox="0 0 16 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-					<path d="M13.3333 0H2.66667C1.19418 0 0 1.15147 0 2.57131V9.42869C0 10.8485 1.19418 12 2.66667 12H13.3333C14.8058 12 16 10.8485 16 9.42869V2.57131C16 1.15147 14.8058 0 13.3333 0ZM11.1383 8.1165C11.2642 8.23703 11.335 8.40095 11.335 8.57209C11.335 8.74244 11.265 8.90636 11.14 9.02769C11.0142 9.14822 10.8442 9.21571 10.6675 9.21571C10.49 9.21571 10.32 9.14742 10.195 9.02608L8.00004 6.90876L5.80506 9.02608C5.54422 9.27517 5.12339 9.27437 4.86338 9.02448C4.60423 8.77376 4.60337 8.36799 4.86172 8.11647L7.05756 5.99997L4.86172 3.88348C4.60339 3.63196 4.60422 3.22619 4.86338 2.97547C5.12339 2.72558 5.54422 2.72476 5.80506 2.97387L8.00004 5.09119L10.195 2.97469V2.97389C10.4559 2.7248 10.8767 2.7256 11.1367 2.97549C11.3959 3.22621 11.3967 3.63198 11.1384 3.8835L8.94253 5.99999L11.1383 8.1165Z" fill="#EB001B"/>
-				</svg>
-				<p>test</p>
-			</div>
-		</td>
-		<td class="container__item bold">
-			<div class="row">
-				<p>test</p>
-				<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-					<rect class="background" width="40" height="40" rx="4" fill="#E2ECF7"/>
-					<path class="blue" d="M25.6491 19.2809L21.2192 23.5281C20.891 23.8427 20.3988 24 20.0707 24C19.7425 24 19.2503 23.8427 19.0862 23.5281L14.4922 19.2809C13.8359 18.6517 13.8359 17.8652 14.4922 17.236C14.8204 16.9213 15.1485 16.9213 15.6407 16.9213C15.9689 16.9213 16.4611 17.0787 16.6252 17.3933L18.594 19.1236L18.594 11.4157C18.594 10.6292 19.2503 10 20.0707 10C20.891 10 21.5473 10.6292 21.5473 11.4157L21.5473 19.1236L23.5162 17.236C23.6803 16.9213 24.1725 16.9213 24.5006 16.9213C24.8288 16.9213 25.321 17.0787 25.4851 17.3933C26.1414 17.8652 26.1414 18.809 25.6491 19.2809Z" fill="#2683FF"/>
-					<rect class="blue" x="11" y="28" width="18" height="2" rx="1" fill="#2683FF"/>
-				</svg>
-			</div>
-		</td>
-	</tr>
+    <tr class="container">
+        <td class="container__item bold">test</td>
+        <td class="container__item">test</td>
+        <td class="container__item">
+            <div class="row justify-start">
+                <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M20 7.26316V3.87134C20 3.40351 19.7938 2.93567 19.4845 2.5848C19.1753 2.23392 18.7629 2 18.3505 2H1.64948C1.23711 2 0.824742 2.23392 0.515464 2.5848C0.206186 2.93567 0 3.40351 0 3.87134V7.26316H20Z" fill="#2683FF"/>
+                    <path d="M0 9.36816V16.1852C0 16.5862 0.206186 16.9872 0.515464 17.288C0.824742 17.5887 1.23711 17.7892 1.64948 17.7892H18.3505C18.7629 17.7892 19.1753 17.5887 19.4845 17.288C19.7938 16.9872 20 16.5862 20 16.1852V9.36816H0ZM5.36083 15.1827H2.68041V13.8794H5.36083V15.1827ZM10.7217 15.1827H6.70103V13.8794H10.7217V15.1827Z" fill="#2683FF"/>
+                </svg>
+                <p>test</p>
+            </div>
+        </td>
+        <td class="container__item">
+            <div class="row justify-start">
+                <svg width="16" height="12" viewBox="0 0 16 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M13.3333 0H2.66667C1.19418 0 0 1.15147 0 2.57131V9.42869C0 10.8485 1.19418 12 2.66667 12H13.3333C14.8058 12 16 10.8485 16 9.42869V2.57131C16 1.15147 14.8058 0 13.3333 0ZM11.1383 8.1165C11.2642 8.23703 11.335 8.40095 11.335 8.57209C11.335 8.74244 11.265 8.90636 11.14 9.02769C11.0142 9.14822 10.8442 9.21571 10.6675 9.21571C10.49 9.21571 10.32 9.14742 10.195 9.02608L8.00004 6.90876L5.80506 9.02608C5.54422 9.27517 5.12339 9.27437 4.86338 9.02448C4.60423 8.77376 4.60337 8.36799 4.86172 8.11647L7.05756 5.99997L4.86172 3.88348C4.60339 3.63196 4.60422 3.22619 4.86338 2.97547C5.12339 2.72558 5.54422 2.72476 5.80506 2.97387L8.00004 5.09119L10.195 2.97469V2.97389C10.4559 2.7248 10.8767 2.7256 11.1367 2.97549C11.3959 3.22621 11.3967 3.63198 11.1384 3.8835L8.94253 5.99999L11.1383 8.1165Z" fill="#EB001B"/>
+                </svg>
+                <p>test</p>
+            </div>
+        </td>
+        <td class="container__item bold">
+            <div class="row">
+                <p>test</p>
+                <svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <rect class="background" width="40" height="40" rx="4" fill="#E2ECF7"/>
+                    <path class="blue" d="M25.6491 19.2809L21.2192 23.5281C20.891 23.8427 20.3988 24 20.0707 24C19.7425 24 19.2503 23.8427 19.0862 23.5281L14.4922 19.2809C13.8359 18.6517 13.8359 17.8652 14.4922 17.236C14.8204 16.9213 15.1485 16.9213 15.6407 16.9213C15.9689 16.9213 16.4611 17.0787 16.6252 17.3933L18.594 19.1236L18.594 11.4157C18.594 10.6292 19.2503 10 20.0707 10C20.891 10 21.5473 10.6292 21.5473 11.4157L21.5473 19.1236L23.5162 17.236C23.6803 16.9213 24.1725 16.9213 24.5006 16.9213C24.8288 16.9213 25.321 17.0787 25.4851 17.3933C26.1414 17.8652 26.1414 18.809 25.6491 19.2809Z" fill="#2683FF"/>
+                    <rect class="blue" x="11" y="28" width="18" height="2" rx="1" fill="#2683FF"/>
+                </svg>
+            </div>
+        </td>
+    </tr>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/project/billing/PaginationArea.vue b/web/satellite/src/components/project/billing/PaginationArea.vue
index 948db1adb..a6910245b 100644
--- a/web/satellite/src/components/project/billing/PaginationArea.vue
+++ b/web/satellite/src/components/project/billing/PaginationArea.vue
@@ -2,16 +2,16 @@
 // See LICENSE for copying information.
 
 <template>
-	<div class="pagination-container">
-		<div class="pagination-container__pages">
-			<div v-html="arrowLeft" class="pagination-container__button"></div>
-			<div class="pagination-container__items">
-				<span class="selected">1</span>
-				<span>2</span>
-			</div>
-			<div v-html="arrowRight" class="pagination-container__button"></div>
-		</div>
-	</div>
+    <div class="pagination-container">
+        <div class="pagination-container__pages">
+            <div v-html="arrowLeft" class="pagination-container__button"></div>
+            <div class="pagination-container__items">
+                <span class="selected">1</span>
+                <span>2</span>
+            </div>
+            <div v-html="arrowRight" class="pagination-container__button"></div>
+        </div>
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/project/billing/SortingHeader.vue b/web/satellite/src/components/project/billing/SortingHeader.vue
index b19174232..ca46ccf47 100644
--- a/web/satellite/src/components/project/billing/SortingHeader.vue
+++ b/web/satellite/src/components/project/billing/SortingHeader.vue
@@ -2,45 +2,45 @@
 // See LICENSE for copying information.
 
 <template>
-	<tr class="sort-header-container">
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>Invoice</p>
-				<div class="sort-header-container__item__arrows">
-					<span v-html="arrowUp"></span>
-					<span class="selected" v-html="arrowDown"></span>
-				</div>
-			</div>
-		</th>
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>Billing Period</p>
-				<div class="sort-header-container__item__arrows">
-					<span v-html="arrowUp"></span>
-					<span v-html="arrowDown"></span>
-				</div>
-			</div>
-		</th>
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>Payment method</p>
-			</div>
-		</th>
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>Status</p>
-			</div>
-		</th>
-		<th class="sort-header-container__item">
-			<div class="row">
-				<p>Amount</p>
-				<div class="sort-header-container__item__arrows">
-					<span v-html="arrowUp"></span>
-					<span v-html="arrowDown"></span>
-				</div>
-			</div>
-		</th>
-	</tr>
+    <tr class="sort-header-container">
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>Invoice</p>
+                <div class="sort-header-container__item__arrows">
+                    <span v-html="arrowUp"></span>
+                    <span class="selected" v-html="arrowDown"></span>
+                </div>
+            </div>
+        </th>
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>Billing Period</p>
+                <div class="sort-header-container__item__arrows">
+                    <span v-html="arrowUp"></span>
+                    <span v-html="arrowDown"></span>
+                </div>
+            </div>
+        </th>
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>Payment method</p>
+            </div>
+        </th>
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>Status</p>
+            </div>
+        </th>
+        <th class="sort-header-container__item">
+            <div class="row">
+                <p>Amount</p>
+                <div class="sort-header-container__item__arrows">
+                    <span v-html="arrowUp"></span>
+                    <span v-html="arrowDown"></span>
+                </div>
+            </div>
+        </th>
+    </tr>
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/referral/ReferralStats.vue b/web/satellite/src/components/referral/ReferralStats.vue
index 678ab747c..700bb69af 100644
--- a/web/satellite/src/components/referral/ReferralStats.vue
+++ b/web/satellite/src/components/referral/ReferralStats.vue
@@ -9,16 +9,15 @@
                 v-for="(stat, key) in stats"
                 :key="key"
                 :style="stat.background">
-                <span class="referral-stats__card-text">
-                    <span class="referral-stats__card-title">{{ stat.title }}</span>
-                    <span class="referral-stats__card-description">{{ stat.description }}</span>
-                </span>
-                <br>
-                <span class="referral-stats__card-number">{{ stat.symbol + usage[key] }}</span>
+                    <span class="referral-stats__card-text">
+                        <span class="referral-stats__card-title">{{ stat.title }}</span>
+                        <span class="referral-stats__card-description">{{ stat.description }}</span>
+                    </span>
+                    <br>
+                    <span class="referral-stats__card-number">{{ stat.symbol + usage[key] }}</span>
             </div>
         </div>
     </div>
-    
 </template>
 
 <script lang="ts">
diff --git a/web/satellite/src/components/team/AddUserPopup.vue b/web/satellite/src/components/team/AddUserPopup.vue
index 62d4c0d83..a364ef964 100644
--- a/web/satellite/src/components/team/AddUserPopup.vue
+++ b/web/satellite/src/components/team/AddUserPopup.vue
@@ -19,12 +19,12 @@
                         <div v-for="(input, index) in inputs"
                             class="add-user__form-container__inputs-group__item"
                             :key="index" >
-                            <input
-                                placeholder="test@mail.test"
-                                v-model="input.value"
-                                :class="[input.error ? 'error' : 'no-error']"
-                                @keyup="resetFormErrors(index)" />
-                            <span v-html="imageDeleteUser" @click="deleteInput(index)"></span>
+                                <input
+                                    placeholder="test@mail.test"
+                                    v-model="input.value"
+                                    :class="[input.error ? 'error' : 'no-error']"
+                                    @keyup="resetFormErrors(index)" />
+                                <span v-html="imageDeleteUser" @click="deleteInput(index)"></span>
                         </div>
                     </div>
                     <div class="add-user-row">
diff --git a/web/satellite/src/components/team/TeamArea.vue b/web/satellite/src/components/team/TeamArea.vue
index 22c82fcd2..1d2611eb9 100644
--- a/web/satellite/src/components/team/TeamArea.vue
+++ b/web/satellite/src/components/team/TeamArea.vue
@@ -11,8 +11,7 @@
                 <div v-for="member in projectMembers" v-on:click="onMemberClick(member)" v-bind:key="member.id">
                     <TeamMemberItem
                         :projectMember = "member"
-                        v-bind:class = "[member.isSelected ? 'selected' : '']"
-                    />
+                        v-bind:class = "[member.isSelected ? 'selected' : '']" />
                 </div>
             </div>
             <!-- only when selecting team members -->
diff --git a/web/satellite/src/views/forgotPassword/forgotPassword.html b/web/satellite/src/views/forgotPassword/forgotPassword.html
index f338c394a..5db261200 100644
--- a/web/satellite/src/views/forgotPassword/forgotPassword.html
+++ b/web/satellite/src/views/forgotPassword/forgotPassword.html
@@ -2,37 +2,37 @@
 <!--See LICENSE for copying information.-->
 
 <div class="forgot-password-container">
-	<div v-bind:class="loadingClassName">
-		<img src="../../../static/images/register/Loading.gif">
-	</div>
-	<img class="image" src="../../../static/images/AuthImage.svg" alt="" >
-	<div class="forgot-password-container__wrapper">
-		<div class="forgot-password-container__header">
-			<img @click="onLogoClick" class="forgot-password-container__logo" src="../../../static/images/Logo.svg" alt="logo">
-			<div class="forgot-password-container__login-button" @click="onBackToLoginClick">
-				<p>Back to Login</p>
-			</div>
-		</div>
-		<div class="forgot-password-area-wrapper">
-			<div class="forgot-password-area">
-				<div class="forgot-password-area__title-container">
-					<h1>Forgot Password</h1>
-				</div>
-				<p class="forgot-password-area__info-text">Enter your email address below and we'll get you back on track.</p>
-				<HeaderlessInput
-						class="full-input"
-						placeholder="Enter Your Email"
-                        :error="emailError"
-						@setData="setEmail"
-						width="100%"
-						height="46px">
-				</HeaderlessInput>
-				<div class="forgot-password-area__submit-container" @click.prevent="onSendConfigurations">
-					<div class="forgot-password-area__submit-container__send-button" >
-						<p>Send Configurations</p>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+    <div v-bind:class="loadingClassName">
+        <img src="../../../static/images/register/Loading.gif">
+    </div>
+    <img class="image" src="../../../static/images/AuthImage.svg" alt="" >
+    <div class="forgot-password-container__wrapper">
+        <div class="forgot-password-container__header">
+            <img @click="onLogoClick" class="forgot-password-container__logo" src="../../../static/images/Logo.svg" alt="logo">
+            <div class="forgot-password-container__login-button" @click="onBackToLoginClick">
+                <p>Back to Login</p>
+            </div>
+        </div>
+        <div class="forgot-password-area-wrapper">
+            <div class="forgot-password-area">
+                <div class="forgot-password-area__title-container">
+                    <h1>Forgot Password</h1>
+                </div>
+                <p class="forgot-password-area__info-text">Enter your email address below and we'll get you back on track.</p>
+                <HeaderlessInput
+                    class="full-input"
+                    placeholder="Enter Your Email"
+                    :error="emailError"
+                    @setData="setEmail"
+                    width="100%"
+                    height="46px">
+                </HeaderlessInput>
+                <div class="forgot-password-area__submit-container" @click.prevent="onSendConfigurations">
+                    <div class="forgot-password-area__submit-container__send-button" >
+                        <p>Send Configurations</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
diff --git a/web/satellite/src/views/login/login.html b/web/satellite/src/views/login/login.html
index a32d2d6a7..246233278 100644
--- a/web/satellite/src/views/login/login.html
+++ b/web/satellite/src/views/login/login.html
@@ -2,52 +2,52 @@
 <!--See LICENSE for copying information.-->
 
 <div class="login-container" @keyup.enter="onLogin">
-	<div :class="loadingClassName"></div>
-	<img :class="loadingLogoClassName" src="../../../static/images/LogoWhite.svg" alt="loading-logo">
-	<img class="image" src="../../../static/images/AuthImage.svg" alt="" >
-	<div class="login-container__wrapper">
-		<div class="login-container__header">
-			<img class="login-container__logo" src="../../../static/images/Logo.svg" alt="logo" @click="onLogoClick">
-			<div class="login-container__register-button" @click.prevent="onSignUpClick">
-				<p>Create Account</p>
-			</div>
-		</div>
-		<div class="login-area-wrapper">
-			<div class="login-area">
-				<div class="login-area__title-container">
-					<h1>Login to Storj</h1>
-				</div>
-				<HeaderlessInput
-						class="login-area__email-input"
-						placeholder="Email"
-                        :error="emailError"
-						@setData="setEmail"
-						height="46px"
-						width="100%">
-				</HeaderlessInput>
-				<HeaderlessInput
-						class="login-area__password-input"
-						placeholder="Password"
-                        :error="passwordError"
-						@setData="setPassword"
-						width="100%"
-						height="46px"
-						isPassword>
-				</HeaderlessInput>
-				<div class="login-area__submit-area">
-					<router-link :to="forgotPasswordRouterPath" class="login-area__navigation-area__nav-link" exact>
-						<h3><strong>Forgot password?</strong></h3>
-					</router-link>
-					<div class="login-area__submit-area__login-button" @click.prevent="onLogin">
-						<p>Log In</p>
-					</div>
-				</div>
-				<div class="login-area__info-area">
-					<p class="login-area__info-area__signature">Storj Labs Inc 2019.</p>
-					<a class="login-area__info-area__terms" href="https://tardigrade.io/terms-of-use/" target="_blank">Terms & Conditions</a>
-					<a class="login-area__info-area__help" href="mailto:support@storj.io" target="_blank">Support</a>
-				</div>
-			</div>
-		</div>
-	</div>
+    <div :class="loadingClassName"></div>
+    <img :class="loadingLogoClassName" src="../../../static/images/LogoWhite.svg" alt="loading-logo">
+    <img class="image" src="../../../static/images/AuthImage.svg" alt="" >
+    <div class="login-container__wrapper">
+        <div class="login-container__header">
+            <img class="login-container__logo" src="../../../static/images/Logo.svg" alt="logo" @click="onLogoClick">
+            <div class="login-container__register-button" @click.prevent="onSignUpClick">
+                <p>Create Account</p>
+            </div>
+        </div>
+        <div class="login-area-wrapper">
+            <div class="login-area">
+                <div class="login-area__title-container">
+                    <h1>Login to Storj</h1>
+                </div>
+                <HeaderlessInput
+                    class="login-area__email-input"
+                    placeholder="Email"
+                    :error="emailError"
+                    @setData="setEmail"
+                    height="46px"
+                    width="100%">
+                </HeaderlessInput>
+                <HeaderlessInput
+                    class="login-area__password-input"
+                    placeholder="Password"
+                    :error="passwordError"
+                    @setData="setPassword"
+                    width="100%"
+                    height="46px"
+                    isPassword>
+                </HeaderlessInput>
+                <div class="login-area__submit-area">
+                    <router-link :to="forgotPasswordRouterPath" class="login-area__navigation-area__nav-link" exact>
+                        <h3><strong>Forgot password?</strong></h3>
+                    </router-link>
+                    <div class="login-area__submit-area__login-button" @click.prevent="onLogin">
+                        <p>Log In</p>
+                    </div>
+                </div>
+                <div class="login-area__info-area">
+                    <p class="login-area__info-area__signature">Storj Labs Inc 2019.</p>
+                    <a class="login-area__info-area__terms" href="https://tardigrade.io/terms-of-use/" target="_blank">Terms & Conditions</a>
+                    <a class="login-area__info-area__help" href="mailto:support@storj.io" target="_blank">Support</a>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
diff --git a/web/satellite/src/views/register/register.html b/web/satellite/src/views/register/register.html
index a249a5192..abd0c3349 100644
--- a/web/satellite/src/views/register/register.html
+++ b/web/satellite/src/views/register/register.html
@@ -2,91 +2,93 @@
 <!--See LICENSE for copying information.-->
 
 <div class="register-container" @keyup.enter="onCreateClick">
-	<div :class="loadingClassName">
-		<img src="../../../static/images/register/Loading.gif">
-	</div>
-	<img class="image" src="../../../static/images/AuthImage.svg" alt="" >
-	<div class="register-container__wrapper">
-		<div class="register-container__header">
-			<img class="register-container__logo" src="../../../static/images/Logo.svg" alt="logo" @click="onLogoClick">
-			<div class="register-container__register-button" @click.prevent="onLoginClick">
-				<p>Login</p>
-			</div>
-		</div>
-		<div class="register-area-wrapper">
-			<div class="register-area">
-				<div class="register-area__title-container">
-					<h1>Sign Up to Storj</h1>
-				</div>
-				<HeaderlessInput
-						class="full-input"
-						label="Full Name"
-						placeholder="Enter Full Name"
-						:error="fullNameError"
-						@setData="setFullName"
-						width="100%"
-						height="46px">
-				</HeaderlessInput>
-				<HeaderlessInput
-						class="full-input"
-						label="Short Name"
-						placeholder="Enter Short Name"
-						@setData="setShortName"
-						width="100%"
-						height="46px">
-				</HeaderlessInput>
-				<HeaderlessInput
-						class="full-input"
-						label="Email"
-						placeholder="Enter Email"
-						:error="emailError"
-						@setData="setEmail"
-						width="100%"
-						height="46px">
-				</HeaderlessInput>
-				<div class="register-input">
-					<HeaderlessInput
-						class="full-input"
-						label="Password"
-						placeholder="Enter Password"
-						:error="passwordError"
-						@setData="setPassword"
-						width="100%"
-						height="46px"
-						isPassword>
-					</HeaderlessInput>
-					<span
-							v-html="infoImage"
-							title="Use 6 or more characters"></span>
-				</div>
-				<div class="register-input">
-					<HeaderlessInput
-							class="full-input"
-							label="Confirm Password"
-							placeholder="Confirm Password"
-							:error="repeatedPasswordError"
-							@setData="setRepeatedPassword"
-							width="100%"
-							height="46px"
-							isPassword>
-					</HeaderlessInput>
-					<span v-html="infoImage"
-					      title="Use 6 or more characters"></span>
-				</div>
-				<div class="register-area__submit-container">
-					<div class="register-area__submit-container__terms-area">
-						<label class="container">
-							<input type="checkbox" v-model="isTermsAccepted">
-							<span :class="[isTermsAcceptedError ? 'checkmark error': 'checkmark']"></span>
-						</label>
-						<h2>I agree to the <a href="https://tardigrade.io/terms-of-use/" target="_blank">Terms & Conditions</a></h2>
-					</div>
-					<div id="createAccountButton" class="register-area__submit-container__create-button" @click.prevent="onCreateClick">
-						<p>Create Account</p>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-	<RegistrationSuccessPopup ref="register_success_popup"/>
+    <div :class="loadingClassName">
+        <img src="../../../static/images/register/Loading.gif">
+    </div>
+    <img class="image" src="../../../static/images/AuthImage.svg" alt="" >
+    <div class="register-container__wrapper">
+        <div class="register-container__header">
+            <img class="register-container__logo" src="../../../static/images/Logo.svg" alt="logo" @click="onLogoClick">
+            <div class="register-container__register-button" @click.prevent="onLoginClick">
+                <p>Login</p>
+            </div>
+        </div>
+        <div class="register-area-wrapper">
+            <div class="register-area">
+                <div class="register-area__title-container">
+                    <h1>Sign Up to Storj</h1>
+                </div>
+                <HeaderlessInput
+                    class="full-input"
+                    label="Full Name"
+                    placeholder="Enter Full Name"
+                    :error="fullNameError"
+                    @setData="setFullName"
+                    width="100%"
+                    height="46px">
+                </HeaderlessInput>
+                <HeaderlessInput
+                    class="full-input"
+                    label="Short Name"
+                    placeholder="Enter Short Name"
+                    @setData="setShortName"
+                    width="100%"
+                    height="46px">
+                </HeaderlessInput>
+                <HeaderlessInput
+                    class="full-input"
+                    label="Email"
+                    placeholder="Enter Email"
+                    :error="emailError"
+                    @setData="setEmail"
+                    width="100%"
+                    height="46px">
+                </HeaderlessInput>
+                <div class="register-input">
+                    <HeaderlessInput
+                        class="full-input"
+                        label="Password"
+                        placeholder="Enter Password"
+                        :error="passwordError"
+                        @setData="setPassword"
+                        width="100%"
+                        height="46px"
+                        isPassword>
+                    </HeaderlessInput>
+                    <span
+                        v-html="infoImage"
+                        title="Use 6 or more characters">
+                    </span>
+                </div>
+                <div class="register-input">
+                    <HeaderlessInput
+                        class="full-input"
+                        label="Confirm Password"
+                        placeholder="Confirm Password"
+                        :error="repeatedPasswordError"
+                        @setData="setRepeatedPassword"
+                        width="100%"
+                        height="46px"
+                        isPassword>
+                    </HeaderlessInput>
+                    <span v-html="infoImage"
+                        title="Use 6 or more characters">
+                    </span>
+                </div>
+                <div class="register-area__submit-container">
+                    <div class="register-area__submit-container__terms-area">
+                        <label class="container">
+                            <input type="checkbox" v-model="isTermsAccepted">
+                            <span :class="[isTermsAcceptedError ? 'checkmark error': 'checkmark']"></span>
+                        </label>
+                        <h2>I agree to the <a href="https://tardigrade.io/terms-of-use/" target="_blank">Terms & Conditions</a></h2>
+                    </div>
+                    <div id="createAccountButton" class="register-area__submit-container__create-button" @click.prevent="onCreateClick">
+                        <p>Create Account</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <RegistrationSuccessPopup ref="register_success_popup"/>
 </div>