diff --git a/mastermind/AppShell.xaml b/mastermind/AppShell.xaml
index 1336b6c..44e511f 100644
--- a/mastermind/AppShell.xaml
+++ b/mastermind/AppShell.xaml
@@ -10,5 +10,5 @@
 
     <ShellContent 
         Title="Connexion"
-        ContentTemplate="{DataTemplate pages:connexionPage}" />
+        ContentTemplate="{DataTemplate pages:ConnexionPage}" />
 </Shell>
diff --git a/mastermind/Pages/connexionPage.xaml b/mastermind/Pages/connexionPage.xaml
index cfb6d1d..7162450 100644
--- a/mastermind/Pages/connexionPage.xaml
+++ b/mastermind/Pages/connexionPage.xaml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="mastermind.Pages.connexionPage"
+             xmlns:Views="clr-namespace:mastermind.Views"
+             x:Class="mastermind.Pages.ConnexionPage"
              Title="Connexion">
     <VerticalStackLayout>
         <Label
@@ -10,40 +11,8 @@
             FontSize="Header"
             Margin="0, 0, 0, 50"/>
 
-        <Grid
-            Margin="0, 50"
-            ColumnDefinitions="auto, *, 8*, *"
-            RowDefinitions="auto">
-
-            <Label
-                Text="Joueur 1"
-                FontSize="Large"
-                Margin="50, 0, 0, 0"
-                VerticalOptions="Center"
-                HorizontalOptions="Center"/>
-            <Entry 
-                Grid.Column="2"
-                FontSize="Medium"
-                Margin="50, 0"/>
-        </Grid>
-
-        <Grid
-            Margin="0, 50"
-            ColumnDefinitions="auto, *, 8*, *"
-            RowDefinitions="auto">
-
-            <Label
-                Text="Joueur 2"
-                FontSize="Large"
-                Margin="50, 0, 0, 0"
-                VerticalOptions="Center"
-                HorizontalOptions="Center"/>
-
-            <Entry 
-                Grid.Column="2"
-                FontSize="Medium"
-                Margin="50, 0"/>
-        </Grid>
+        <Views:UsernameEntryView/>
+        <Views:UsernameEntryView/>
 
         <Button
             Text="Se connecter"
diff --git a/mastermind/Pages/connexionPage.xaml.cs b/mastermind/Pages/connexionPage.xaml.cs
index 1ff9d8a..5d6d432 100644
--- a/mastermind/Pages/connexionPage.xaml.cs
+++ b/mastermind/Pages/connexionPage.xaml.cs
@@ -1,8 +1,8 @@
 namespace mastermind.Pages;
 
-public partial class connexionPage : ContentPage
+public partial class ConnexionPage : ContentPage
 {
-	public connexionPage()
+	public ConnexionPage()
 	{
 		InitializeComponent();
 	}
diff --git a/mastermind/Views/UsernameEntryView.xaml b/mastermind/Views/UsernameEntryView.xaml
new file mode 100644
index 0000000..b2e865d
--- /dev/null
+++ b/mastermind/Views/UsernameEntryView.xaml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="mastermind.Views.UsernameEntryView">
+
+    <Grid
+        Margin="0, 50"
+        ColumnDefinitions="auto, *, 8*, *"
+        RowDefinitions="auto">
+
+        <Label
+            Text="Joueur X"
+            FontSize="Large"
+            Margin="50, 0, 0, 0"
+            VerticalOptions="Center"
+            HorizontalOptions="Center"/>
+        
+        <Entry 
+            Grid.Column="2"
+            FontSize="Medium"
+            Margin="50, 0"/>
+    </Grid>
+
+</ContentView>
diff --git a/mastermind/Views/UsernameEntryView.xaml.cs b/mastermind/Views/UsernameEntryView.xaml.cs
new file mode 100644
index 0000000..408e669
--- /dev/null
+++ b/mastermind/Views/UsernameEntryView.xaml.cs
@@ -0,0 +1,9 @@
+namespace mastermind.Views;
+
+public partial class UsernameEntryView : ContentView
+{
+	public UsernameEntryView()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/mastermind/mastermind.csproj b/mastermind/mastermind.csproj
index f9dbbd2..a79c8dc 100644
--- a/mastermind/mastermind.csproj
+++ b/mastermind/mastermind.csproj
@@ -67,12 +67,15 @@
 	    <DependentUpon>Connexion.xaml</DependentUpon>
 	  </Compile>
 	  <Compile Update="Pages\connexionPage.xaml.cs">
-	    <DependentUpon>connexionPage.xaml</DependentUpon>
+	    <DependentUpon>ConnexionPage.xaml</DependentUpon>
 	  </Compile>
 	</ItemGroup>
 
 	<ItemGroup>
-	  <MauiXaml Update="Pages\connexionPage.xaml">
+	  <MauiXaml Update="Pages\ConnexionPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Views\UsernameEntry.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	</ItemGroup>