diff --git a/PCUT/PCUT/Pages/UserManagement/UpsertUserPage.xaml b/PCUT/PCUT/Pages/UserManagement/UpsertUserPage.xaml
index f571bd7..d8d0a55 100644
--- a/PCUT/PCUT/Pages/UserManagement/UpsertUserPage.xaml
+++ b/PCUT/PCUT/Pages/UserManagement/UpsertUserPage.xaml
@@ -56,7 +56,8 @@
                 <RowDefinition Height="0.12*"/>
                 <RowDefinition Height="0.12*"/>
                 <RowDefinition Height="0.12*"/>
-                <RowDefinition Height="0.28*"/>
+                <RowDefinition Height="0.1*"/>
+                <RowDefinition Height="0.18*"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="0.05*"/>
@@ -260,89 +261,97 @@
 
             <Grid
                 Grid.Row="2" Grid.Column="2"
-                Grid.ColumnSpan="2" Grid.RowSpan="2"
-                HorizontalAlignment="Stretch">
+                Grid.ColumnSpan="2" Grid.RowSpan="5">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="0.1*"/>
-                    <RowDefinition Height="0.15*"/>
-                    <RowDefinition Height="0.75*"/>
+                    <RowDefinition Height="0.6*"/>
+                    <RowDefinition Height="0.4*"/>
                 </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.1*"/>
-                    <ColumnDefinition Width="0.8*"/>
-                    <ColumnDefinition Width="0.1*"/>
-                </Grid.ColumnDefinitions>
-                <TextBlock
-                    Grid.Row="1" Grid.Column="1"
-                    Text="Permission:"
-                    FontSize="20"
-                    Style="{StaticResource TexBlockStyle}"/>
-                <StackPanel Grid.Row="2" Grid.Column="1">
-                    <GridView Grid.Row="2" Grid.Column="1"
-                        x:Name="Permissions"
+
+                <Grid
+                    Grid.Row="0"
+                    HorizontalAlignment="Stretch">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="0.1*"/>
+                        <RowDefinition Height="0.15*"/>
+                        <RowDefinition Height="0.75*"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="0.1*"/>
+                        <ColumnDefinition Width="0.8*"/>
+                        <ColumnDefinition Width="0.1*"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock
+                        Grid.Row="1" Grid.Column="1"
+                        Text="Permission:"
+                        FontSize="20"
+                        Style="{StaticResource TexBlockStyle}"/>
+                    <StackPanel Grid.Row="2" Grid.Column="1">
+                        <GridView Grid.Row="2" Grid.Column="1"
+                            MaxHeight="100"
+                            x:Name="Permissions"
+                            ScrollViewer.HorizontalScrollMode="Disabled"
+                            ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                            ScrollViewer.VerticalScrollMode="Enabled"
+                            ScrollViewer.VerticalScrollBarVisibility="Auto"
+                            IsEnabled="{Binding Role, Mode=OneWay, Converter={StaticResource roleToEnable}}"
+                            ItemsSource="{Binding Permissions}">
+                            <GridView.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <ItemsWrapGrid HorizontalAlignment="Left" Orientation="Horizontal"/>
+                                </ItemsPanelTemplate>
+                            </GridView.ItemsPanel>
+                            <GridView.ItemTemplate>
+                                <DataTemplate>
+                                    <CheckBox
+                                        Content="{Binding Name, Mode=OneWay}"
+                                        IsChecked="{Binding IsSelected, Mode=TwoWay}"/>
+                                </DataTemplate>
+                            </GridView.ItemTemplate>
+                        </GridView>
+                        <TextBlock
+                            Style="{StaticResource TexBlockStyle}"><Bold>Allow Custom Paper Size:</Bold></TextBlock>
+                        <CheckBox
+                            Content="Custom Size"
+                            IsChecked="{Binding IsPermittedEdit, Mode=TwoWay}"
+                            IsEnabled="{Binding Role, Mode=OneWay, Converter={StaticResource roleToEnable}}" />
+                    </StackPanel>
+                </Grid>
+
+                <Grid
+                    Grid.Row="1"
+                    HorizontalAlignment="Stretch">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="0.3*"/>
+                        <RowDefinition Height="0.7*"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="0.1*"/>
+                        <ColumnDefinition Width="0.8*"/>
+                        <ColumnDefinition Width="0.1*"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock
+                        Grid.Row="0" Grid.Column="1"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource TexBlockStyle}"
+                        Text="Description:"
+                        FontSize="20" />
+                    <TextBox
+                        Grid.Row="1" Grid.Column="1"
+                        x:Name="DescriptionBox"
+                        VerticalAlignment="Stretch"
+                        AcceptsReturn="True"
+                        TextWrapping="Wrap"
                         ScrollViewer.HorizontalScrollMode="Disabled"
                         ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                         ScrollViewer.VerticalScrollMode="Enabled"
                         ScrollViewer.VerticalScrollBarVisibility="Auto"
-                        IsEnabled="{Binding Role, Mode=OneWay, Converter={StaticResource roleToEnable}}"
-                        ItemsSource="{Binding Permissions}">
-                        <GridView.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <ItemsWrapGrid HorizontalAlignment="Left" Orientation="Horizontal"/>
-                            </ItemsPanelTemplate>
-                        </GridView.ItemsPanel>
-                        <GridView.ItemTemplate>
-                            <DataTemplate>
-                                <CheckBox
-                                Content="{Binding Name, Mode=OneWay}"
-                                IsChecked="{Binding IsSelected, Mode=TwoWay}"/>
-                            </DataTemplate>
-                        </GridView.ItemTemplate>
-                    </GridView>
-                    <TextBlock
-                        Style="{StaticResource TexBlockStyle}"><Bold>Allow Custom Paper Size:</Bold></TextBlock>
-                    <CheckBox
-                        Content="Custom Size"
-                        IsChecked="{Binding IsPermittedEdit, Mode=TwoWay}"
-                        IsEnabled="{Binding Role, Mode=OneWay, Converter={StaticResource roleToEnable}}" />
-                </StackPanel>
+                        Text="{Binding Description, Mode=TwoWay}"
+                        FontSize="20" />
+                </Grid>
             </Grid>
 
-            <Grid
-                Grid.Row="4" Grid.Column="2"
-                Grid.ColumnSpan="2" Grid.RowSpan="2"
-                HorizontalAlignment="Stretch">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="0.15*"/>
-                    <RowDefinition Height="0.25*"/>
-                    <RowDefinition Height="0.6*"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.1*"/>
-                    <ColumnDefinition Width="0.8*"/>
-                    <ColumnDefinition Width="0.1*"/>
-                </Grid.ColumnDefinitions>
-                <TextBlock
-                    Grid.Row="1" Grid.Column="1"
-                    HorizontalAlignment="Center"
-                    Style="{StaticResource TexBlockStyle}"
-                    Text="Description:"
-                    FontSize="20" />
-                <TextBox
-                    Grid.Row="2" Grid.Column="1"
-                    x:Name="DescriptionBox"
-                    VerticalAlignment="Stretch"
-                    AcceptsReturn="True"
-                    TextWrapping="Wrap"
-                    ScrollViewer.HorizontalScrollMode="Disabled"
-                    ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                    ScrollViewer.VerticalScrollMode="Enabled"
-                    ScrollViewer.VerticalScrollBarVisibility="Auto"
-                    Text="{Binding Description, Mode=TwoWay}"
-                    FontSize="20" />
-            </Grid>
-
-            <Grid Grid.Row="6" Grid.Column="3">
+            <Grid Grid.Row="7" Grid.Column="3">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="0.1*"/>
                     <RowDefinition Height="0.9*"/>