diff --git a/src/main/java/app/views/match/components/EditMatchCard.java b/src/main/java/app/views/match/components/EditMatchCard.java
index e7f498c..9fc9e1b 100644
--- a/src/main/java/app/views/match/components/EditMatchCard.java
+++ b/src/main/java/app/views/match/components/EditMatchCard.java
@@ -78,13 +78,7 @@ public class EditMatchCard extends VerticalLayout {
 
     private void defineTextFields() {
         add(formLayout);
-//        formLayout.setSpacing(false);
         formLayout.setPadding(false);
-//        List<ResponsiveStep> responsiveSteps = new ArrayList<>();
-//        for (int i = 0; i < 6; i++) {
-//            responsiveSteps.add(new ResponsiveStep("40em", 1, ASIDE));
-//        }
-//        formLayout.setResponsiveSteps(responsiveSteps);
         defineTextFields(tenMinuteTextFields, TEN_MINUTES, 1);
         defineTextFields(fiveMinuteTextFields, FIVE_MINUTES, 3);
         defineTextFields(threeMinuteTextFields, THREE_MINUTES, 5);
diff --git a/src/main/java/app/views/matchday/MatchdayView.java b/src/main/java/app/views/matchday/MatchdayView.java
index a659ba8..6ae6190 100644
--- a/src/main/java/app/views/matchday/MatchdayView.java
+++ b/src/main/java/app/views/matchday/MatchdayView.java
@@ -3,7 +3,7 @@ package app.views.matchday;
 import app.navigation.NavigationLevel;
 import app.navigation.NavigationService;
 import app.views.main.MainView;
-import app.views.matchday.components.matchdayCard;
+import app.views.matchday.components.MatchdayCard;
 import app.views.navigation.NavigationViewBase;
 import com.vaadin.flow.component.dependency.CssImport;
 import com.vaadin.flow.router.PageTitle;
@@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 @PageTitle("Schachliga DACH - Results - Matchdays")
 public class MatchdayView extends NavigationViewBase {
 
-    private matchdayCard matchdayCard;
+    private MatchdayCard matchdayCard;
 
     public MatchdayView(@Autowired NavigationService navigationService) {
         super(navigationService, "matchday", NavigationLevel.MATCHDAY);
@@ -30,7 +30,7 @@ public class MatchdayView extends NavigationViewBase {
     ////////////
 
     private void configureLayout() {
-        matchdayCard = new matchdayCard(navigation);
+        matchdayCard = new MatchdayCard(navigation);
         add(matchdayCard);
     }
 
diff --git a/src/main/java/app/views/matchday/components/matchdayCard.java b/src/main/java/app/views/matchday/components/MatchdayCard.java
similarity index 95%
rename from src/main/java/app/views/matchday/components/matchdayCard.java
rename to src/main/java/app/views/matchday/components/MatchdayCard.java
index 53a0d23..e69903f 100644
--- a/src/main/java/app/views/matchday/components/matchdayCard.java
+++ b/src/main/java/app/views/matchday/components/MatchdayCard.java
@@ -23,7 +23,7 @@ import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 
 import java.util.NoSuchElementException;
 
-public class matchdayCard extends Div implements ContentConfigurable {
+public class MatchdayCard extends Div implements ContentConfigurable {
 
     private final Navigation navigation;
 
@@ -31,7 +31,7 @@ public class matchdayCard extends Div implements ContentConfigurable {
     private final Label headerLabel = new Label();
     private final Grid<CalculatedMatch> grid = new Grid<>();
 
-    public matchdayCard(Navigation navigation) {
+    public MatchdayCard(Navigation navigation) {
         this.navigation = navigation;
 
         addClassName("card");
@@ -68,7 +68,7 @@ public class matchdayCard extends Div implements ContentConfigurable {
         grid.addColumn(calculatedMatch -> "vs.")
                 .setHeader("vs.")
                 .setTextAlign(ColumnTextAlign.CENTER)
-                .setWidth("3em");
+                .setWidth("4em");
 
         grid.addColumn(VaadinUtils.getPlayerRenderer(CalculatedMatch::getPlayer2))
                 .setHeader(headerPlayer2)
@@ -83,9 +83,9 @@ public class matchdayCard extends Div implements ContentConfigurable {
 
         grid.addComponentColumn(this::createButton)
                 .setTextAlign(ColumnTextAlign.CENTER)
-                .setWidth("3em");
+                .setWidth("4em");
 
-        grid.setWidth("38em"); // TODO: find a way to set this dynamically based on column widths
+        grid.setWidth("40em"); // TODO: find a way to set this dynamically based on column widths
         grid.setHeightByRows(true);
 
         grid.addThemeVariants(GridVariant.LUMO_NO_BORDER,