diff --git a/SystemKonkursow/4.2.1/angular/src/app/competition-create/competition-create.component.css b/SystemKonkursow/4.2.1/angular/src/app/competition-create/competition-create.component.css
index b7dce2f..59236e5 100644
--- a/SystemKonkursow/4.2.1/angular/src/app/competition-create/competition-create.component.css
+++ b/SystemKonkursow/4.2.1/angular/src/app/competition-create/competition-create.component.css
@@ -9,4 +9,14 @@
 
 .element-size {
     width: 500px;
-}
\ No newline at end of file
+}
+
+.field {
+    background-color: #DED4F4;
+    border: 1px solid gray;
+    border-left: 10px #739CB9 solid;
+    border-radius: 10px;
+    padding: 5px;
+    width: 520px;
+    margin-bottom: 10px;
+}
diff --git a/SystemKonkursow/4.2.1/angular/src/app/competition-create/competition-create.component.html b/SystemKonkursow/4.2.1/angular/src/app/competition-create/competition-create.component.html
index 45ee58e..cd8ea2e 100644
--- a/SystemKonkursow/4.2.1/angular/src/app/competition-create/competition-create.component.html
+++ b/SystemKonkursow/4.2.1/angular/src/app/competition-create/competition-create.component.html
@@ -5,7 +5,7 @@
         
         <form (ngSubmit)="saveCompetition()"
             #createCompetitionForm="ngForm">
-            <div class="col-sm-8 col-md-8">
+            <div class="field">
                 <div class="form-group">
                     <mat-form-field class="element-size">
                         <input matInput
@@ -26,7 +26,7 @@
                 </div>
             </div>
 
-            <div class="col-sm-8 col-md-8">
+            <div class="field">
                 <div class="form-group">
                     <mat-form-field class="element-size">
                         <mat-select placeholder="Kategorie" 
@@ -46,7 +46,7 @@
                 </div>
             </div>
 
-            <div class="col-sm-8 col-md-8">
+            <div class="field">
                 <div class="form-group">
                     <mat-form-field class="element-size">
                         <textarea matInput
@@ -71,7 +71,7 @@
                 </div>
             </div>
 
-            <div class="col-sm-8 col-md-8">
+            <div class="field">
                 <div class="form-group">
                     <mat-form-field class="element-size">
                         <textarea matInput
@@ -96,7 +96,7 @@
                 </div>
             </div>
 
-            <div class="col-sm-8 col-md-8">
+            <div class="field">
                 <div class="form-group">
                     <mat-form-field class="element-size">
                         <mat-select placeholder="Minimalna klasa" 
@@ -115,7 +115,7 @@
                 </div>
             </div>
 
-            <div class="col-sm-8 col-md-8">
+            <div class="field">
                 <div class="form-group">
                     <mat-form-field class="element-size">
                         <mat-select placeholder="Maksymalna klasa" 
@@ -134,7 +134,7 @@
                 </div>
             </div>
 
-            <div class="col-sm-8 col-md-8">
+            <div class="field">
                 <div class="form-group">
                     <mat-form-field class="element-size">
                         <input matInput 
@@ -155,7 +155,7 @@
                 </div>
             </div>
 
-            <div class="col-sm-8 col-md-8">
+            <div class="field">
                 <div class="form-group">
                     <mat-form-field class="element-size">
                         <input matInput 
@@ -165,7 +165,7 @@
                             name="endDate"
                             #endDate="ngModel"
                             disabled
-                            min="{{ createCompetition.startDate | date: 'yyyy-MM-dd'}}">
+                            min="{{ (createCompetition.startDate ? createCompetition.startDate : today) | date: 'yyyy-MM-dd'}}">
                         <mat-datepicker-toggle matSuffix [for]="picker2"></mat-datepicker-toggle>
                         <mat-datepicker #picker2 disabled="false"></mat-datepicker>
                         <mat-error *ngIf="endDate.invalid && endDate.errors">