diff --git a/DokterApp/Homepage.xaml b/DokterApp/Homepage.xaml
deleted file mode 100644
index 3431c04..0000000
--- a/DokterApp/Homepage.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Page x:Class="DokterApp.Homepage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:DokterApp"
-      mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
-      Title="Homepage">
-
-    <Grid>
-        
-    </Grid>
-</Page>
diff --git a/DokterApp/MainWindow.xaml b/DokterApp/MainWindow.xaml
index d1cf291..1c9bce1 100644
--- a/DokterApp/MainWindow.xaml
+++ b/DokterApp/MainWindow.xaml
@@ -17,11 +17,12 @@
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
         <StackPanel Grid.ColumnSpan="2" Grid.RowSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0" Orientation="Vertical">
+            <Label Content="Sensei" Margin="0,0,0,20" HorizontalAlignment="Center"/>
             <Label Content="Username" HorizontalContentAlignment="Center"/>
             <TextBox x:Name="Username" TextWrapping="Wrap" Width="120"/>
             <Label Content="Password" HorizontalContentAlignment="Center"/>
             <TextBox x:Name="Password" TextWrapping="Wrap" Width="120"/>
-            <Button x:Name="Login" Content="Login" Margin="0,20,0,0" />
+            <Button x:Name="Login" Content="Login" Margin="0,20,0,0" Click="Login_Click_1" />
         </StackPanel>
 
     </Grid>
diff --git a/DokterApp/MainWindow.xaml.cs b/DokterApp/MainWindow.xaml.cs
index 9bd0003..fc2bab1 100644
--- a/DokterApp/MainWindow.xaml.cs
+++ b/DokterApp/MainWindow.xaml.cs
@@ -25,16 +25,16 @@ namespace DokterApp
             InitializeComponent();
         }
 
-        
-
-        private void Login_Click(object sender, RoutedEventArgs e)
-        {
-            
-        }
-
         private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
 
         }
+
+        private void Login_Click_1(object sender, RoutedEventArgs e)
+        {
+            WindowTabs windowTabs = new WindowTabs();
+            windowTabs.Show();
+            this.Close();
+        }
     }
 }
diff --git a/DokterApp/UserControl.xaml b/DokterApp/UserControl.xaml
deleted file mode 100644
index 30020ea..0000000
--- a/DokterApp/UserControl.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<UserControl x:Class="DokterApp.UserControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:DokterApp"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-            
-    </Grid>
-</UserControl>
diff --git a/DokterApp/UserControlForTab.xaml b/DokterApp/UserControlForTab.xaml
new file mode 100644
index 0000000..5b1b2d0
--- /dev/null
+++ b/DokterApp/UserControlForTab.xaml
@@ -0,0 +1,42 @@
+<UserControl x:Class="DokterApp.UserControlForTab"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DokterApp"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="5*"/>
+            <ColumnDefinition Width="3*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Horizontal">
+            <Label Content="Label"/>
+            <Label Content="Label"/>
+        </StackPanel>
+        <StackPanel Grid.Row="1">
+            <StackPanel Orientation="Horizontal" Height="50">
+                <Label Content="Label"/>
+                <Label Content="Label"/>
+                <Label Content="Label"/>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Height="50">
+                <TextBox Text="TextBox" TextWrapping="Wrap" Width="120"/>
+                <TextBox Text="TextBox" TextWrapping="Wrap" Width="120"/>
+                <TextBox Text="TextBox" TextWrapping="Wrap" Width="120"/>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Height="50">
+                <Label Content="Label"/>
+                <Label Content="Label"/>
+                <Label Content="Label"/>
+            </StackPanel>
+        </StackPanel>
+
+    </Grid>
+</UserControl>
diff --git a/DokterApp/Homepage.xaml.cs b/DokterApp/UserControlForTab.xaml.cs
similarity index 76%
rename from DokterApp/Homepage.xaml.cs
rename to DokterApp/UserControlForTab.xaml.cs
index 4e94a78..2c34c55 100644
--- a/DokterApp/Homepage.xaml.cs
+++ b/DokterApp/UserControlForTab.xaml.cs
@@ -14,11 +14,11 @@ using System.Windows.Shapes;
 namespace DokterApp
 {
     /// <summary>
-    /// Interaction logic for Homepage.xaml
+    /// Interaction logic for UserControlForTab.xaml
     /// </summary>
-    public partial class Homepage : Page
+    public partial class UserControlForTab : UserControl
     {
-        public Homepage()
+        public UserControlForTab()
         {
             InitializeComponent();
         }
diff --git a/DokterApp/WindowTabs.xaml b/DokterApp/WindowTabs.xaml
new file mode 100644
index 0000000..0ba52cf
--- /dev/null
+++ b/DokterApp/WindowTabs.xaml
@@ -0,0 +1,20 @@
+<Window x:Class="DokterApp.WindowTabs"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:DokterApp"
+        mc:Ignorable="d"
+        Title="WindowTabs" Height="450" Width="800">
+    <Grid>
+        <TabControl>
+            <TabItem Header="TabItem">
+                <Grid Background="#FFE5E5E5"/>
+            </TabItem>
+            <TabItem Header="TabItem">
+                <Grid Background="#FFE5E5E5"/>
+            </TabItem>
+        </TabControl>
+
+    </Grid>
+</Window>
diff --git a/DokterApp/UserControl.xaml.cs b/DokterApp/WindowTabs.xaml.cs
similarity index 72%
rename from DokterApp/UserControl.xaml.cs
rename to DokterApp/WindowTabs.xaml.cs
index 228deca..e1baf45 100644
--- a/DokterApp/UserControl.xaml.cs
+++ b/DokterApp/WindowTabs.xaml.cs
@@ -8,17 +8,16 @@ using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
 using System.Windows.Shapes;
 
 namespace DokterApp
 {
     /// <summary>
-    /// Interaction logic for UserControl.xaml
+    /// Interaction logic for WindowTabs.xaml
     /// </summary>
-    public partial class UserControl : UserControl
+    public partial class WindowTabs : Window
     {
-        public UserControl()
+        public WindowTabs()
         {
             InitializeComponent();
         }