diff --git a/MP.Prog/Components/DataPager.razor b/MP.Prog/Components/DataPager.razor
index 818627ba..34106e7f 100644
--- a/MP.Prog/Components/DataPager.razor
+++ b/MP.Prog/Components/DataPager.razor
@@ -4,37 +4,17 @@
             <div class="col-12 small">
                 @if (totalCount > 0)
                 {
-                    <Pagination Class="mb-0">
-                        <PaginationItem>
-                            <PaginationLink Clicked="@HandlePaginationItemClick" Page="1">
-                                <i class="fas fa-angle-double-left"></i>
-                            </PaginationLink>
-                        </PaginationItem>
-                        <PaginationItem>
-                            <PaginationLink Clicked="@HandlePaginationItemClick" Page="@prevBlock.ToString()">
-                                <span aria-hidden="true"><i class="fas fa-angle-left"></i></span>
-                            </PaginationLink>
-                        </PaginationItem>
+                    <ul class="pagination pagination-sm">
+                        <li class="page-item"><button class="page-link" @onclick="() => PaginationItemClick(1)"><i class="fas fa-angle-double-left"></i></button></li>
+                        <li class="page-item"><button class="page-link" @onclick="() => PaginationItemClick(prevBlock)"><i class="fas fa-angle-left"></i></button></li>
                         @for (int i = @startPage; i <= endPage; ++i)
                         {
                             var pageNum = i;
-                            <PaginationItem Active="@(currPage.Equals(pageNum))">
-                                <PaginationLink Clicked="@HandlePaginationItemClick" Page="@pageNum.ToString()">
-                                    @pageNum
-                                </PaginationLink>
-                            </PaginationItem>
+                            <li class="page-item"><button class="page-link @cssActive(pageNum)" @onclick="() => PaginationItemClick(pageNum)">@pageNum</button></li>
                         }
-                        <PaginationItem>
-                            <PaginationLink Clicked="@HandlePaginationItemClick" Page="@nextBlock.ToString()">
-                                <i class="fas fa-angle-right"></i>
-                            </PaginationLink>
-                        </PaginationItem>
-                        <PaginationItem>
-                            <PaginationLink Clicked="@HandlePaginationItemClick" Page="@LastPage.ToString()">
-                                <i class="fas fa-angle-double-right"></i>
-                            </PaginationLink>
-                        </PaginationItem>
-                    </Pagination>
+                        <li class="page-item"><button class="page-link" @onclick="() => PaginationItemClick(nextBlock)"><i class="fas fa-angle-right"></i></button></li>
+                        <li class="page-item"><button class="page-link" @onclick="() => PaginationItemClick(LastPage)"><i class="fas fa-angle-double-right"></i></button></li>
+                    </ul>
                 }
             </div>
         </div>
@@ -42,9 +22,7 @@
             <div class="col-12 small">
                 @if (showLoading)
                 {
-                    <Progress>
-                        <ProgressBar Value="@percLoading" Striped="true" Animated="true" />
-                    </Progress>
+                    <i>loading...</i>
                 }
             </div>
         </div>
diff --git a/MP.Prog/Components/DataPager.razor.cs b/MP.Prog/Components/DataPager.razor.cs
index adc3e47e..79df0eaa 100644
--- a/MP.Prog/Components/DataPager.razor.cs
+++ b/MP.Prog/Components/DataPager.razor.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using Microsoft.AspNetCore.Components;
+using System;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
-using MP.Prog.Components;
-using MP.Prog.Data;
 
 namespace MP.Prog.Components
 {
@@ -168,6 +164,16 @@ namespace MP.Prog.Components
 
         #region Protected Methods
 
+        protected string cssActive(int numPage)
+        {
+            string answ = "";
+            if (numPage == currPage)
+            {
+                answ = "active";
+            }
+            return answ;
+        }
+
         protected void HandlePaginationItemClick(string page)
         {
             currPage = int.Parse(page);
@@ -178,6 +184,11 @@ namespace MP.Prog.Components
             await Task.Run(() => showLoading = false);
         }
 
+        protected void PaginationItemClick(int page)
+        {
+            currPage = page;
+        }
+
         #endregion Protected Methods
     }
 }
\ No newline at end of file