diff --git a/e2e/cypress/integration/ordering.ts b/e2e/cypress/integration/ordering.ts
index fb45f28f7..441b959b3 100644
--- a/e2e/cypress/integration/ordering.ts
+++ b/e2e/cypress/integration/ordering.ts
@@ -7,7 +7,7 @@ describe('Ordering products', () => {
         cy.visit('/account/plans');
 
         cy.wait('@availableProducts', {'timeout':10000});
-        cy.get('.productGrid .purchaseButton').contains('Purchase').click();
+        cy.get('#pricePlans .purchaseButton').contains('Purchase').click();
         cy.get('#shoppingCartButton').should('be.visible');
 
         cy.get('#shoppingCartButton').click();
@@ -26,11 +26,11 @@ describe('Ordering products', () => {
 
         cy.get('#shoppingCartButton').should('not.exist');
 
-        cy.get('.productGrid .purchaseButton').contains('Add product').click();
+        cy.get('#pricePlans .purchaseButton').contains('Add product').click();
         cy.get('#shoppingCartButton').should('be.visible');
         cy.get('#shoppingCartButton .mat-badge-content').should('contain', '1');
 
-        cy.get('.productGrid .purchaseButton').contains('Add product').click();
+        cy.get('#pricePlans .purchaseButton').contains('Add product').click();
         cy.get('#shoppingCartButton .mat-badge-content').should('contain', '1');
 
         cy.get('#shoppingCartButton').click();
diff --git a/src/app/account-app/account-upgrades.component.html b/src/app/account-app/account-upgrades.component.html
index e0b4124c6..ac3ff9481 100644
--- a/src/app/account-app/account-upgrades.component.html
+++ b/src/app/account-app/account-upgrades.component.html
@@ -14,14 +14,25 @@ <h4>
         Account: {{ me.first_name }} {{ me.last_name }} ({{ me.user_address }})
       </h4>
       <h3>
-        Welcome to our store -- we're happy to see you!
+        Welcome to our store!
       </h3>
         <img src="https://runbox.com/wp-content/uploads/cropped-sustainability-2-2400x632.png" id="NorwayGraphic" />
       <p>
         By subscribing to Runbox you support an independent and sustainable business in Norway, where your email will stay secure and private indefinitely.
       </p>
       <p>
-        Here you may subscribe to Runbox, change your existing subscription, or add more accounts or email domains. To set up additional accounts under your main account, please see <a href = "#subaccounts">Sub-Accounts</a> further down.
+        <button mat-raised-button routerLink="/account/#recommended" color="primary" class="plansLink">
+          Recommended plans
+        </button>
+        <button mat-raised-button routerLink="/account/#plans" color="primary" class="plansLink">
+          Compare price plans
+        </button>
+        <button mat-raised-button routerLink="/account/#subaccounts" color="primary" class="plansLink">
+          Additional accounts
+        </button>
+
+        To view your existing subscvriptions, please go to <a routerLink="/account/subscriptions">Your Subscriptions</a>.
+
       </p>
       <p>
         Feel free to contact us via <a href="https://support.runbox.com" target="support">Runbox Support</a> if you have any questions about our plans.
@@ -57,7 +68,7 @@ <h1 style="margin: 10px 0 20px 0">One extra year for free!</h1>
     </div>
     -->
 
-    <h3>Our recommended plans</h3>
+    <a name="recommended"><h3>Our recommended plans</h3></a>
 
       <p>
         We offer a 20% discount on all our plans if you renew for 3 years, which locks in the current price for your entire selected subcription period. To review and compare all our plans, please see the table further down.
@@ -288,7 +299,7 @@ <h4 *ngFor="let us of addon_usages">
       
       <br /><br />
       
-      <h3>All our price plans</h3>
+       <a name="recommended"><h3>All our price plans</h3></a>
 
       <p>
         Compare all our main account plans for 1 and 3 years in the table below.
diff --git a/src/app/account-app/account-upgrades.component.scss b/src/app/account-app/account-upgrades.component.scss
index 34048eef0..e51e52d5f 100644
--- a/src/app/account-app/account-upgrades.component.scss
+++ b/src/app/account-app/account-upgrades.component.scss
@@ -1,3 +1,7 @@
+.plansLink {
+    margin-right: 10px;
+}
+
 #NorwayGraphic {
     float: right;
     width: 300px;