diff --git a/src/app/content/poule/poule.component.html b/src/app/content/poule/poule.component.html
index 64398cb..92f8a4c 100644
--- a/src/app/content/poule/poule.component.html
+++ b/src/app/content/poule/poule.component.html
@@ -3,30 +3,30 @@
 
   <!--top level header: race + race 1 + race 2 + ... + penalty + total + result-->
   <div class="toplevelheader" style="grid-column: 1; grid-row : 1">race</div>
-  <ng-container *ngFor="let y of ' '.repeat(maxLaps).split(''), let lapindex = index">
-    <div class="toplevelheader" [ngStyle]="{'grid-column': (1+lapindex+1), 'grid-row' : 1}">lap {{lapindex+1}}</div>
-  </ng-container>
-  <div class="toplevelheader" [ngStyle]="{'grid-column': maxLaps+2, 'grid-row' : 1}">penalty</div>
-  <div class="toplevelheader" [ngStyle]="{'grid-column': maxLaps+3, 'grid-row' : 1}">total</div>
-  <div class="toplevelheader" [ngStyle]="{'grid-column': maxLaps+4, 'grid-row' : 1}">result</div>
+  <!--<ng-container *ngFor="let y of ' '.repeat(maxLaps).split(''), let lapindex = index">-->
+    <!--<div class="toplevelheader" [ngStyle]="{'grid-column': (1+lapindex+1), 'grid-row' : 1}">lap {{lapindex+1}}</div>-->
+  <!--</ng-container>-->
+  <div class="toplevelheader" [ngStyle]="{'grid-column': 2, 'grid-row' : 1}">penalty</div>
+  <div class="toplevelheader" [ngStyle]="{'grid-column': 3, 'grid-row' : 1}">total</div>
+  <div class="toplevelheader" [ngStyle]="{'grid-column': 4, 'grid-row' : 1}">result</div>
 
 
   <!--start looping over teams, make a block for each-->
   <ng-container *ngFor="let team of teams; let teamindex = index">
     <!--first multi row spanning cell: the team name -->
     <div class="teamname"
-         [ngStyle]="{'grid-row':2+(teamindex*(maxRaces+1)), 'grid-column-start':2, 'grid-column-end': 2+maxRaces+1}">
+         [ngStyle]="{'grid-row':2+(teamindex*(maxRaces+1)), 'grid-column-start':2, 'grid-column-end': 2+maxRaces}">
       {{team.name}}
     </div>
     <!--all the team contents: for each race a line -->
     <ng-container *ngFor="let y of ' '.repeat(maxRaces).split(''), let raceindex = index">
       <!--also loop over laps: then we're in the right cell-->
-      <ng-container *ngFor="let z of ' '.repeat(maxLaps).split(''), let lapindex = index">
+      <!--<ng-container *ngFor="let z of ' '.repeat(maxLaps).split(''), let lapindex = index">-->
         <!--add the time -->
-        <div [ngStyle]="{'grid-column':lapindex+2, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}">
-          <span class="timecell">{{getLapTime(team.idteam, raceindex, lapindex)/1000 | number:'1.2-2'}}</span>
-        </div>
-      </ng-container>
+        <!--<div [ngStyle]="{'grid-column':lapindex+2, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}">-->
+          <!--<span class="timecell">{{getLapTime(team.idteam, raceindex, lapindex)/1000 | number:'1.2-2'}}</span>-->
+        <!--</div>-->
+      <!--</ng-container>-->
 
       <!--add a race header-->
       <div class="lapheader" [ngStyle]="{'grid-column':1, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}">
@@ -34,10 +34,10 @@
       </div>
 
       <!--do a penalty for this race/team combo-->
-      <div class="penaltycell" [ngStyle]="{'grid-column':maxLaps+2, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}">
+      <div class="penaltycell" [ngStyle]="{'grid-column':2, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}">
         <span class="timecell">{{getPenaltySum(raceindex, team.idteam)/1000 | number:'1.2-2'}}</span>
       </div>
-      <div class="totalcell" [ngStyle]="{'grid-column':maxLaps+3, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}">
+      <div class="totalcell" [ngStyle]="{'grid-column':3, 'grid-row':2+(teamindex*(maxRaces+1))+raceindex+1}">
         <span class="timecell">{{getRaceTime(raceindex, team.idteam)/1000 | number:'1.2-2'}}</span>
       </div>
 
@@ -45,7 +45,7 @@
     </ng-container>
 
     <!--this only has to be added once for each team...-->
-    <div class="resultcell" [ngStyle]="{'grid-column':maxLaps+4,
+    <div class="resultcell" [ngStyle]="{'grid-column':4,
   'grid-row-start':2+(teamindex*(maxRaces+1))+1,
   'grid-row-end': 2+(teamindex*(maxRaces+1))+1+maxRaces}">
       <span class="timecell">{{getAvgOfBestTwo(team.idteam)/1000 | number:'1.2-2'}}</span>
diff --git a/src/app/content/tier/tier.component.scss b/src/app/content/tier/tier.component.scss
index 713174d..8ca4211 100644
--- a/src/app/content/tier/tier.component.scss
+++ b/src/app/content/tier/tier.component.scss
@@ -12,3 +12,7 @@ app-poule {
 button.active {
  background-color: #1dd21d;
 }
+.button-row {
+  text-align: center;
+  margin-top: 10px;
+}