47 files changed, 228 insertions, 177 deletions
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml
deleted file mode 100644
index a102840..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml
+++ /dev/null
@@ -1,127 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.ApartmentDefectPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:ViewModel="using:ApartmentManager.ViewModel"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:ApartmentManager.View"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <ViewModel:ApartmentViewModel/>
-    </Page.DataContext>
-
-    <Page.BottomAppBar>
-        <CommandBar>
-            <CommandBar.Content>
-                <Grid />
-            </CommandBar.Content>
-            <AppBarButton
-                Click="NavigateNewDefect"               
-                Icon="Add"
-                Label="Create Defect">
-            </AppBarButton>
-        </CommandBar>
-    </Page.BottomAppBar>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="45"/>
-            <RowDefinition/>
-        </Grid.RowDefinitions>
-        
-            <TextBlock Grid.Row="0"
-                HorizontalAlignment="Center"
-                FontSize="30"
-                FontWeight="Bold"
-                Text="Apartment Changes">
-            </TextBlock>
-
-        <ListView ItemsSource="{Binding CatalogSingleton.Defects}" SelectedItem="{Binding CatalogSingleton.SelectedDefect, Mode=TwoWay}" SelectionChanged="NavigateDefectViewPage" Grid.Row="1" Background="LightGray">
-            <ListView.ItemContainerStyle>
-                <Style TargetType="ListViewItem">
-                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                </Style>
-            </ListView.ItemContainerStyle>
-
-
-            <ListView.ItemTemplate>
-                <DataTemplate>
-                    <Grid Height="200" BorderThickness ="1" Margin="12,12,12,0" BorderBrush="#DFE0E4" Background="White" >
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="200" />
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-
-                        <Image
-                                Margin="5"
-                                Source="{Binding Pictures[0].Picture}"
-                                Stretch="Fill">
-                        </Image>
-
-                        <StackPanel Grid.Column="1" Margin="10">
-
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock
-                                        Margin="0,0,10,0"
-                                        FontSize="30"
-                                        FontWeight="Bold"
-                                        Text="Name :">
-                                </TextBlock>
-                                <TextBlock
-                                        Margin="0,0,10,0"
-                                        FontSize="30"
-                                        Text="{Binding Name}">
-                                </TextBlock>
-
-                            </StackPanel>
-
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock
-                                        Width="800"
-                                        Height="108"
-                                        Margin="0,0,10,0"
-                                        FontSize="20"
-                                        Text="{Binding Description}"
-                                        TextWrapping="Wrap">
-                                </TextBlock>
-                            </StackPanel>
-
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock
-                                        Margin="0,0,10,0"
-                                        FontSize="25"
-                                        FontWeight="Bold"
-                                        Text="Status :">
-                                </TextBlock>
-                                <TextBlock
-                                        Margin="0,0,10,0"
-                                        FontSize="25"
-                                        Text="{Binding Status}">
-                                </TextBlock>
-
-                                <TextBlock
-                                        Margin="700,0,10,0"
-                                        HorizontalAlignment="Left"
-                                        FontSize="25"
-                                        FontWeight="Bold"
-                                        Text="Date Submitted :">
-                                </TextBlock>
-
-                                <TextBlock FontSize="25" Text="{Binding UploadDate.Year}" />
-                                <TextBlock FontSize="25" Text="-" />
-                                <TextBlock FontSize="25" Text="{Binding UploadDate.Month}" />
-                                <TextBlock FontSize="25" Text="-" />
-                                <TextBlock FontSize="25" Text="{Binding UploadDate.Day}" />
-                            </StackPanel>
-                        </StackPanel>
-                    </Grid>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-
-        </ListView>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml
index 78907a0..78907a0 100644
--- a/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml.cs
index d7d67e6..d7d67e6 100644
--- a/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml
index 215496b..b0e9a45 100644
--- a/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml
@@ -78,7 +78,7 @@
         <ListView
             x:Name="ChangesList"
             Grid.Row="1"
-            ItemsSource="{Binding BmSingleton.ApartmentChanges}"
+            ItemsSource="{Binding BmSingleton.Changes}"
             SelectedItem="{Binding ChangeTemplate, Mode=TwoWay}">
             <ListView.ItemContainerStyle>
                 <Style BasedOn="{StaticResource ListItemStyle}" TargetType="ListViewItem" />
diff --git a/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml.cs
index a63f85c..a63f85c 100644
--- a/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml
index 3c63754..3c63754 100644
--- a/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml.cs
index 41c3f67..41c3f67 100644
--- a/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml
index e2e19cd..e2e19cd 100644
--- a/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml.cs
index 054bca6..054bca6 100644
--- a/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml
index e667583..e667583 100644
--- a/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml.cs
index 62fc8d2..62fc8d2 100644
--- a/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml
index b6c9759..b6c9759 100644
--- a/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml.cs
index 8b38af0..8b38af0 100644
--- a/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml
index 46ea641..46ea641 100644
--- a/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml.cs
index 63e71eb..63e71eb 100644
--- a/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml
index 6d8518a..6d8518a 100644
--- a/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml.cs
index 715f47e..715f47e 100644
--- a/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml
index 5089904..5089904 100644
--- a/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml.cs
index edba09e..edba09e 100644
--- a/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmMainPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml
index 3cf03a3..e812cc0 100644
--- a/ApartmentManager/ApartmentManager/View/BmMainPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml
@@ -19,6 +19,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="600" />
                 <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="200" />
             </Grid.ColumnDefinitions>
             <Image
                 Grid.Column="0"
@@ -29,7 +30,7 @@
                     Margin="0,0,0,10"
                     HorizontalAlignment="Stretch"
                     FontSize="20"
-                    Text="Manage:" />
+                    Text="Manage all:" />
                 <Button
                     Margin="0,0,0,10"
                     HorizontalAlignment="Stretch"
@@ -76,7 +77,54 @@
                     Content="Apartment changes">
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="Click">
-                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmApartmentChangesPage" />
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmChangesPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </Button>
+            </StackPanel>
+            <StackPanel Grid.Column="2" Margin="20,0,0,0">
+                <TextBlock
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    FontSize="20"
+                    Text="Manage your:" />
+                <Button
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    Content="Apartment">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.ApartmentPlanPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </Button>
+                <Button
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    Content="Apartment Residents">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.ApartmentResidentsPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </Button>
+                <Button
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    Content="Apartment Defects">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.ApartmentDefectPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </Button>
+                <Button
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    Content="Apartment changes">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.ApartmentChangesPage" />
                         </core:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                 </Button>
diff --git a/ApartmentManager/ApartmentManager/View/BmMainPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml.cs
index 5d287f1..5d287f1 100644
--- a/ApartmentManager/ApartmentManager/View/BmMainPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml
index 332ef2a..332ef2a 100644
--- a/ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml.cs
index 2a43996..2a43996 100644
--- a/ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmSingleChangePage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleChangePage.xaml
index 195095b..195095b 100644
--- a/ApartmentManager/ApartmentManager/View/BmSingleChangePage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleChangePage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmSingleChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleChangePage.xaml.cs
index d4bcc40..d4bcc40 100644
--- a/ApartmentManager/ApartmentManager/View/BmSingleChangePage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleChangePage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmSingleDefectPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleDefectPage.xaml
index 2e7a935..2e7a935 100644
--- a/ApartmentManager/ApartmentManager/View/BmSingleDefectPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleDefectPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmSingleDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleDefectPage.xaml.cs
index 340e86a..340e86a 100644
--- a/ApartmentManager/ApartmentManager/View/BmSingleDefectPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleDefectPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmUsersPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmUsersPage.xaml
index 77c60f7..77c60f7 100644
--- a/ApartmentManager/ApartmentManager/View/BmUsersPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmUsersPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmUsersPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmUsersPage.xaml.cs
index de51f22..de51f22 100644
--- a/ApartmentManager/ApartmentManager/View/BmUsersPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmUsersPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentChangesPage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesPage.xaml
index aebe8a5..e94b0dc 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentChangesPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesPage.xaml
@@ -2,14 +2,14 @@
     x:Class="ApartmentManager.View.ApartmentChangesPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:ApartmentManager.View"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:ApartmentManager.View"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModel="using:ApartmentManager.ViewModel"
     mc:Ignorable="d">
 
     <Page.DataContext>
-        <viewModel:ApartmentViewModel/>
+        <viewModel:ApartmentViewModel />
     </Page.DataContext>
 
     <Page.BottomAppBar>
@@ -17,27 +17,32 @@
             <CommandBar.Content>
                 <Grid />
             </CommandBar.Content>
-            <AppBarButton                      
+            <AppBarButton
+                Click="GotoNewChangePage"
                 Icon="Add"
-                Label="Create Defect" Click="GotoNewChangePage">
-            </AppBarButton>
+                Label="Create Defect" />
         </CommandBar>
     </Page.BottomAppBar>
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Grid.RowDefinitions>
-            <RowDefinition Height="45"/>
-            <RowDefinition/>
+            <RowDefinition Height="45" />
+            <RowDefinition />
         </Grid.RowDefinitions>
 
-        <TextBlock Grid.Row="0"
-                   HorizontalAlignment="Center"
-                   FontSize="30"
-                   FontWeight="Bold"
-                   Text="Apartment Changes">
-        </TextBlock>
-
-        <ListView ItemsSource="{Binding CatalogSingleton.ApartmentChanges}" SelectedItem="{Binding CatalogSingleton.SelectedChange, Mode=TwoWay}" Grid.Row="1" Background="LightGray" SelectionChanged="GotoApartmentChangeViewPage">
+        <TextBlock
+            Grid.Row="0"
+            HorizontalAlignment="Center"
+            FontSize="30"
+            FontWeight="Bold"
+            Text="Apartment Changes" />
+
+        <ListView
+            Grid.Row="1"
+            Background="LightGray"
+            ItemsSource="{Binding CatalogSingleton.Changes}"
+            SelectedItem="{Binding CatalogSingleton.SelectedChange, Mode=TwoWay}"
+            SelectionChanged="GotoApartmentChangeViewPage">
             <ListView.ItemContainerStyle>
                 <Style TargetType="ListViewItem">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -47,17 +52,18 @@
 
             <ListView.ItemTemplate>
                 <DataTemplate>
-                    <Grid Height="200" BorderThickness ="1" Margin="12,12,12,0" BorderBrush="#DFE0E4" Background="White" >
+                    <Grid
+                        Height="200"
+                        Margin="12,12,12,0"
+                        Background="White"
+                        BorderBrush="#DFE0E4"
+                        BorderThickness="1">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="300" />
-                            <ColumnDefinition/>
+                            <ColumnDefinition />
                         </Grid.ColumnDefinitions>
 
-                        <Image
-                            Margin="5"
-                            Source="{Binding Documents[0].Document}"
-                            >
-                        </Image>
+                        <Image Margin="5" Source="{Binding Documents[0].Document}" />
 
                         <StackPanel Grid.Column="1" Margin="10">
 
@@ -66,13 +72,11 @@
                                     Margin="0,0,10,0"
                                     FontSize="30"
                                     FontWeight="Bold"
-                                    Text="Name :">
-                                </TextBlock>
+                                    Text="Name :" />
                                 <TextBlock
                                     Margin="0,0,10,0"
                                     FontSize="30"
-                                    Text="{Binding Name}">
-                                </TextBlock>
+                                    Text="{Binding Name}" />
 
                             </StackPanel>
 
@@ -83,8 +87,7 @@
                                     Margin="0,0,10,0"
                                     FontSize="20"
                                     Text="{Binding Description}"
-                                    TextWrapping="Wrap">
-                                </TextBlock>
+                                    TextWrapping="Wrap" />
                             </StackPanel>
 
                             <StackPanel Orientation="Horizontal">
@@ -92,21 +95,18 @@
                                     Margin="0,0,10,0"
                                     FontSize="25"
                                     FontWeight="Bold"
-                                    Text="Status :">
-                                </TextBlock>
+                                    Text="Status :" />
                                 <TextBlock
                                     Margin="0,0,10,0"
                                     FontSize="25"
-                                    Text="{Binding Status}">
-                                </TextBlock>
+                                    Text="{Binding Status}" />
 
                                 <TextBlock
                                     Margin="700,0,10,0"
                                     HorizontalAlignment="Left"
                                     FontSize="25"
                                     FontWeight="Bold"
-                                    Text="Date Submitted :">
-                                </TextBlock>
+                                    Text="Date Submitted :" />
 
                                 <TextBlock FontSize="25" Text="{Binding UploadDate.Year}" />
                                 <TextBlock FontSize="25" Text="-" />
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentChangesPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesPage.xaml.cs
index c498d1d..c498d1d 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentChangesPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentChangesViewPage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesViewPage.xaml
index 5ec7b99..dc957d1 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentChangesViewPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesViewPage.xaml
@@ -16,10 +16,10 @@
             <CommandBar.Content>
                 <Grid />
             </CommandBar.Content>
-            <AppBarButton                             
+            <AppBarButton
+                Click="GotoApartmentChangesPage"
                 Icon="back"
-                Label="Create Defect" Click="GotoApartmentChangesPage" >
-            </AppBarButton>
+                Label="Create Defect" />
         </CommandBar>
     </Page.BottomAppBar>
 
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentChangesViewPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesViewPage.xaml.cs
index d3030ff..d3030ff 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentChangesViewPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesViewPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectPage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectPage.xaml
new file mode 100644
index 0000000..d243b85
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectPage.xaml
@@ -0,0 +1,129 @@
+<Page
+    x:Class="ApartmentManager.View.ApartmentDefectPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ViewModel="using:ApartmentManager.ViewModel"
+    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:local="using:ApartmentManager.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <ViewModel:ApartmentViewModel />
+    </Page.DataContext>
+
+    <Page.BottomAppBar>
+        <CommandBar>
+            <CommandBar.Content>
+                <Grid />
+            </CommandBar.Content>
+            <AppBarButton
+                Click="NavigateNewDefect"
+                Icon="Add"
+                Label="Create Defect" />
+        </CommandBar>
+    </Page.BottomAppBar>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="45" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <TextBlock
+            Grid.Row="0"
+            HorizontalAlignment="Center"
+            FontSize="30"
+            FontWeight="Bold"
+            Text="Apartment Changes" />
+
+        <ListView
+            Grid.Row="1"
+            Background="LightGray"
+            ItemsSource="{Binding CatalogSingleton.Defects}"
+            SelectedItem="{Binding CatalogSingleton.SelectedDefect, Mode=TwoWay}"
+            SelectionChanged="NavigateDefectViewPage">
+            <ListView.ItemContainerStyle>
+                <Style TargetType="ListViewItem">
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                </Style>
+            </ListView.ItemContainerStyle>
+
+
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <Grid
+                        Height="200"
+                        Margin="12,12,12,0"
+                        Background="White"
+                        BorderBrush="#DFE0E4"
+                        BorderThickness="1">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="200" />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+
+                        <Image
+                            Margin="5"
+                            Source="{Binding Pictures[0].Picture}"
+                            Stretch="Fill" />
+
+                        <StackPanel Grid.Column="1" Margin="10">
+
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    FontSize="30"
+                                    FontWeight="Bold"
+                                    Text="Name :" />
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    FontSize="30"
+                                    Text="{Binding Name}" />
+
+                            </StackPanel>
+
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock
+                                    Width="800"
+                                    Height="108"
+                                    Margin="0,0,10,0"
+                                    FontSize="20"
+                                    Text="{Binding Description}"
+                                    TextWrapping="Wrap" />
+                            </StackPanel>
+
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    FontSize="25"
+                                    FontWeight="Bold"
+                                    Text="Status :" />
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    FontSize="25"
+                                    Text="{Binding Status}" />
+
+                                <TextBlock
+                                    Margin="700,0,10,0"
+                                    HorizontalAlignment="Left"
+                                    FontSize="25"
+                                    FontWeight="Bold"
+                                    Text="Date Submitted :" />
+
+                                <TextBlock FontSize="25" Text="{Binding UploadDate.Year}" />
+                                <TextBlock FontSize="25" Text="-" />
+                                <TextBlock FontSize="25" Text="{Binding UploadDate.Month}" />
+                                <TextBlock FontSize="25" Text="-" />
+                                <TextBlock FontSize="25" Text="{Binding UploadDate.Day}" />
+                            </StackPanel>
+                        </StackPanel>
+                    </Grid>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+
+        </ListView>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectPage.xaml.cs
index 9ff9dd4..9ff9dd4 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectViewPage.xaml
index 9052d3a..9052d3a 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectViewPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectViewPage.xaml.cs
index 6225ebc..6225ebc 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectViewPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentNewChangePage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewChangePage.xaml
index 2eab16c..43f3998 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentNewChangePage.xaml
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewChangePage.xaml
@@ -1,11 +1,11 @@
 <Page
+    x:Class="ApartmentManager.View.ApartmentNewChangePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:ApartmentManager.View"
+    xmlns:ViewModel="using:ApartmentManager.ViewModel"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:ApartmentManager.View"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ViewModel="using:ApartmentManager.ViewModel"
-    x:Class="ApartmentManager.View.ApartmentNewChangePage"
     mc:Ignorable="d">
 
     <Page.BottomAppBar>
@@ -14,14 +14,15 @@
                 <Grid />
             </CommandBar.Content>
             <AppBarButton
+                Click="BackToChangePage"
                 Icon="Back"
-                Label="Create Defect" Click="BackToChangePage"/>
+                Label="Create Defect" />
         </CommandBar>
     </Page.BottomAppBar>
 
 
     <Page.DataContext>
-        <ViewModel:ApartmentViewModel/>
+        <ViewModel:ApartmentViewModel />
     </Page.DataContext>
 
 
@@ -33,7 +34,7 @@
                 HorizontalAlignment="Center"
                 FontSize="20"
                 FontWeight="Bold"
-                Text="Change Information"/>
+                Text="Change Information" />
 
             <StackPanel Orientation="Horizontal">
                 <StackPanel Margin="0,5,30,0">
@@ -79,8 +80,8 @@
                     <Button
                         Margin="0,20,0,0"
                         HorizontalAlignment="Stretch"
-                        
-                        Content="Create" Click="CreateChange" />
+                        Click="CreateChange"
+                        Content="Create" />
                 </StackPanel>
 
             </StackPanel>
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentNewChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewChangePage.xaml.cs
index 44abaf7..44abaf7 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentNewChangePage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewChangePage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewDefect.xaml
index 4743bd3..4743bd3 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewDefect.xaml
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewDefect.xaml.cs
index 31ce2a2..31ce2a2 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewDefect.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPage.xaml
index 9aa8be2..481cf18 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPage.xaml
@@ -112,11 +112,11 @@
                         Margin="0,10,0,10"
                         HorizontalAlignment="Stretch"
                         Click="ResidentPage"
-                        Content="Residents" />
+                        Content="Apartment Residents" />
                     <Button
                         Margin="0,10,0,10"
                         HorizontalAlignment="Stretch"
-                        Content="Apartment ApartmentChanges" Click="GotoChangesPage" />
+                        Content="Apartment Changes" Click="GotoChangesPage" />
                     <Button
                         Margin="0,10,0,10"
                         HorizontalAlignment="Stretch"
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPage.xaml.cs
index b6752d9..b6752d9 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPlanPage.xaml
index a9b71e5..a9b71e5 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPlanPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPlanPage.xaml.cs
index 45feb63..45feb63 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPlanPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentResidentsPage.xaml
index 00b6a75..00b6a75 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentResidentsPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentResidentsPage.xaml.cs
index b1272bb..b1272bb 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentResidentsPage.xaml.cs