diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonHeader.razor b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonHeader.razor
index 37e9cf5..b625fb9 100644
--- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonHeader.razor	
+++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonHeader.razor	
@@ -1,6 +1,6 @@
 
 <!-- Heading + Buttons -->
-<div class="top-row row w-100 mx-0 bg-secondary py-3">
+<div class="top-row row rounded-bottom-5 w-100 bg-secondary py-3">
 
     <div class="col-4"></div>
 
diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor
index e6098fa..5ff8ca5 100644
--- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor	
+++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor	
@@ -7,7 +7,7 @@
 
 
 <!-- Main UI -->
-<div class="card shadow border-0 mt-4 m-auto w-50">
+<div class="card shadow border-0 mt-4 m-auto w-75">
 
     <!-- Table Header -->
     <div class="card-header bg-secondary bg-gradient ml-0 py-3">
@@ -26,13 +26,13 @@
             <!-- Table Head -->
             <thead>
                 <tr>
-                    <th class="text-bg-info col col-2" scope="col"></th>
+                    <th class="text-bg-info col" scope="col"></th>
                     <th class="text-bg-info col pokemon-dex-width" scope="col">#</th>
                     <th class="text-bg-info col pokemon-name-width" scope="col">Pokemon</th>
-                    <th class="text-bg-info col pokemon-type-width" scope="col">Type</th>
-                    <th class="text-bg-info col pokemon-type-width" scope="col">Sleep Type</th>
-                    <th class="text-bg-info col pokemon-type-width" scope="col">Speciality</th>
-                    <th class="text-bg-info col pokemon-type-width" scope="col"></th>
+                    <th class="text-bg-info col " scope="col">Type</th>
+                    <th class="text-bg-info col " scope="col">Sleep Type</th>
+                    <th class="text-bg-info col " scope="col">Speciality</th>
+                    <th class="text-bg-info col " scope="col"></th>
                 </tr>
             </thead>
             @if(pokemons == null)
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonCreate.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonCreate.razor
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonCreate.razor.cs b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor.cs
similarity index 94%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonCreate.razor.cs
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor.cs
index 000c704..483f8e2 100644
--- a/Portfolio.WebUI.Server/Components/Pages/PokemonCreate.razor.cs
+++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor.cs	
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components.Web;
 using Portfolio.Domain.Features.Pokemon;
 
-namespace Portfolio.WebUI.Server.Components.Pages
+namespace Portfolio.WebUI.Server.Components.Pages.Pokemon_Pages
 {
     public partial class PokemonCreate
     {
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonCreate.razor.css b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor.css
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonCreate.razor.css
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor.css
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonEdit.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonEdit.razor
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonEdit.razor
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonEdit.razor
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonEdit.razor.cs b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonEdit.razor.cs
similarity index 93%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonEdit.razor.cs
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonEdit.razor.cs
index f45d4e0..d5a8088 100644
--- a/Portfolio.WebUI.Server/Components/Pages/PokemonEdit.razor.cs
+++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonEdit.razor.cs	
@@ -2,7 +2,7 @@
 using Microsoft.JSInterop;
 using Portfolio.Domain.Features.Pokemon;
 
-namespace Portfolio.WebUI.Server.Components.Pages
+namespace Portfolio.WebUI.Server.Components.Pages.Pokemon_Pages
 {
     public partial class PokemonEdit
     {
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonEdit.razor.css b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonEdit.razor.css
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonEdit.razor.css
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonEdit.razor.css
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonRate.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonRate.razor
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonRate.razor.cs b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor.cs
similarity index 98%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonRate.razor.cs
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor.cs
index cc7c22b..96cda6c 100644
--- a/Portfolio.WebUI.Server/Components/Pages/PokemonRate.razor.cs
+++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor.cs	
@@ -3,7 +3,7 @@ using Portfolio.Domain.Features.Pokemon;
 using Portfolio.Domain.Features.Pokemon_Natures;
 using Portfolio.Domain.Features.Pokemon_Subskills;
 
-namespace Portfolio.WebUI.Server.Components.Pages
+namespace Portfolio.WebUI.Server.Components.Pages.Pokemon_Pages
 {
     public partial class PokemonRate
     {
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonRate.razor.css b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor.css
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonRate.razor.css
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor.css
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonSleep.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonSleep.razor
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonSleep.razor.cs b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor.cs
similarity index 93%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonSleep.razor.cs
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor.cs
index 09f37b2..0c2199f 100644
--- a/Portfolio.WebUI.Server/Components/Pages/PokemonSleep.razor.cs
+++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor.cs	
@@ -1,7 +1,7 @@
 using Portfolio.Application.Services.PokemonService;
 using Portfolio.Domain.Features.Pokemon;
 
-namespace Portfolio.WebUI.Server.Components.Pages
+namespace Portfolio.WebUI.Server.Components.Pages.Pokemon_Pages
 {
     public partial class PokemonSleep
     {
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonSleep.razor.css b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor.css
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonSleep.razor.css
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor.css
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonView.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonView.razor
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonView.razor.cs b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor.cs
similarity index 96%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonView.razor.cs
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor.cs
index 10341e0..f9aeecf 100644
--- a/Portfolio.WebUI.Server/Components/Pages/PokemonView.razor.cs
+++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor.cs	
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Portfolio.Domain.Features.Pokemon;
 
-namespace Portfolio.WebUI.Server.Components.Pages
+namespace Portfolio.WebUI.Server.Components.Pages.Pokemon_Pages
 {
     public partial class PokemonView
     {
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonView.razor.css b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor.css
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Pages/PokemonView.razor.css
rename to Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor.css