diff --git a/.vs/FakturyWeb/v16/.suo b/.vs/FakturyWeb/v16/.suo
index 57945c4..d52fde2 100644
Binary files a/.vs/FakturyWeb/v16/.suo and b/.vs/FakturyWeb/v16/.suo differ
diff --git a/Models/FakturaSeznam.cs b/Models/FakturaSeznam.cs
new file mode 100644
index 0000000..c76fd2f
--- /dev/null
+++ b/Models/FakturaSeznam.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace FakturyWeb.Models
+{
+  public class FakturaSeznam
+  {
+    public int ID { get; set; }
+
+    public string CISLO { get; set; }
+
+    public DateTime VYSTAVENI { get; set; }
+
+    public DateTime SPLATNOST { get; set; }
+
+    public string O_PRAJM { get; set; }
+
+    public decimal CASTKA { get; set; }
+
+    public decimal ZAPLACENO { get; set; }
+  }
+}
diff --git a/Pages/Faktury/Create.cshtml b/Pages/Faktury/Create.cshtml
index 02ec9d0..d825366 100644
--- a/Pages/Faktury/Create.cshtml
+++ b/Pages/Faktury/Create.cshtml
@@ -19,7 +19,7 @@
       </h2>
       <div id="collapseBase" class="accordion-collapse collapse show" aria-labelledby="headingOne" data-bs-parent="#accordionFaktura">
         <div class="accordion-body row g-3">
-          <div class="form-group col-md-1">
+          <div class="form-group col-md-2">
             <label asp-for="FAKTURA.CISLO" class="control-label"></label>
             <input asp-for="FAKTURA.CISLO" class="form-control" />
             <span asp-validation-for="FAKTURA.CISLO" class="text-danger"></span>
@@ -31,6 +31,7 @@
             <select id="fakturaZakaznikSelect" asp-for="FAKTURA.ZakaznikID" class="form-select" asp-items="ViewBag.Zakaznici">
               <option value="-1" selected>(vyberte zákazníka)</option>
             </select>
+            <span asp-validation-for="FAKTURA.ZakaznikID" class="text-danger"></span>
           </div>
 
           <div class="form-group col-md-4">
@@ -41,7 +42,7 @@
 
           <div class="form-group col-md-4">
             <label asp-for="FAKTURA.FORMA_UHRADY" class="control-label"></label>
-            <select asp-for="FAKTURA.FORMA_UHRADY" class="form-control" asp-items="ViewBag.FormyUhrady"></select>
+            <select asp-for="FAKTURA.FORMA_UHRADY" class="form-select" asp-items="ViewBag.FormyUhrady"></select>
           </div>
 
           <div class="form-group col-md-4">
diff --git a/Pages/Faktury/Index.cshtml b/Pages/Faktury/Index.cshtml
index 770c431..e8fcec3 100644
--- a/Pages/Faktury/Index.cshtml
+++ b/Pages/Faktury/Index.cshtml
@@ -8,161 +8,60 @@
 <h1>Index</h1>
 
 <p>
-    <a asp-page="Create">Create New</a>
+  <a asp-page="Create">Přidat fakturu</a>
 </p>
-<table class="table">
-    <thead>
-        <tr>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].ZAKAZNIK)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].CISLO)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].CISLO_ABS)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].VYSTAVENI)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].SPLATNOST)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].D_PRAJM)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].D_ULICE)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].D_MESTO)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].D_PSC)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].D_IC)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].D_DIC)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].D_BANKA)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].D_TELEFON)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].D_EMAIL)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].D_WEB)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].O_PRAJM)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].O_ULICE)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].O_MESTO)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].O_PSC)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].O_IC)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].O_DIC)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].FORMA_UHRADY)
-            </th>
-            <th>
-                @Html.DisplayNameFor(model => model.FAKTURA[0].CINNOSTI)
-            </th>
-            <th></th>
-        </tr>
-    </thead>
-    <tbody>
-@foreach (var item in Model.FAKTURA) {
-        <tr>
-            <td>
-                @Html.DisplayFor(modelItem => item.ZAKAZNIK.ID)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.CISLO)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.CISLO_ABS)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.VYSTAVENI)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.SPLATNOST)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.D_PRAJM)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.D_ULICE)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.D_MESTO)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.D_PSC)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.D_IC)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.D_DIC)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.D_BANKA)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.D_TELEFON)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.D_EMAIL)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.D_WEB)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.O_PRAJM)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.O_ULICE)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.O_MESTO)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.O_PSC)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.O_IC)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.O_DIC)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.FORMA_UHRADY)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.CINNOSTI)
-            </td>
-            <td>
-                <a asp-page="./Edit" asp-route-id="@item.ID">Edit</a> |
-                <a asp-page="./Details" asp-route-id="@item.ID">Details</a> |
-                <a asp-page="./Delete" asp-route-id="@item.ID">Delete</a>
-            </td>
-        </tr>
-}
-    </tbody>
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th>
+        @Html.DisplayNameFor(model => model.FAKTURA[0].CISLO)
+      </th>
+      <th>
+        @Html.DisplayNameFor(model => model.FAKTURA[0].VYSTAVENI)
+      </th>
+      <th>
+        @Html.DisplayNameFor(model => model.FAKTURA[0].SPLATNOST)
+      </th>
+      <th>
+        @Html.DisplayNameFor(model => model.FAKTURA[0].O_PRAJM)
+      </th>
+      <th>
+        Částka
+      </th>
+      <th>
+        Zaplaceno
+      </th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    @foreach (var item in Model.FAKTURA)
+    {
+    <tr>
+      <td class="fw-bold">
+        @Html.DisplayFor(modelItem => item.CISLO)
+      </td>
+      <td>
+        @Html.DisplayFor(modelItem => item.VYSTAVENI)
+      </td>
+      <td>
+        @Html.DisplayFor(modelItem => item.SPLATNOST)
+      </td>
+      <td>
+        @Html.DisplayFor(modelItem => item.O_PRAJM)
+      </td>
+      <td>
+        @Html.DisplayFor(modelItem => item.CASTKA)
+      </td>
+      <td>
+        @Html.DisplayFor(modelItem => item.ZAPLACENO)
+      </td>
+      <td>
+        <a asp-page="./Edit" asp-route-id="@item.ID">Edit</a> |
+        <a asp-page="./Details" asp-route-id="@item.ID">Details</a> |
+        <a asp-page="./Delete" asp-route-id="@item.ID">Delete</a>
+      </td>
+    </tr>
+    }
+  </tbody>
 </table>
diff --git a/Pages/Faktury/Index.cshtml.cs b/Pages/Faktury/Index.cshtml.cs
index c371bc1..6b20213 100644
--- a/Pages/Faktury/Index.cshtml.cs
+++ b/Pages/Faktury/Index.cshtml.cs
@@ -7,24 +7,36 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.EntityFrameworkCore;
 using FakturyWeb.Data;
 using RazorPagesMovie.Models;
+using FakturyWeb.Models;
 
 namespace FakturyWeb.Pages.Faktury
 {
-    public class IndexModel : PageModel
+  public class IndexModel : PageModel
+  {
+    private readonly FakturyWeb.Data.FakturyWebContext _context;
+
+    public IndexModel(FakturyWeb.Data.FakturyWebContext context)
     {
-        private readonly FakturyWeb.Data.FakturyWebContext _context;
-
-        public IndexModel(FakturyWeb.Data.FakturyWebContext context)
-        {
-            _context = context;
-        }
-
-        public IList<FAKTURA> FAKTURA { get;set; }
-
-        public async Task OnGetAsync()
-        {
-            FAKTURA = await _context.FAKTURA
-                .Include(f => f.ZAKAZNIK).ToListAsync();
-        }
+        _context = context;
     }
+
+    public IList<FakturaSeznam> FAKTURA { get;set; }
+
+    public async Task OnGetAsync()
+    {
+      //FAKTURA = await _context.FAKTURA
+      //    .Include(f => f.ZAKAZNIK).ToListAsync();
+      FAKTURA = await (from f in _context.FAKTURA
+                       select new FakturaSeznam {
+                         ID = f.ID,
+                         CISLO = f.CISLO,
+                         VYSTAVENI = f.VYSTAVENI,
+                         SPLATNOST = f.SPLATNOST,
+                         O_PRAJM = f.O_PRAJM,
+                         CASTKA = f.POLOZKY.Sum(p => p.CENA),
+                         ZAPLACENO = f.PLATBY.Sum(p => p.CASTKA)
+                       }
+                       ).ToListAsync();
+    }
+  }
 }