diff --git a/Newsbot.Portal.Blazor.Server/Pages/Articles/Newest.razor b/Newsbot.Portal.Blazor.Server/Pages/Articles/Latest.razor
similarity index 76%
rename from Newsbot.Portal.Blazor.Server/Pages/Articles/Newest.razor
rename to Newsbot.Portal.Blazor.Server/Pages/Articles/Latest.razor
index 9dc1b50..9be58cc 100644
--- a/Newsbot.Portal.Blazor.Server/Pages/Articles/Newest.razor
+++ b/Newsbot.Portal.Blazor.Server/Pages/Articles/Latest.razor
@@ -1,7 +1,9 @@
-@page "/articles/newest"
+@page "/articles/latest"
 @using Newsbot.Collector.Client
 @using Newsbot.Collector.Client.Domain.Dto
-<h3>List Articles</h3>
+
+<PageTitle>Latest</PageTitle>
+<h3>Latest Posts</h3>
 
 <div class="container">
     <div class="row">
@@ -11,7 +13,10 @@
             <div class="card" style="width: 18rem;">
                 <img src="@item.Thumbnail" class="card-img-top" alt="...">
                 <div class="card-body">
-                    <h5 class="card-title">@item.Title</h5>
+                    <h5 class="card-title">
+                        <a href="@item.Url" target="_blank">@item.Title</a>
+                    </h5>
+                    <p class="card-text">@item.PubDate</p>
                     <p class="card-text">@item.Description</p>
                     <a href="@item.Url" class="btn btn-primary" target="_blank">View</a>
                 </div>
diff --git a/Newsbot.Portal.Blazor.Server/Pages/Articles/ListBySource.razor b/Newsbot.Portal.Blazor.Server/Pages/Articles/ListBySource.razor
index b64eaed..a97de87 100644
--- a/Newsbot.Portal.Blazor.Server/Pages/Articles/ListBySource.razor
+++ b/Newsbot.Portal.Blazor.Server/Pages/Articles/ListBySource.razor
@@ -2,32 +2,42 @@
 @using Newsbot.Collector.Client.Domain.Dto
 @using Newsbot.Collector.Client
 
-<h3>ListBySource</h3>
+<PageTitle>@Record?.Name</PageTitle>
+<h3>@Record?.Name</h3>
 
-<table>
-    <tr>
-        <td>Title</td>
-        <td>Publish Date</td>
-    </tr>
+<div class="container">
+    <div class="row">
     @foreach (var item in Data ??= new List<ArticlesDto>())
     {
-        <tr>
-            <td>
-                <a href="@item.Url" target="_blank">@item.Title</a><br/>
-            </td>
-            <td>@item.PubDate</td>
-        </tr>
+        <div class="col-sm">
+            <div class="card" style="width: 18rem;">
+                <img src="@item.Thumbnail" class="card-img-top" alt="...">
+                <div class="card-body">
+                    <h5 class="card-title">
+                        <a href="@item.Url" target="_blank">@item.Title</a>
+                    </h5>
+                    <p class="card-text">@item.PubDate</p>
+                    <p class="card-text">@item.Description</p>
+                    <a href="@item.Url" class="btn btn-primary" target="_blank">View</a>
+                </div>
+            </div>
+        </div>
     }
-</table>
+    </div>
+</div>
 
 @code {
     [Parameter]
     public string? Id { get; set; }
     
     List<ArticlesDto>? Data { get; set; }
+    SourcesDto? Record { get; set; }
     
     protected override async Task OnInitializedAsync()
     {
+        var s = new SourcesClient(Global.HttpClient, Global.DefaultInstanceUri ?? "");
+        Record = await s.GetAsync(Guid.Parse(Id ?? ""));
+        
         var c = new ArticlesClient(Global.HttpClient, Global.DefaultInstanceUri ?? "");
         var items = await c.ListBySourceAsync(Guid.Parse(Id ?? ""));
         Data = items;
diff --git a/Newsbot.Portal.Blazor.Server/Pages/Articles/Sources.razor b/Newsbot.Portal.Blazor.Server/Pages/Articles/Sources.razor
deleted file mode 100644
index 2d73d3b..0000000
--- a/Newsbot.Portal.Blazor.Server/Pages/Articles/Sources.razor
+++ /dev/null
@@ -1,33 +0,0 @@
-@page "/articles/sources"
-@using Newsbot.Collector.Client
-@using Newsbot.Collector.Client.Domain.Dto
-<h3>Select Source</h3>
-
-<table>
-    <tr>
-        <td>Source</td>
-        <td>Name</td>
-        <td>Type</td>
-    </tr>    
-@foreach (var item in Items ??= new List<SourcesDto>())
-{
-    <tr>
-        <td>@item.Source</td>
-        <td>
-            <a href="/articles/sources/@item.Id">@item.Name</a>
-        </td>
-        <td>@item.Type</td>
-    </tr>
-}
-</table>
-
-@code {
-    private List<SourcesDto>? Items { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        var c = new SourcesClient(Global.HttpClient, Global.DefaultInstanceUri ?? "");
-        Items = await c.ListAsync();
-        
-    }
-}
\ No newline at end of file