diff --git a/.template-lintrc.js b/.template-lintrc.js
index 4d151e0..22c9f7b 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -48,6 +48,12 @@ module.exports = {
 				"no-action"
 			]
 		},
+		{
+			"moduleId": "app/components/expense-list/template",
+			"only": [
+				"no-invalid-role"
+			]
+		},
 		{
 			"moduleId": "app/components/topbar-account-panel/template",
 			"only": [
diff --git a/app/components/expense-list/template.hbs b/app/components/expense-list/template.hbs
index 3633663..c9cf3e6 100644
--- a/app/components/expense-list/template.hbs
+++ b/app/components/expense-list/template.hbs
@@ -13,7 +13,7 @@
       </p>
       <p class="tags">
         {{#each expense.tags as |tag|}}
-          <button class="small yellow" role="none">
+          <button type="button" class="small yellow" role="none">
             <IconTag />{{tag}}
           </button>
         {{/each}}
diff --git a/app/styles/_forms.scss b/app/styles/_forms.scss
index fd861d8..d6dc079 100644
--- a/app/styles/_forms.scss
+++ b/app/styles/_forms.scss
@@ -14,10 +14,6 @@ section#signup {
     p {
       font-size: 1.2rem;
 
-      &.mg-bottom-md {
-        margin-bottom: 2rem;
-      }
-
       &.label {
         margin-bottom: 1.5rem;
         font-size: 1rem;
diff --git a/app/styles/_layout.scss b/app/styles/_layout.scss
index d313121..5855c79 100644
--- a/app/styles/_layout.scss
+++ b/app/styles/_layout.scss
@@ -62,15 +62,12 @@ main {
         }
       }
 
+      // TODO Remove after switch to Tailwind CSS
       &.text-center {
         text-align: center;
       }
 
       p {
-        &.mg-bottom-md {
-          margin-bottom: 2rem;
-        }
-
         &.actions {
           text-align: center;
           padding-top: 2rem;
@@ -177,4 +174,9 @@ main section {
       margin-bottom: 2rem;
     }
   }
+
+  // TODO Remove after switch to Tailwind CSS
+  .mb-4 { margin-bottom: 1rem; }
+  .mb-8 { margin-bottom: 2rem; }
 }
+
diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs
index 4f16575..edbdb03 100644
--- a/app/templates/dashboard.hbs
+++ b/app/templates/dashboard.hbs
@@ -109,10 +109,10 @@
     {{#if this.showFullContributionSync}}
     <section id="sync-all-contributions">
       {{#if this.kredits.fetchMissingContributions.isIdle}}
-        <p style="margin-bottom: 1rem;">
+        <p class="mb-4">
           There are
           <strong>{{this.kredits.missingHistoricContributionsCount}}</strong>
-          contributions, which are not currently loaded/displayed.
+          earlier contributions, which are not currently loaded/displayed.
         </p>
         <p>
           You can fetch all historic data in one go, and have it stored locally in
@@ -122,7 +122,7 @@
           </button>
         </p>
       {{else}}
-        <p style="margin-bottom: 1rem;">
+        <p class="mb-4">
           Syncing data. Please be patient...
         </p>
         <p>
diff --git a/app/templates/signup/eth-account.hbs b/app/templates/signup/eth-account.hbs
index d5091c3..4c232e0 100644
--- a/app/templates/signup/eth-account.hbs
+++ b/app/templates/signup/eth-account.hbs
@@ -2,7 +2,7 @@
   <h2>Complete your contributor profile</h2>
 </header>
 <div class="content text-lg">
-  <p class="mg-bottom-md">
+  <p class="mb-8">
     Kredits allow you to take part in project governance, and to earn rewards for
     your contributions. For both, you will need an Ethereum wallet/account.
   </p>