From 27eaf0cdf144212b1a8bd33e926829d12ccf8848 Mon Sep 17 00:00:00 2001
From: marcinzelent <marcin@zelent.net>
Date: Sun, 4 Jun 2017 18:42:55 +0200
Subject: Created folders for different user pages.

---
 .../View/ApartmentChangesPage.xaml                 | 124 ----------
 .../View/ApartmentChangesPage.xaml.cs              |  40 ----
 .../View/ApartmentChangesViewPage.xaml             | 147 ------------
 .../View/ApartmentChangesViewPage.xaml.cs          |  35 ---
 .../ApartmentManager/View/ApartmentDefectPage.xaml | 127 ----------
 .../View/ApartmentDefectPage.xaml.cs               |  40 ----
 .../View/ApartmentDefectViewPage.xaml              | 149 ------------
 .../View/ApartmentDefectViewPage.xaml.cs           |  39 ----
 .../View/ApartmentNewChangePage.xaml               |  89 -------
 .../View/ApartmentNewChangePage.xaml.cs            |  51 ----
 .../ApartmentManager/View/ApartmentNewDefect.xaml  |  86 -------
 .../View/ApartmentNewDefect.xaml.cs                |  49 ----
 .../ApartmentManager/View/ApartmentPage.xaml       | 132 -----------
 .../ApartmentManager/View/ApartmentPage.xaml.cs    |  55 -----
 .../ApartmentManager/View/ApartmentPlanPage.xaml   |  19 --
 .../View/ApartmentPlanPage.xaml.cs                 |  30 ---
 .../View/ApartmentResidentsPage.xaml               | 256 ---------------------
 .../View/ApartmentResidentsPage.xaml.cs            |  31 ---
 .../ApartmentManager/View/BmApartmentsPage.xaml    | 134 -----------
 .../ApartmentManager/View/BmApartmentsPage.xaml.cs |  29 ---
 .../ApartmentManager/View/BmChangesPage.xaml       | 146 ------------
 .../ApartmentManager/View/BmChangesPage.xaml.cs    |  29 ---
 .../View/BmCreateApartmentPage.xaml                |  87 -------
 .../View/BmCreateApartmentPage.xaml.cs             |  15 --
 .../ApartmentManager/View/BmCreateChangePage.xaml  |  97 --------
 .../View/BmCreateChangePage.xaml.cs                |  30 ---
 .../ApartmentManager/View/BmCreateDefectPage.xaml  |  97 --------
 .../View/BmCreateDefectPage.xaml.cs                |  15 --
 .../ApartmentManager/View/BmDefectsPage.xaml       | 150 ------------
 .../ApartmentManager/View/BmDefectsPage.xaml.cs    |  29 ---
 .../ApartmentManager/View/BmEditApartmentPage.xaml |  87 -------
 .../View/BmEditApartmentPage.xaml.cs               |  15 --
 .../ApartmentManager/View/BmEditChangePage.xaml    | 108 ---------
 .../ApartmentManager/View/BmEditChangePage.xaml.cs |  30 ---
 .../ApartmentManager/View/BmEditDefectPage.xaml    | 108 ---------
 .../ApartmentManager/View/BmEditDefectPage.xaml.cs |  30 ---
 .../ApartmentManager/View/BmMainPage.xaml          |  86 -------
 .../ApartmentManager/View/BmMainPage.xaml.cs       |  16 --
 .../ApartmentManager/View/BmResidentsPage.xaml     | 167 --------------
 .../ApartmentManager/View/BmResidentsPage.xaml.cs  |  30 ---
 .../ApartmentManager/View/BmSingleChangePage.xaml  | 135 -----------
 .../View/BmSingleChangePage.xaml.cs                |  30 ---
 .../ApartmentManager/View/BmSingleDefectPage.xaml  | 135 -----------
 .../View/BmSingleDefectPage.xaml.cs                |  30 ---
 .../ApartmentManager/View/BmUsersPage.xaml         | 177 --------------
 .../ApartmentManager/View/BmUsersPage.xaml.cs      |  30 ---
 .../View/Board member pages/BmApartmentsPage.xaml  | 134 +++++++++++
 .../Board member pages/BmApartmentsPage.xaml.cs    |  29 +++
 .../View/Board member pages/BmChangesPage.xaml     | 146 ++++++++++++
 .../View/Board member pages/BmChangesPage.xaml.cs  |  29 +++
 .../Board member pages/BmCreateApartmentPage.xaml  |  87 +++++++
 .../BmCreateApartmentPage.xaml.cs                  |  15 ++
 .../Board member pages/BmCreateChangePage.xaml     |  97 ++++++++
 .../Board member pages/BmCreateChangePage.xaml.cs  |  30 +++
 .../Board member pages/BmCreateDefectPage.xaml     |  97 ++++++++
 .../Board member pages/BmCreateDefectPage.xaml.cs  |  15 ++
 .../View/Board member pages/BmDefectsPage.xaml     | 150 ++++++++++++
 .../View/Board member pages/BmDefectsPage.xaml.cs  |  29 +++
 .../Board member pages/BmEditApartmentPage.xaml    |  87 +++++++
 .../Board member pages/BmEditApartmentPage.xaml.cs |  15 ++
 .../View/Board member pages/BmEditChangePage.xaml  | 108 +++++++++
 .../Board member pages/BmEditChangePage.xaml.cs    |  30 +++
 .../View/Board member pages/BmEditDefectPage.xaml  | 108 +++++++++
 .../Board member pages/BmEditDefectPage.xaml.cs    |  30 +++
 .../View/Board member pages/BmMainPage.xaml        | 134 +++++++++++
 .../View/Board member pages/BmMainPage.xaml.cs     |  16 ++
 .../View/Board member pages/BmResidentsPage.xaml   | 167 ++++++++++++++
 .../Board member pages/BmResidentsPage.xaml.cs     |  30 +++
 .../Board member pages/BmSingleChangePage.xaml     | 135 +++++++++++
 .../Board member pages/BmSingleChangePage.xaml.cs  |  30 +++
 .../Board member pages/BmSingleDefectPage.xaml     | 135 +++++++++++
 .../Board member pages/BmSingleDefectPage.xaml.cs  |  30 +++
 .../View/Board member pages/BmUsersPage.xaml       | 177 ++++++++++++++
 .../View/Board member pages/BmUsersPage.xaml.cs    |  30 +++
 .../View/User pages/ApartmentChangesPage.xaml      | 124 ++++++++++
 .../View/User pages/ApartmentChangesPage.xaml.cs   |  40 ++++
 .../View/User pages/ApartmentChangesViewPage.xaml  | 147 ++++++++++++
 .../User pages/ApartmentChangesViewPage.xaml.cs    |  35 +++
 .../View/User pages/ApartmentDefectPage.xaml       | 129 +++++++++++
 .../View/User pages/ApartmentDefectPage.xaml.cs    |  40 ++++
 .../View/User pages/ApartmentDefectViewPage.xaml   | 149 ++++++++++++
 .../User pages/ApartmentDefectViewPage.xaml.cs     |  39 ++++
 .../View/User pages/ApartmentNewChangePage.xaml    |  90 ++++++++
 .../View/User pages/ApartmentNewChangePage.xaml.cs |  51 ++++
 .../View/User pages/ApartmentNewDefect.xaml        |  86 +++++++
 .../View/User pages/ApartmentNewDefect.xaml.cs     |  49 ++++
 .../View/User pages/ApartmentPage.xaml             | 132 +++++++++++
 .../View/User pages/ApartmentPage.xaml.cs          |  55 +++++
 .../View/User pages/ApartmentPlanPage.xaml         |  19 ++
 .../View/User pages/ApartmentPlanPage.xaml.cs      |  30 +++
 .../View/User pages/ApartmentResidentsPage.xaml    | 256 +++++++++++++++++++++
 .../View/User pages/ApartmentResidentsPage.xaml.cs |  31 +++
 92 files changed, 3622 insertions(+), 3571 deletions(-)
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentChangesPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentChangesPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentChangesViewPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentChangesViewPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentDefectViewPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentDefectViewPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentNewChangePage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentNewChangePage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmChangesPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmChangesPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmMainPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmMainPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmSingleChangePage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmSingleChangePage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmSingleDefectPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmSingleDefectPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmUsersPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/BmUsersPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmSingleChangePage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmSingleChangePage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmSingleDefectPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmSingleDefectPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmUsersPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/Board member pages/BmUsersPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesViewPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesViewPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectViewPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectViewPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentNewChangePage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentNewChangePage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentNewDefect.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentNewDefect.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentPlanPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentPlanPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentResidentsPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/User pages/ApartmentResidentsPage.xaml.cs

diff --git a/ApartmentManager/ApartmentManager/View/ApartmentChangesPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentChangesPage.xaml
deleted file mode 100644
index aebe8a5..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentChangesPage.xaml
+++ /dev/null
@@ -1,124 +0,0 @@
-<Page
-    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:viewModel="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <viewModel:ApartmentViewModel/>
-    </Page.DataContext>
-
-    <Page.BottomAppBar>
-        <CommandBar>
-            <CommandBar.Content>
-                <Grid />
-            </CommandBar.Content>
-            <AppBarButton                      
-                Icon="Add"
-                Label="Create Defect" Click="GotoNewChangePage">
-            </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.ApartmentChanges}" SelectedItem="{Binding CatalogSingleton.SelectedChange, Mode=TwoWay}" Grid.Row="1" Background="LightGray" SelectionChanged="GotoApartmentChangeViewPage">
-            <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="300" />
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-
-                        <Image
-                            Margin="5"
-                            Source="{Binding Documents[0].Document}"
-                            >
-                        </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/ApartmentChangesPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentChangesPage.xaml.cs
deleted file mode 100644
index c498d1d..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentChangesPage.xaml.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class ApartmentChangesPage : Page
-    {
-        public ApartmentChangesPage()
-        {
-            this.InitializeComponent();
-        }
-
-        private void GotoApartmentChangeViewPage(object sender, SelectionChangedEventArgs e)
-        {
-            Frame.Navigate(typeof(ApartmentChangesViewPage));
-        }
-
-        private void GotoNewChangePage(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(ApartmentNewChangePage));
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentChangesViewPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentChangesViewPage.xaml
deleted file mode 100644
index 5ec7b99..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentChangesViewPage.xaml
+++ /dev/null
@@ -1,147 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.ApartmentChangesViewPage"
-    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:viewModel="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <viewModel:ApartmentViewModel />
-    </Page.DataContext>
-
-    <Page.BottomAppBar>
-        <CommandBar>
-            <CommandBar.Content>
-                <Grid />
-            </CommandBar.Content>
-            <AppBarButton                             
-                Icon="back"
-                Label="Create Defect" Click="GotoApartmentChangesPage" >
-            </AppBarButton>
-        </CommandBar>
-    </Page.BottomAppBar>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <ScrollViewer>
-            <StackPanel>
-                <StackPanel Margin="10,10,10,0" Orientation="Horizontal">
-                    <TextBlock
-                        Margin="100,0,0,0"
-                        FontSize="30"
-                        FontWeight="Bold"
-                        Text="Name :" />
-                    <TextBlock
-                        Margin="10,0,0,0"
-                        FontSize="30"
-                        Text="{Binding CatalogSingleton.SelectedChange.Name}" />
-                    <TextBlock
-                        Margin="700,0,0,0"
-                        FontSize="30"
-                        FontWeight="Bold"
-                        Text="Status :" />
-                    <TextBlock
-                        Margin="10,0,0,0"
-                        FontSize="30"
-                        Text="{Binding CatalogSingleton.SelectedChange.Status}" />
-                </StackPanel>
-                <StackPanel Margin="20,0,20,20" Orientation="Horizontal">
-                    <StackPanel Width="620" Margin="0,50,0,0">
-                        <GridView
-                            Width="500"
-                            Height="420"
-                            ItemsSource="{Binding CatalogSingleton.SelectedChange.Documents, Mode=TwoWay}">
-                            <GridView.ItemTemplate>
-                                <DataTemplate>
-                                    <Image
-                                        Width="220"
-                                        Margin="10,0,10,10"
-                                        Source="{Binding Document}" />
-                                </DataTemplate>
-                            </GridView.ItemTemplate>
-
-                        </GridView>
-                    </StackPanel>
-                    <StackPanel Width="620">
-                        <TextBlock
-                            Margin="10,0,0,10"
-                            FontSize="30"
-                            FontWeight="Bold"
-                            Text="Description" />
-                        <Grid BorderBrush="Black" BorderThickness="1">
-                            <TextBlock
-                                Height="400"
-                                Margin="10"
-                                Text="{Binding CatalogSingleton.SelectedChange.Description, Mode=TwoWay}"
-                                TextWrapping="WrapWholeWords" />
-                        </Grid>
-
-
-                    </StackPanel>
-
-
-                </StackPanel>
-                <StackPanel Width="600" Margin="0,20,0,0">
-                    <TextBlock
-                        Margin="10,0,0,10"
-                        FontSize="30"
-                        FontWeight="Bold"
-                        Text="Comments" />
-                    <StackPanel Orientation="Horizontal">
-
-                        <TextBox
-                            Width="500"
-                            Height="80"
-                            Text="{Binding NewChangeComment.Comment, Mode=TwoWay}"
-                            TextWrapping="Wrap" />
-                        <Button
-                            Margin="10,0,0,0"
-                            Command="{Binding CreateChangeComment}"
-                            Content="Comment" />
-                    </StackPanel>
-
-
-                    <ListView ItemsSource="{Binding CatalogSingleton.SelectedChange.Comments}">
-                        <ListView.ItemContainerStyle>
-                            <Style TargetType="ListViewItem">
-                                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                            </Style>
-                        </ListView.ItemContainerStyle>
-
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <Grid Margin="10">
-                                    <StackPanel>
-                                        <TextBlock
-                                            Margin="5,0,0,0"
-                                            FontWeight="Bold"
-                                            Text="{Binding Name}" />
-                                        <TextBlock
-                                            Margin="5"
-                                            Text="{Binding Comment}"
-                                            TextWrapping="WrapWholeWords" />
-                                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                                            <TextBlock Margin="0,0,0,5">
-                                                <Run FontWeight="Bold" Text="{Binding Date.Year}" />
-                                                <Run FontWeight="Bold" Text="-" />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Month}" />
-                                                <Run FontWeight="Bold" Text="-" />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Day}" />
-                                                <Run FontWeight="Bold" Text="  " />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Hour}" />
-                                                <Run FontWeight="Bold" Text=":" />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Minute}" />
-                                            </TextBlock>
-                                        </StackPanel>
-                                    </StackPanel>
-                                </Grid>
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-
-                </StackPanel>
-            </StackPanel>
-        </ScrollViewer>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentChangesViewPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentChangesViewPage.xaml.cs
deleted file mode 100644
index d3030ff..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentChangesViewPage.xaml.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class ApartmentChangesViewPage : Page
-    {
-        public ApartmentChangesViewPage()
-        {
-            this.InitializeComponent();
-        }
-
-        private void GotoApartmentChangesPage(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(ApartmentChangesPage));
-        }
-    }
-}
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/ApartmentDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml.cs
deleted file mode 100644
index 9ff9dd4..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-using ApartmentManager.ViewModel;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class ApartmentDefectPage : Page
-    {
-        public ApartmentDefectPage()
-        {
-            this.InitializeComponent();
-            
-        }
-        private void NavigateNewDefect(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(ApartmentNewDefect));
-        }
-        private void NavigateDefectViewPage(object sender, SelectionChangedEventArgs e)
-        {
-            Frame.Navigate(typeof(ApartmentDefectViewPagexaml));
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPage.xaml
deleted file mode 100644
index 9052d3a..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPage.xaml
+++ /dev/null
@@ -1,149 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.ApartmentDefectViewPagexaml"
-    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"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <ViewModel:ApartmentViewModel />
-    </Page.DataContext>
-
-    <Page.BottomAppBar>
-        <CommandBar>
-            <CommandBar.Content>
-                <Grid />
-            </CommandBar.Content>
-            <AppBarButton
-                Icon="back"
-                Label="Create Defect" Click="BackToDefectPage" >
-            </AppBarButton>
-        </CommandBar>
-    </Page.BottomAppBar>
-    
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <ScrollViewer>
-            <StackPanel>
-                <StackPanel Margin="10,10,10,0" Orientation="Horizontal">
-                    <TextBlock
-                        Margin="100,0,0,0"
-                        FontSize="30"
-                        FontWeight="Bold"
-                        Text="Name :" />
-                    <TextBlock
-                        Margin="10,0,0,0"
-                        FontSize="30"
-                        Text="{Binding CatalogSingleton.SelectedDefect.Name}" />
-                    <TextBlock
-                        Margin="700,0,0,0"
-                        FontSize="30"
-                        FontWeight="Bold"
-                        Text="Status :" />
-                    <TextBlock
-                        Margin="10,0,0,0"
-                        FontSize="30"
-                        Text="{Binding CatalogSingleton.SelectedDefect.Status}" />
-                </StackPanel>
-                <StackPanel Margin="20,0,20,20" Orientation="Horizontal">
-                    <StackPanel Width="620" Margin="0,50,0,0">
-                        <GridView
-                            Width="500"
-                            Height="420"
-                            ItemsSource="{Binding CatalogSingleton.SelectedDefect.Pictures, Mode=TwoWay}">
-                            <GridView.ItemTemplate>
-                                <DataTemplate>
-                                    <Image
-                                        Width="220"
-                                        Margin="10,0,10,10"
-                                        Source="{Binding Picture}" />
-                                </DataTemplate>
-                            </GridView.ItemTemplate>
-
-                        </GridView>
-                    </StackPanel>
-                    <StackPanel Width="620">
-                        <TextBlock
-                            Margin="10,0,0,10"
-                            FontSize="30"
-                            FontWeight="Bold"
-                            Text="Description" />
-                        <Grid BorderBrush="Black" BorderThickness="1">
-                            <TextBlock
-                                Height="400"
-                                Margin="10"
-                                Text="{Binding CatalogSingleton.SelectedDefect.Description, Mode=TwoWay}"
-                                TextWrapping="WrapWholeWords" />
-                        </Grid>
-
-
-                    </StackPanel>
-
-
-                </StackPanel>
-                <StackPanel Width="600" Margin="0,20,0,0">
-                    <TextBlock
-                        Margin="10,0,0,10"
-                        FontSize="30"
-                        FontWeight="Bold"
-                        Text="Comments" />
-                    <StackPanel Orientation="Horizontal">
-
-                        <TextBox
-                            Width="500"
-                            Height="80"
-                            Text="{Binding NewChangeComment.Comment, Mode=TwoWay}"
-                            TextWrapping="Wrap" />
-                        <Button
-                            Margin="10,0,0,0"
-                            Command="{Binding CreateDefectComment}"
-                            Content="Comment" />
-                    </StackPanel>
-
-
-                    <ListView ItemsSource="{Binding CatalogSingleton.SelectedDefect.Comments}">
-                        <ListView.ItemContainerStyle>
-                            <Style TargetType="ListViewItem">
-                                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                            </Style>
-                        </ListView.ItemContainerStyle>
-
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <Grid Margin="10">
-                                    <StackPanel>
-                                        <TextBlock
-                                            Margin="5,0,0,0"
-                                            FontWeight="Bold"
-                                            Text="{Binding Name}" />
-                                        <TextBlock
-                                            Margin="5"
-                                            Text="{Binding Comment}"
-                                            TextWrapping="WrapWholeWords" />
-                                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                                            <TextBlock Margin="0,0,0,5">
-                                                <Run FontWeight="Bold" Text="{Binding Date.Year}" />
-                                                <Run FontWeight="Bold" Text="-" />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Month}" />
-                                                <Run FontWeight="Bold" Text="-" />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Day}" />
-                                                <Run FontWeight="Bold" Text="  " />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Hour}" />
-                                                <Run FontWeight="Bold" Text=":" />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Minute}" />
-                                            </TextBlock>
-                                        </StackPanel>
-                                    </StackPanel>
-                                </Grid>
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-
-                </StackPanel>
-
-            </StackPanel>
-        </ScrollViewer>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPage.xaml.cs
deleted file mode 100644
index 6225ebc..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPage.xaml.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-using ApartmentManager.ViewModel;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class ApartmentDefectViewPagexaml : Page
-    {
-        private ApartmentViewModel vm;
-        public ApartmentDefectViewPagexaml()
-        {
-            this.InitializeComponent();
-            vm = new ApartmentViewModel();
-            DataContext = vm;
-        }
-
-        private void BackToDefectPage(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(ApartmentDefectPage));
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentNewChangePage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentNewChangePage.xaml
deleted file mode 100644
index 2eab16c..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentNewChangePage.xaml
+++ /dev/null
@@ -1,89 +0,0 @@
-<Page
-    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ViewModel="using:ApartmentManager.ViewModel"
-    x:Class="ApartmentManager.View.ApartmentNewChangePage"
-    mc:Ignorable="d">
-
-    <Page.BottomAppBar>
-        <CommandBar>
-            <CommandBar.Content>
-                <Grid />
-            </CommandBar.Content>
-            <AppBarButton
-                Icon="Back"
-                Label="Create Defect" Click="BackToChangePage"/>
-        </CommandBar>
-    </Page.BottomAppBar>
-
-
-    <Page.DataContext>
-        <ViewModel:ApartmentViewModel/>
-    </Page.DataContext>
-
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
-
-            <TextBlock
-                Margin="0,10,0,10"
-                HorizontalAlignment="Center"
-                FontSize="20"
-                FontWeight="Bold"
-                Text="Change Information"/>
-
-            <StackPanel Orientation="Horizontal">
-                <StackPanel Margin="0,5,30,0">
-                    <ListView
-                        Width="500"
-                        Height="600"
-                        ItemsSource="{Binding NewChange.Documents, Mode=TwoWay}"
-                        SelectedItem="{Binding SelectedChangeDocument, Mode=TwoWay}">
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <Image
-                                    Width="400"
-                                    Margin="10"
-                                    Source="{Binding Document}" />
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-
-                    <StackPanel Margin="10" Orientation="Horizontal">
-                        <Button
-                            Margin="30,0,0,0"
-                            Command="{Binding UploadChangePicture}"
-                            Content="Upload Picture" />
-                        <Button
-                            Margin="170,0,0,0"
-                            Command="{Binding DeleteChangePicture}"
-                            Content="Delete Picture" />
-                    </StackPanel>
-
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
-
-                </StackPanel>
-
-                <StackPanel Width="400" Margin="0,0,50,0">
-                    <TextBlock Margin="0,10,0,10" Text="Name" />
-                    <TextBox Text="{Binding NewChange.Name, Mode=TwoWay}" />
-                    <TextBlock Margin="0,10,0,10" Text="Description" />
-                    <TextBox
-                        Height="417"
-                        Text="{Binding NewChange.Description, Mode=TwoWay}"
-                        TextWrapping="Wrap" />
-                    <Button
-                        Margin="0,20,0,0"
-                        HorizontalAlignment="Stretch"
-                        
-                        Content="Create" Click="CreateChange" />
-                </StackPanel>
-
-            </StackPanel>
-        </StackPanel>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentNewChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentNewChangePage.xaml.cs
deleted file mode 100644
index 44abaf7..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentNewChangePage.xaml.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-using ApartmentManager.ViewModel;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class ApartmentNewChangePage : Page
-    {
-        private ApartmentViewModel vm;
-        public ApartmentNewChangePage()
-        {
-            this.InitializeComponent();
-            vm = new ApartmentViewModel();
-            DataContext = vm;
-        }
-
-        private void BackToChangePage(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(ApartmentChangesPage));
-        }
-
-        private void CreateChange(object sender, RoutedEventArgs e)
-        {
-            
-            
-                vm.CreateChange.Execute(null);
-                if (vm.CreateChange.CanExecute(null))
-                {
-                    Frame.Navigate(typeof(ApartmentChangesPage));
-                }
-            
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml b/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml
deleted file mode 100644
index 4743bd3..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml
+++ /dev/null
@@ -1,86 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.ApartmentNewDefect"
-    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"
-    mc:Ignorable="d">
-
-    <Page.BottomAppBar>
-        <CommandBar>
-            <CommandBar.Content>
-                <Grid />
-            </CommandBar.Content>
-            <AppBarButton
-                Icon="back"
-                Label="Create Defect" Click="BackToDefectPage">
-            </AppBarButton>
-        </CommandBar>
-    </Page.BottomAppBar>
-
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
-
-            <TextBlock
-                Margin="0,10,0,10"
-                HorizontalAlignment="Center"
-                FontSize="20"
-                FontWeight="Bold"
-                Text="Defect Information" />
-
-            <StackPanel Orientation="Horizontal">
-                <StackPanel Margin="0,5,30,0">
-                    <ListView
-                        Width="500"
-                        Height="600"
-                        ItemsSource="{Binding NewDefect.Pictures, Mode=TwoWay}"
-                        SelectedItem="{Binding SelectedDefectPicture, Mode=TwoWay}">
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <Image
-                                    Width="400"
-                                    Margin="10"
-                                    Source="{Binding Picture}" />
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-
-                    </ListView>
-
-                    <StackPanel Margin="10" Orientation="Horizontal">
-                        <Button
-                            Margin="30,0,0,0"
-                            Command="{Binding UploadDefectPicture}"
-                            Content="Upload Picture" />
-                        <Button
-                            Margin="170,0,0,0"
-                            Command="{Binding DeleteDefectPicture}"
-                            Content="Delete Picture" />
-                    </StackPanel>
-
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
-
-                </StackPanel>
-
-                <StackPanel Width="400" Margin="0,0,50,0">
-                    <TextBlock Margin="0,10,0,10" Text="Name" />
-                    <TextBox Text="{Binding NewDefect.Name, Mode=TwoWay}" />
-                    <TextBlock Margin="0,10,0,10" Text="Description" />
-                    <TextBox
-                        Height="417"
-                        Text="{Binding NewDefect.Description, Mode=TwoWay}"
-                        TextWrapping="Wrap" />
-                    <Button
-                        Margin="0,20,0,0"
-                        HorizontalAlignment="Stretch"
-                        Click="Navigate"
-                        Content="Create" />
-                </StackPanel>
-
-            </StackPanel>
-        </StackPanel>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml.cs
deleted file mode 100644
index 31ce2a2..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-using ApartmentManager.ViewModel;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class ApartmentNewDefect : Page
-    {
-        private ApartmentViewModel vm;
-        public ApartmentNewDefect()
-        {
-            this.InitializeComponent();
-            vm = new ApartmentViewModel();
-            DataContext = vm;
-            
-        }
-
-        private void Navigate(object sender, RoutedEventArgs e)
-        {
-            vm.CreateDefect.Execute(null);
-            if (vm.CreateDefect.CanExecute(null))
-            {
-                Frame.Navigate(typeof(ApartmentDefectPage));
-            }
-        }
-
-        private void BackToDefectPage(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(ApartmentDefectPage));
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml
deleted file mode 100644
index 9aa8be2..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml
+++ /dev/null
@@ -1,132 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.ApartmentPage"
-    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"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <ViewModel:ApartmentViewModel />
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <StackPanel
-            Margin="50"
-            VerticalAlignment="Top"
-            Orientation="Horizontal">
-
-            <StackPanel Margin="50,0,20,0" VerticalAlignment="Top">
-                <Image
-                    MaxWidth="800"
-                    MaxHeight="650"
-                    Source="{Binding CatalogSingleton.Apartment.PlanPicture}" />
-            </StackPanel>
-
-            <StackPanel>
-
-                <StackPanel>
-
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock
-                            Margin="0,0,10,0"
-                            FontSize="20"
-                            FontWeight="Bold"
-                            Text="Address :" />
-                        <TextBlock FontSize="20" Text="{Binding CatalogSingleton.Apartment.Address}" />
-                    </StackPanel>
-
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock
-                            Margin="0,0,10,0"
-                            FontSize="20"
-                            FontWeight="Bold"
-                            Text="Floor :" />
-                        <TextBlock FontSize="20" Text="{Binding CatalogSingleton.Apartment.Floor}" />
-                    </StackPanel>
-
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock
-                            Margin="0,0,10,0"
-                            FontSize="20"
-                            FontWeight="Bold"
-                            Text="Apartment Number :" />
-                        <TextBlock FontSize="20" Text="{Binding CatalogSingleton.Apartment.ApartmentId}" />
-                    </StackPanel>
-
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock
-                            Margin="0,0,10,0"
-                            FontSize="20"
-                            FontWeight="Bold"
-                            Text="Size :" />
-                        <TextBlock
-                            Margin="0,0,10,0"
-                            FontSize="20"
-                            Text="{Binding CatalogSingleton.Apartment.Size}" />
-                        <TextBlock FontSize="20" Text="m2" />
-                    </StackPanel>
-
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock
-                            Margin="0,0,10,0"
-                            FontSize="20"
-                            FontWeight="Bold"
-                            Text="Number of Rooms :" />
-                        <TextBlock FontSize="20" Text="{Binding CatalogSingleton.Apartment.NumberOfRooms}" />
-                    </StackPanel>
-
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock
-                            Margin="0,0,10,0"
-                            FontSize="20"
-                            FontWeight="Bold"
-                            Text="Monthly Charge:" />
-                        <TextBlock
-                            Margin="0,0,10,0"
-                            FontSize="20"
-                            Text="{Binding CatalogSingleton.Apartment.MonthlyCharge}" />
-                        <TextBlock FontSize="20" Text="DKK" />
-                    </StackPanel>
-
-                </StackPanel>
-
-                <StackPanel
-                    Width="250"
-                    Margin="0,20,0,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Top">
-                    <Button
-                        Margin="0,10,0,10"
-                        HorizontalAlignment="Stretch"
-                        Click="GotoApartmentPlanPage"
-                        Content="Apartment Plan" />
-                    <Button
-                        Margin="0,10,0,10"
-                        HorizontalAlignment="Stretch"
-                        Click="GotoPernalInfoPage"
-                        Content="Personal Info" />
-                    <Button
-                        Margin="0,10,0,10"
-                        HorizontalAlignment="Stretch"
-                        Click="ResidentPage"
-                        Content="Residents" />
-                    <Button
-                        Margin="0,10,0,10"
-                        HorizontalAlignment="Stretch"
-                        Content="Apartment ApartmentChanges" Click="GotoChangesPage" />
-                    <Button
-                        Margin="0,10,0,10"
-                        HorizontalAlignment="Stretch"
-                        Click="DefectPage"
-                        Content="Apartment Defects" />
-                </StackPanel>
-
-            </StackPanel>
-
-        </StackPanel>
-
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs
deleted file mode 100644
index b6752d9..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class ApartmentPage : Page
-    {
-        public ApartmentPage()
-        {
-            this.InitializeComponent();
-        }
-
-        private void GotoApartmentPlanPage(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(ApartmentPlanPage));
-        }
-
-        private void GotoPernalInfoPage(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(PersonalInfoPage));
-        }
-
-        private void ResidentPage(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(ApartmentResidentsPage));
-        }
-
-        private void DefectPage(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(ApartmentDefectPage));
-        }
-
-        private void GotoChangesPage(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(ApartmentChangesPage));
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml
deleted file mode 100644
index a9b71e5..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Page
-    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ViewModel="using:ApartmentManager.ViewModel"
-    x:Class="ApartmentManager.View.ApartmentPlanPage"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <ViewModel:ApartmentViewModel/>
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Image  Source="{Binding CatalogSingleton.Apartment.PlanPicture}"  MaxWidth="800" MaxHeight="650" Margin="50"/>
-
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs
deleted file mode 100644
index 45feb63..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class ApartmentPlanPage : Page
-    {
-        public ApartmentPlanPage()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml
deleted file mode 100644
index 00b6a75..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml
+++ /dev/null
@@ -1,256 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.ApartmentResidentsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Common="using:ApartmentManager.Common"
-    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"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <ViewModel:ApartmentViewModel />
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <StackPanel
-            Margin="10"
-            HorizontalAlignment="Center"
-            VerticalAlignment="top"
-            Orientation="Horizontal">
-            <StackPanel Margin="10">
-                <Grid
-                    Width="800"
-                    Height="150"
-                    Margin="0,0,0,5"
-                    Background="LightGray">
-
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="150" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-
-                    <Grid
-                        Grid.Column="0"
-                        Background="Gray"
-                        BorderBrush="#CCFFFFFF"
-                        BorderThickness="0,0,2,0">
-                        <Image Source="{Binding UserSingleton.CurrentUser.Picture}" Stretch="Fill" />
-                    </Grid>
-
-                    <Grid Grid.Column="1" Margin="3,3,3,3">
-
-                        <StackPanel Margin="10">
-
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    FontSize="30"
-                                    FontWeight="Bold"
-                                    Text="Full Name :" />
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    FontSize="30"
-                                    Text="{Binding UserSingleton.CurrentUser.FirstName}" />
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    FontSize="30"
-                                    Text="{Binding UserSingleton.CurrentUser.LastName}" />
-                            </StackPanel>
-
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    FontSize="20"
-                                    FontWeight="Bold"
-                                    Text="Email Address :" />
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    FontSize="20"
-                                    Text="{Binding UserSingleton.CurrentUser.Email}" />
-                            </StackPanel>
-
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    FontSize="20"
-                                    FontWeight="Bold"
-                                    Text="Phone Number :" />
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    FontSize="20"
-                                    Text="{Binding UserSingleton.CurrentUser.Phone}" />
-                            </StackPanel>
-
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,10,0"
-                                    FontSize="20"
-                                    FontWeight="Bold"
-                                    Text="Birth Date :" />
-                                <TextBlock FontSize="20" Text="{Binding UserSingleton.CurrentUser.BirthDate.Year}" />
-                                <TextBlock FontSize="20" Text="-" />
-                                <TextBlock FontSize="20" Text="{Binding UserSingleton.CurrentUser.BirthDate.Month}" />
-                                <TextBlock FontSize="20" Text="-" />
-                                <TextBlock FontSize="20" Text="{Binding UserSingleton.CurrentUser.BirthDate.Day}" />
-                            </StackPanel>
-
-                        </StackPanel>
-                    </Grid>
-                </Grid>
-
-                <ListView
-                    Margin="10,10,10,116"
-                    ItemsSource="{Binding CatalogSingleton.Residents}"
-                    SelectedItem="{Binding NewResident, Mode=TwoWay}">
-
-                    <ListView.ItemContainerStyle>
-                        <Style TargetType="ListViewItem">
-                            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                        </Style>
-                    </ListView.ItemContainerStyle>
-
-                    <ListView.ItemTemplate>
-
-                        <DataTemplate>
-                            <Grid
-                                Width="800"
-                                Height="150"
-                                Margin="0,0,0,5"
-                                Background="LightGray">
-
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="150" />
-                                    <ColumnDefinition />
-                                </Grid.ColumnDefinitions>
-
-                                <Grid
-                                    Grid.Column="0"
-                                    Background="Gray"
-                                    BorderBrush="#CCFFFFFF"
-                                    BorderThickness="0,0,2,0">
-                                    <Image Source="{Binding Picture}" Stretch="Fill" />
-                                </Grid>
-
-                                <Grid Grid.Column="1" Margin="3,3,3,3">
-
-                                    <StackPanel Margin="10">
-
-                                        <StackPanel Orientation="Horizontal">
-                                            <TextBlock
-                                                Margin="0,0,10,0"
-                                                FontSize="30"
-                                                FontWeight="Bold"
-                                                Text="Full Name :" />
-                                            <TextBlock
-                                                Margin="0,0,10,0"
-                                                FontSize="30"
-                                                Text="{Binding FirstName}" />
-                                            <TextBlock
-                                                Margin="0,0,10,0"
-                                                FontSize="30"
-                                                Text="{Binding LastName}" />
-                                        </StackPanel>
-
-                                        <StackPanel Orientation="Horizontal">
-                                            <TextBlock
-                                                Margin="0,0,10,0"
-                                                FontSize="20"
-                                                FontWeight="Bold"
-                                                Text="Email Address :" />
-                                            <TextBlock
-                                                Margin="0,0,10,0"
-                                                FontSize="20"
-                                                Text="{Binding Email}" />
-                                        </StackPanel>
-
-                                        <StackPanel Orientation="Horizontal">
-                                            <TextBlock
-                                                Margin="0,0,10,0"
-                                                FontSize="20"
-                                                FontWeight="Bold"
-                                                Text="Phone Number :" />
-                                            <TextBlock
-                                                Margin="0,0,10,0"
-                                                FontSize="20"
-                                                Text="{Binding Phone}" />
-                                        </StackPanel>
-
-                                        <StackPanel Orientation="Horizontal">
-                                            <TextBlock
-                                                Margin="0,0,10,0"
-                                                FontSize="20"
-                                                FontWeight="Bold"
-                                                Text="Birth Date :" />
-                                            <TextBlock FontSize="20" Text="{Binding BirthDate.Year}" />
-                                            <TextBlock FontSize="20" Text="-" />
-                                            <TextBlock FontSize="20" Text="{Binding BirthDate.Month}" />
-                                            <TextBlock FontSize="20" Text="-" />
-                                            <TextBlock FontSize="20" Text="{Binding BirthDate.Day}" />
-                                        </StackPanel>
-
-                                    </StackPanel>
-                                </Grid>
-                            </Grid>
-                        </DataTemplate>
-
-                    </ListView.ItemTemplate>
-                </ListView>
-            </StackPanel>
-
-            <StackPanel Width="400" Margin="0,0,50,0">
-
-                <TextBlock
-                    Margin="0,5,0,10"
-                    HorizontalAlignment="Center"
-                    FontSize="20"
-                    FontWeight="Bold"
-                    Text="Resident Info" />
-                <Image
-                    Width="150"
-                    Height="150"
-                    Source="{Binding NewResident.Picture, Mode=TwoWay}" />
-                <Button
-                    Margin="0,10,0,0"
-                    HorizontalAlignment="Stretch"
-                    Command="{Binding UploadResidentPhoto}"
-                    Content="Upload Picture" />
-                <TextBlock Margin="0,10,0,10" Text="Name" />
-                <TextBox Text="{Binding NewResident.FirstName, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Last Name" />
-                <TextBox Text="{Binding NewResident.LastName, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Birthdate" />
-                <DatePicker HorizontalAlignment="Stretch" Date="{Binding NewResident.BirthDate, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Email Address" />
-                <TextBox Text="{Binding NewResident.Email, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Phone Number" />
-                <TextBox Text="{Binding NewResident.Phone, Mode=TwoWay}" />
-
-
-                <StackPanel Orientation="Horizontal">
-                    <Button
-                        Width="125"
-                        Margin="0,5,12,10"
-                        Command="{Binding CreateResidentCommand}"
-                        Content="Create" />
-                    <Button
-                        Width="125"
-                        Margin="0,5,0,10"
-                        Command="{Binding DeleteResidentCommand}"
-                        Content="Delete" />
-                    <Button
-                        Width="125"
-                        Margin="13,5,0,10"
-                        Command="{Binding UpdateResidentCommand}"
-                        Content="Update" />
-                </StackPanel>
-
-            </StackPanel>
-
-
-        </StackPanel>
-
-    </Grid>
-
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs
deleted file mode 100644
index b1272bb..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-using ApartmentManager.ViewModel;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class ApartmentResidentsPage : Page
-    {
-        public ApartmentResidentsPage()
-        {
-            this.InitializeComponent();          
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml b/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml
deleted file mode 100644
index 78907a0..0000000
--- a/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml
+++ /dev/null
@@ -1,134 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmApartmentsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    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"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.Resources>
-        <Style x:Key="ListItemStyle" TargetType="ListViewItem">
-            <Setter Property="Background" Value="White" />
-            <Setter Property="Padding" Value="0" />
-            <Setter Property="Margin" Value="12,12,12,0" />
-            <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="BorderBrush" Value="#DFE0E4" />
-            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ListViewItem">
-                        <ListViewItemPresenter />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style x:Key="TextBlockStyle" TargetType="TextBlock">
-            <Setter Property="Margin" Value="0,0,0,10" />
-            <Setter Property="Foreground" Value="White" />
-        </Style>
-        <Style x:Key="ActionButtonStyle" TargetType="Button">
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Height" Value="40" />
-            <Setter Property="Width" Value="40" />
-            <Setter Property="HorizontalAlignment" Value="Right" />
-            <Setter Property="VerticalAlignment" Value="Top" />
-        </Style>
-    </Page.Resources>
-    <Page.DataContext>
-        <vm:BmApartmentsViewModel />
-    </Page.DataContext>
-    <Page.BottomAppBar>
-        <CommandBar>
-            <CommandBar.Content>
-                <Grid />
-            </CommandBar.Content>
-            <AppBarButton
-                Click="GoToCreateApartmentPage"
-                Command="{Binding ClearApartmentTemplateCommand}"
-                Icon="Add"
-                Label="Create Apartment">
-                <AppBarButton.DataContext>
-                    <vm:BmApartmentsViewModel />
-                </AppBarButton.DataContext>
-            </AppBarButton>
-        </CommandBar>
-    </Page.BottomAppBar>
-    <Grid Background="#E9EBEE">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="40" />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <StackPanel Background="{StaticResource AppBarBackgroundThemeBrush}" Orientation="Horizontal">
-            <TextBlock
-                Margin="40,0,10,0"
-                VerticalAlignment="Center"
-                Text="Floor: " />
-            <ComboBox
-                VerticalAlignment="Center"
-                ItemsSource="{Binding FloorNumbers}"
-                SelectedItem="{Binding SelectedFloor, Mode=TwoWay}" />
-            <TextBlock
-                Margin="10,0"
-                VerticalAlignment="Center"
-                Text="Apartment number: " />
-            <TextBox Height="32" />
-        </StackPanel>
-        <ListView
-            x:Name="ApartmentsList"
-            Grid.Row="1"
-            ItemsSource="{Binding BmSingleton.Apartments}"
-            SelectedItem="{Binding ApartmentTemplate, Mode=TwoWay}">
-            <ListView.ItemContainerStyle>
-                <Style BasedOn="{StaticResource ListItemStyle}" TargetType="ListViewItem" />
-            </ListView.ItemContainerStyle>
-            <ListView.ItemTemplate>
-                <DataTemplate>
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition />
-                            <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="50px" />
-                            </Grid.ColumnDefinitions>
-                            <StackPanel Padding="10">
-                                <TextBlock><Run Text="Apartment number: " /><Run Text="{Binding ApartmentId}" /></TextBlock>
-                                <TextBlock><Run Text="Floor: " /><Run Text="{Binding Floor}" /></TextBlock>
-                                <TextBlock><Run Text="Address: " /><Run Text="{Binding Address}" /></TextBlock>
-                            </StackPanel>
-                            <Button
-                                Grid.Column="1"
-                                Click="SelectItem"
-                                Command="{Binding DeleteApartmentCommand}"
-                                DataContext="{Binding ElementName=ApartmentsList, Path=DataContext}"
-                                Style="{StaticResource ActionButtonStyle}">
-                                <SymbolIcon Symbol="Clear" ToolTipService.ToolTip="Delete" />
-                            </Button>
-                            <Button
-                                Grid.Column="1"
-                                Margin="0,40,0,0"
-                                Click="SelectItem"
-                                DataContext="{Binding ElementName=ApartmentsList, Path=DataContext}"
-                                Style="{StaticResource ActionButtonStyle}">
-                                <SymbolIcon Symbol="Edit" ToolTipService.ToolTip="Edit" />
-
-                                <interactivity:Interaction.Behaviors>
-                                    <core:EventTriggerBehavior EventName="Click">
-                                        <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmEditApartmentPage" />
-                                    </core:EventTriggerBehavior>
-                                </interactivity:Interaction.Behaviors>
-                            </Button>
-                        </Grid>
-                    </Grid>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml.cs
deleted file mode 100644
index d7d67e6..0000000
--- a/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// Page for managing apartments.
-    /// </summary>
-    public sealed partial class BmApartmentsPage : Page
-    {
-        public BmApartmentsPage()
-        {
-            InitializeComponent();
-        }
-
-        private void SelectItem(object sender, RoutedEventArgs e)
-        {
-            var item = ((Grid)((Button)sender).Parent).DataContext;
-            var container = (ListViewItem)ApartmentsList.ContainerFromItem(item);
-
-            container.IsSelected = true;
-        }
-
-        private void GoToCreateApartmentPage(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(BmCreateApartmentPage));
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml b/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml
deleted file mode 100644
index 215496b..0000000
--- a/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml
+++ /dev/null
@@ -1,146 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmChangesPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    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"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.Resources>
-        <Style x:Key="ListItemStyle" TargetType="ListViewItem">
-            <Setter Property="Background" Value="White" />
-            <Setter Property="Padding" Value="0" />
-            <Setter Property="Margin" Value="12,12,12,0" />
-            <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="BorderBrush" Value="#DFE0E4" />
-            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ListViewItem">
-                        <ListViewItemPresenter />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style x:Key="TextBlockStyle" TargetType="TextBlock">
-            <Setter Property="Margin" Value="0,0,0,10" />
-            <Setter Property="Foreground" Value="White" />
-        </Style>
-        <Style x:Key="ActionButtonStyle" TargetType="Button">
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Height" Value="40" />
-            <Setter Property="Width" Value="40" />
-            <Setter Property="HorizontalAlignment" Value="Right" />
-            <Setter Property="VerticalAlignment" Value="Top" />
-        </Style>
-    </Page.Resources>
-    <Page.DataContext>
-        <vm:BmChangesViewModel />
-    </Page.DataContext>
-    <Page.BottomAppBar>
-        <CommandBar>
-            <CommandBar.Content>
-                <Grid />
-            </CommandBar.Content>
-            <AppBarButton
-                Click="GoToCreateChangePage"
-                Command="{Binding ClearChangeTemplateCommand}"
-                Icon="Add"
-                Label="Create Apartment">
-                <AppBarButton.DataContext>
-                    <vm:BmChangesViewModel />
-                </AppBarButton.DataContext>
-            </AppBarButton>
-        </CommandBar>
-    </Page.BottomAppBar>
-    <Grid Background="#E9EBEE">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="40" />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <StackPanel Background="{StaticResource AppBarBackgroundThemeBrush}" Orientation="Horizontal">
-            <TextBlock
-                Margin="40,0,10,0"
-                VerticalAlignment="Center"
-                Text="Change ID: " />
-            <TextBox Height="32" />
-            <TextBlock
-                Margin="10,0"
-                VerticalAlignment="Center"
-                Text="Apartment number: " />
-            <TextBox Height="32" />
-        </StackPanel>
-        <ListView
-            x:Name="ChangesList"
-            Grid.Row="1"
-            ItemsSource="{Binding BmSingleton.ApartmentChanges}"
-            SelectedItem="{Binding ChangeTemplate, Mode=TwoWay}">
-            <ListView.ItemContainerStyle>
-                <Style BasedOn="{StaticResource ListItemStyle}" TargetType="ListViewItem" />
-            </ListView.ItemContainerStyle>
-            <ListView.ItemTemplate>
-                <DataTemplate>
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="150" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="50px" />
-                        </Grid.ColumnDefinitions>
-                        <Image
-                            Margin="5"
-                            Source="{Binding Documents[0].Document}"
-                            Stretch="Fill" />
-                        <StackPanel Grid.Column="1" Padding="10">
-                            <TextBlock><Run Text="Change ID: " /><Run Text="{Binding ChangeId}" /></TextBlock>
-                            <TextBlock><Run Text="Apartment number: " /><Run Text="{Binding ApartmentId}" /></TextBlock>
-                            <TextBlock><Run Text="Name: " /><Run Text="{Binding Name}" /></TextBlock>
-                            <TextBlock><Run Text="Status: " /><Run Text="{Binding Status}" /></TextBlock>
-                            <TextBlock><Run Text="Upload date: " /><Run Text="{Binding UploadDate.Day}" /><Run Text="." /><Run Text="{Binding UploadDate.Month}" /><Run Text="." /><Run Text="{Binding UploadDate.Year}" /></TextBlock>
-                        </StackPanel>
-                        <Button
-                            Grid.Column="2"
-                            Click="SelectItem"
-                            Command="{Binding DeleteChangeCommand}"
-                            DataContext="{Binding ElementName=ChangesList, Path=DataContext}"
-                            Style="{StaticResource ActionButtonStyle}">
-                            <SymbolIcon Symbol="Clear" ToolTipService.ToolTip="Delete" />
-                        </Button>
-                        <Button
-                            Grid.Column="2"
-                            Margin="0,40,0,0"
-                            Click="SelectItem"
-                            DataContext="{Binding ElementName=ChangesList, Path=DataContext}"
-                            Style="{StaticResource ActionButtonStyle}">
-                            <SymbolIcon Symbol="Edit" ToolTipService.ToolTip="Edit" />
-
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="Click">
-                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmEditChangePage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </Button>
-                        <Button
-                            Grid.Column="2"
-                            Margin="0,80,0,0"
-                            Click="SelectItem"
-                            DataContext="{Binding ElementName=ChangesList, Path=DataContext}"
-                            Style="{StaticResource ActionButtonStyle}">
-                            <SymbolIcon Symbol="View" ToolTipService.ToolTip="View" />
-
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="Click">
-                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmSingleChangePage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </Button>
-                    </Grid>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml.cs
deleted file mode 100644
index a63f85c..0000000
--- a/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// Page for managing apartment changes.
-    /// </summary>
-    public sealed partial class BmChangesPage : Page
-    {
-        public BmChangesPage()
-        {
-            InitializeComponent();
-        }
-
-        private void SelectItem(object sender, RoutedEventArgs e)
-        {
-            var item = ((Grid)((Button)sender).Parent).DataContext;
-            var container = (ListViewItem)ChangesList.ContainerFromItem(item);
-
-            container.IsSelected = true;
-        }
-
-        private void GoToCreateChangePage(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(BmCreateChangePage));
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml
deleted file mode 100644
index 3c63754..0000000
--- a/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml
+++ /dev/null
@@ -1,87 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmCreateApartmentPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    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"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <vm:BmApartmentsViewModel />
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="600" />
-                <ColumnDefinition Width="300" />
-            </Grid.ColumnDefinitions>
-            <Button
-                Margin="0,20,20,0"
-                HorizontalAlignment="Right"
-                VerticalAlignment="Top"
-                Command="{Binding UploadApartmentPlanCommand}"
-                Content="Add plan" />
-            <Image
-                Margin="20,80"
-                VerticalAlignment="Top"
-                Source="{Binding ApartmentTemplate.PlanPicture}" />
-            <StackPanel
-                Grid.Column="1"
-                Margin="20,0,0,0"
-                VerticalAlignment="Top"
-                Orientation="Vertical">
-                <TextBlock
-                    Margin="0,10,0,10"
-                    HorizontalAlignment="Center"
-                    FontSize="20"
-                    FontWeight="Bold"
-                    Text="Apartment information:" />
-                <TextBlock Margin="0,10,0,10" Text="Apartment number:" />
-                <TextBox Text="{Binding ApartmentTemplate.ApartmentId, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Square meters:" />
-                <TextBox Text="{Binding ApartmentTemplate.Size, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Number of rooms:" />
-                <TextBox Text="{Binding ApartmentTemplate.NumberOfRooms, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Monthly charge:" />
-                <TextBox Text="{Binding ApartmentTemplate.MonthlyCharge, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Floor:" />
-                <TextBox Text="{Binding ApartmentTemplate.Floor, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Address:" />
-                <TextBox Text="{Binding ApartmentTemplate.Address, Mode=TwoWay}" />
-                <StackPanel
-                    Width="150"
-                    Margin="0,20,0,0"
-                    HorizontalAlignment="Right"
-                    Orientation="Horizontal">
-                    <Button
-                        Margin="0,0,20,0"
-                        HorizontalAlignment="Right"
-                        Content="Go back">
-                        <interactivity:Interaction.Behaviors>
-                            <core:EventTriggerBehavior EventName="Click">
-                                <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmApartmentsPage" />
-                            </core:EventTriggerBehavior>
-                        </interactivity:Interaction.Behaviors>
-                    </Button>
-                    <Button
-                        HorizontalAlignment="Right"
-                        Background="#FF274CCD"
-                        Command="{Binding CreateApartmentCommand}"
-                        Content="Add"
-                        Foreground="White">
-                        <interactivity:Interaction.Behaviors>
-                            <core:EventTriggerBehavior EventName="Click">
-                                <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmApartmentsPage" />
-                            </core:EventTriggerBehavior>
-                        </interactivity:Interaction.Behaviors>
-                    </Button>
-                </StackPanel>
-            </StackPanel>
-        </Grid>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml.cs
deleted file mode 100644
index 41c3f67..0000000
--- a/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Windows.UI.Xaml.Controls;
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// Page for adding new apartment.
-    /// </summary>
-    public sealed partial class BmCreateApartmentPage : Page
-    {
-        public BmCreateApartmentPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml b/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml
deleted file mode 100644
index e2e19cd..0000000
--- a/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml
+++ /dev/null
@@ -1,97 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmCreateChangePage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    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"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <vm:BmChangesViewModel />
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
-            <TextBlock
-                Margin="0,10,0,10"
-                HorizontalAlignment="Center"
-                FontSize="20"
-                FontWeight="Bold"
-                Text="Apartment change information" />
-            <StackPanel Orientation="Horizontal">
-                <StackPanel Margin="0,5,30,0">
-                    <ListView
-                        Width="500"
-                        Height="534"
-                        ItemsSource="{Binding ChangeTemplate.Documents, Mode=TwoWay}"
-                        SelectedItem="{Binding SelectedChangeDocument, Mode=TwoWay}">
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <Image
-                                    Width="400"
-                                    Margin="10"
-                                    Source="{Binding Document}" />
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-                    <StackPanel Margin="10" Orientation="Horizontal">
-                        <Button
-                            Margin="30,0,0,0"
-                            Command="{Binding UploadChangeDocumentCommand}"
-                            Content="Upload document" />
-                        <Button
-                            Margin="170,0,0,0"
-                            Command="{Binding DeleteChangeDocumentCommand}"
-                            Content="Delete document" />
-                    </StackPanel>
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
-                </StackPanel>
-                <StackPanel Width="400" Margin="0,0,50,0">
-                    <TextBlock Margin="0,10,0,10" Text="Name" />
-                    <TextBox Text="{Binding ChangeTemplate.Name, Mode=TwoWay}" />
-                    <TextBlock Margin="0,10,0,10" Text="Apartment number" />
-                    <TextBox Text="{Binding ChangeTemplate.ApartmentId, Mode=TwoWay}" />
-                    <TextBlock Margin="0,10,0,10" Text="Description" />
-                    <TextBox
-                        Height="345"
-                        Text="{Binding ChangeTemplate.Description, Mode=TwoWay}"
-                        TextWrapping="Wrap" />
-                    <StackPanel
-                        Margin="0,20,0,0"
-                        HorizontalAlignment="Right"
-                        Orientation="Horizontal">
-                        <Button
-                            Margin="0,0,20,0"
-                            HorizontalAlignment="Right"
-                            Content="Go back">
-
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="Click">
-                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmChangesPage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </Button>
-                        <Button
-                            HorizontalAlignment="Right"
-                            Background="#FF274CCD"
-                            Command="{Binding CreateChangeCommand}"
-                            Content="Add"
-                            Foreground="White">
-
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="Click">
-                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmChangesPage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </Button>
-                    </StackPanel>
-                </StackPanel>
-            </StackPanel>
-        </StackPanel>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml.cs
deleted file mode 100644
index 054bca6..0000000
--- a/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class BmCreateChangePage : Page
-    {
-        public BmCreateChangePage()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml b/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml
deleted file mode 100644
index e667583..0000000
--- a/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml
+++ /dev/null
@@ -1,97 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmCreateDefectPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    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"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <vm:BmDefectsViewModel />
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
-            <TextBlock
-                Margin="0,10,0,10"
-                HorizontalAlignment="Center"
-                FontSize="20"
-                FontWeight="Bold"
-                Text="Defect Information" />
-            <StackPanel Orientation="Horizontal">
-                <StackPanel Margin="0,5,30,0">
-                    <ListView
-                        Width="500"
-                        Height="534"
-                        ItemsSource="{Binding DefectTemplate.Pictures, Mode=TwoWay}"
-                        SelectedItem="{Binding SelectedDefectPicture, Mode=TwoWay}">
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <Image
-                                    Width="400"
-                                    Margin="10"
-                                    Source="{Binding Picture}" />
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-                    <StackPanel Margin="10" Orientation="Horizontal">
-                        <Button
-                            Margin="30,0,0,0"
-                            Command="{Binding UploadDefectPictureCommand}"
-                            Content="Upload Picture" />
-                        <Button
-                            Margin="170,0,0,0"
-                            Command="{Binding DeleteDefectPictureCommand}"
-                            Content="Delete Picture" />
-                    </StackPanel>
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
-                </StackPanel>
-                <StackPanel Width="400" Margin="0,0,50,0">
-                    <TextBlock Margin="0,10,0,10" Text="Name" />
-                    <TextBox Text="{Binding DefectTemplate.Name, Mode=TwoWay}" />
-                    <TextBlock Margin="0,10,0,10" Text="Apartment number" />
-                    <TextBox Text="{Binding DefectTemplate.ApartmentId, Mode=TwoWay}" />
-                    <TextBlock Margin="0,10,0,10" Text="Description" />
-                    <TextBox
-                        Height="345"
-                        Text="{Binding DefectTemplate.Description, Mode=TwoWay}"
-                        TextWrapping="Wrap" />
-                    <StackPanel
-                        Margin="0,20,0,0"
-                        HorizontalAlignment="Right"
-                        Orientation="Horizontal">
-                        <Button
-                            Margin="0,0,20,0"
-                            HorizontalAlignment="Right"
-                            Content="Go back">
-
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="Click">
-                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmDefectsPage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </Button>
-                        <Button
-                            HorizontalAlignment="Right"
-                            Background="#FF274CCD"
-                            Command="{Binding CreateDefectCommand}"
-                            Content="Add"
-                            Foreground="White">
-
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="Click">
-                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmDefectsPage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </Button>
-                    </StackPanel>
-                </StackPanel>
-            </StackPanel>
-        </StackPanel>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml.cs
deleted file mode 100644
index 62fc8d2..0000000
--- a/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Windows.UI.Xaml.Controls;
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// Page for creating new defect.
-    /// </summary>
-    public sealed partial class BmCreateDefectPage : Page
-    {
-        public BmCreateDefectPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml b/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml
deleted file mode 100644
index b6c9759..0000000
--- a/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml
+++ /dev/null
@@ -1,150 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmDefectsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    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"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.Resources>
-        <Style x:Key="ListItemStyle" TargetType="ListViewItem">
-            <Setter Property="Background" Value="White" />
-            <Setter Property="Padding" Value="0" />
-            <Setter Property="Margin" Value="12,12,12,0" />
-            <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="BorderBrush" Value="#DFE0E4" />
-            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ListViewItem">
-                        <ListViewItemPresenter />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style x:Key="TextBlockStyle" TargetType="TextBlock">
-            <Setter Property="Margin" Value="0,0,0,10" />
-            <Setter Property="Foreground" Value="White" />
-        </Style>
-        <Style x:Key="ActionButtonStyle" TargetType="Button">
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Height" Value="40" />
-            <Setter Property="Width" Value="40" />
-            <Setter Property="HorizontalAlignment" Value="Right" />
-            <Setter Property="VerticalAlignment" Value="Top" />
-        </Style>
-    </Page.Resources>
-    
-    <Page.DataContext>
-        <vm:BmDefectsViewModel />
-    </Page.DataContext>
-    
-    <Page.BottomAppBar>
-        <CommandBar>
-            <CommandBar.Content>
-                <Grid />
-            </CommandBar.Content>
-            <AppBarButton
-                Click="GoToCreateDefectPage"
-                Command="{Binding ClearDefectTemplateCommand}"
-                Icon="Add"
-                Label="Create Apartment">
-                <AppBarButton.DataContext>
-                    <vm:BmDefectsViewModel />
-                </AppBarButton.DataContext>
-            </AppBarButton>
-        </CommandBar>
-    </Page.BottomAppBar>
-    
-    <Grid Background="#E9EBEE">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="40" />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <StackPanel Background="{StaticResource AppBarBackgroundThemeBrush}" Orientation="Horizontal">
-            <TextBlock
-                Margin="40,0,10,0"
-                VerticalAlignment="Center"
-                Text="Defect ID: " />
-            <TextBox Height="32" />
-            <TextBlock
-                Margin="10,0"
-                VerticalAlignment="Center"
-                Text="Apartment number: " />
-            <TextBox Height="32" />
-        </StackPanel>
-        
-        <ListView
-            x:Name="DefectsList"
-            Grid.Row="1"
-            ItemsSource="{Binding BmSingleton.Defects}"
-            SelectedItem="{Binding DefectTemplate, Mode=TwoWay}">
-            <ListView.ItemContainerStyle>
-                <Style BasedOn="{StaticResource ListItemStyle}" TargetType="ListViewItem" />
-            </ListView.ItemContainerStyle>
-            <ListView.ItemTemplate>
-                <DataTemplate>
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="150" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="50px" />
-                        </Grid.ColumnDefinitions>
-                        <Image
-                            Margin="5"
-                            Source="{Binding Pictures[0].Picture}"
-                            Stretch="Fill" />
-                        <StackPanel Grid.Column="1" Padding="10">
-                            <TextBlock><Run Text="Defect ID: " /><Run Text="{Binding DefectId}" /></TextBlock>
-                            <TextBlock><Run Text="Apartment number: " /><Run Text="{Binding ApartmentId}" /></TextBlock>
-                            <TextBlock><Run Text="Name: " /><Run Text="{Binding Name}" /></TextBlock>
-                            <TextBlock><Run Text="Status: " /><Run Text="{Binding Status}" /></TextBlock>
-                            <TextBlock><Run Text="Upload date: " /><Run Text="{Binding UploadDate.Day}" /><Run Text="." /><Run Text="{Binding UploadDate.Month}" /><Run Text="." /><Run Text="{Binding UploadDate.Year}" /></TextBlock>
-                        </StackPanel>
-                        <Button
-                            Grid.Column="2"
-                            Click="SelectItem"
-                            Command="{Binding DeleteDefectCommand}"
-                            DataContext="{Binding ElementName=DefectsList, Path=DataContext}"
-                            Style="{StaticResource ActionButtonStyle}">
-                            <SymbolIcon Symbol="Clear" ToolTipService.ToolTip="Delete" />
-                        </Button>
-                        <Button
-                            Grid.Column="2"
-                            Margin="0,40,0,0"
-                            Click="SelectItem"
-                            DataContext="{Binding ElementName=DefectsList, Path=DataContext}"
-                            Style="{StaticResource ActionButtonStyle}">
-                            <SymbolIcon Symbol="Edit" ToolTipService.ToolTip="Edit" />
-
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="Click">
-                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmEditDefectPage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </Button>
-                        <Button
-                            Grid.Column="2"
-                            Margin="0,80,0,0"
-                            Click="SelectItem"
-                            DataContext="{Binding ElementName=DefectsList, Path=DataContext}"
-                            Style="{StaticResource ActionButtonStyle}">
-                            <SymbolIcon Symbol="View" ToolTipService.ToolTip="View" />
-
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="Click">
-                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmSingleDefectPage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </Button>
-                    </Grid>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml.cs
deleted file mode 100644
index 8b38af0..0000000
--- a/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// Page for managing defects.
-    /// </summary>
-    public sealed partial class BmDefectsPage : Page
-    {
-        public BmDefectsPage()
-        {
-            InitializeComponent();
-        }
-
-        private void SelectItem(object sender, RoutedEventArgs e)
-        {
-            var item = ((Grid)((Button)sender).Parent).DataContext;
-            var container = (ListViewItem)DefectsList.ContainerFromItem(item);
-
-            container.IsSelected = true;
-        }
-
-        private void GoToCreateDefectPage(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(BmCreateDefectPage));
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml
deleted file mode 100644
index 46ea641..0000000
--- a/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml
+++ /dev/null
@@ -1,87 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmEditApartmentPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    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"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-    <Page.DataContext>
-        <vm:BmApartmentsViewModel />
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="600" />
-                <ColumnDefinition Width="300" />
-            </Grid.ColumnDefinitions>
-            <Button
-                Margin="0,20,20,0"
-                HorizontalAlignment="Right"
-                VerticalAlignment="Top"
-                Command="{Binding UploadApartmentPlanCommand}"
-                Content="Add plan" />
-            <Image
-                Margin="20,80"
-                VerticalAlignment="Top"
-                Source="{Binding ApartmentTemplate.PlanPicture}" />
-            <StackPanel
-                Grid.Column="1"
-                Margin="20,0,0,0"
-                VerticalAlignment="Top"
-                Orientation="Vertical">
-                <TextBlock
-                    Margin="0,10,0,10"
-                    HorizontalAlignment="Center"
-                    FontSize="20"
-                    FontWeight="Bold"
-                    Text="Apartment information:" />
-                <TextBlock Margin="0,10,0,10" Text="Apartment number:" />
-                <TextBox Text="{Binding ApartmentTemplate.ApartmentId, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Square meters:" />
-                <TextBox Text="{Binding ApartmentTemplate.Size, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Number of rooms:" />
-                <TextBox Text="{Binding ApartmentTemplate.NumberOfRooms, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Monthly charge:" />
-                <TextBox Text="{Binding ApartmentTemplate.MonthlyCharge, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Floor:" />
-                <TextBox Text="{Binding ApartmentTemplate.Floor, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Address:" />
-                <TextBox Text="{Binding ApartmentTemplate.Address, Mode=TwoWay}" />
-                <StackPanel
-                    Width="170"
-                    Margin="0,20,0,0"
-                    HorizontalAlignment="Right"
-                    Orientation="Horizontal">
-                    <Button
-                        Margin="0,0,20,0"
-                        HorizontalAlignment="Right"
-                        Command="{Binding GetApartmentsCommand}"
-                        Content="Go back">
-                        <interactivity:Interaction.Behaviors>
-                            <core:EventTriggerBehavior EventName="Click">
-                                <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmApartmentsPage" />
-                            </core:EventTriggerBehavior>
-                        </interactivity:Interaction.Behaviors>
-                    </Button>
-                    <Button
-                        HorizontalAlignment="Right"
-                        Background="#FF274CCD"
-                        Command="{Binding UpdateApartmentCommand}"
-                        Content="Update"
-                        Foreground="White">
-                        <interactivity:Interaction.Behaviors>
-                            <core:EventTriggerBehavior EventName="Click">
-                                <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmApartmentsPage" />
-                            </core:EventTriggerBehavior>
-                        </interactivity:Interaction.Behaviors>
-                    </Button>
-                </StackPanel>
-            </StackPanel>
-        </Grid>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml.cs
deleted file mode 100644
index 63e71eb..0000000
--- a/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Windows.UI.Xaml.Controls;
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// Page for editing apartment.
-    /// </summary>
-    public sealed partial class BmEditApartmentPage : Page
-    {
-        public BmEditApartmentPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml b/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml
deleted file mode 100644
index 6d8518a..0000000
--- a/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml
+++ /dev/null
@@ -1,108 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmEditChangePage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    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"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <vm:BmChangesViewModel />
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
-            <TextBlock
-                Margin="0,10,0,10"
-                HorizontalAlignment="Center"
-                FontSize="20"
-                FontWeight="Bold"
-                Text="Apartment change information" />
-            <StackPanel Orientation="Horizontal">
-                <StackPanel Margin="0,5,30,0">
-                    <ListView
-                        Width="500"
-                        Height="534"
-                        ItemsSource="{Binding ChangeTemplate.Documents, Mode=TwoWay}"
-                        SelectedItem="{Binding SelectedChangeDocument, Mode=TwoWay}">
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <Image
-                                    Width="400"
-                                    Margin="10"
-                                    Source="{Binding Document}" />
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-                    <StackPanel Margin="10" Orientation="Horizontal">
-                        <Button
-                            Margin="30,0,0,0"
-                            Command="{Binding UploadChangeDocumentCommand}"
-                            Content="Upload Picture" />
-                        <Button
-                            Margin="170,0,0,0"
-                            Command="{Binding DeleteChangeDocumentTempCommand}"
-                            Content="Delete Picture" />
-                    </StackPanel>
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
-                </StackPanel>
-                <StackPanel Width="400" Margin="0,0,50,0">
-                    <TextBlock Margin="0,10,0,10" Text="Name" />
-                    <TextBox Text="{Binding ChangeTemplate.Name, Mode=TwoWay}" />
-                    <StackPanel Margin="0,10,0,10" Orientation="Horizontal">
-                        <TextBlock
-                            Margin="0,0,10,0"
-                            VerticalAlignment="Center"
-                            Text="Apartment number" />
-                        <TextBox Text="{Binding ChangeTemplate.ApartmentId, Mode=TwoWay}" />
-                        <TextBlock
-                            Margin="20,0,10,0"
-                            VerticalAlignment="Center"
-                            Text="Status" />
-                        <TextBox Width="128" Text="{Binding ChangeTemplate.Status, Mode=TwoWay}" />
-                    </StackPanel>
-                    <TextBlock Margin="0,0,0,10" Text="Description" />
-                    <TextBox
-                        Height="375"
-                        Text="{Binding ChangeTemplate.Description, Mode=TwoWay}"
-                        TextWrapping="Wrap" />
-                    <StackPanel
-                        Margin="0,20,0,0"
-                        HorizontalAlignment="Right"
-                        Orientation="Horizontal">
-                        <Button
-                            Margin="0,0,20,0"
-                            HorizontalAlignment="Right"
-                            Command="{Binding GetChangesCommand}"
-                            Content="Go back">
-
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="Click">
-                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmChangesPage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </Button>
-                        <Button
-                            HorizontalAlignment="Right"
-                            Background="#FF274CCD"
-                            Command="{Binding UpdateChangeCommand}"
-                            Content="Update"
-                            Foreground="White">
-
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="Click">
-                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmChangesPage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </Button>
-                    </StackPanel>
-                </StackPanel>
-            </StackPanel>
-        </StackPanel>
-    </Grid>
-</Page>
\ No newline at end of file
diff --git a/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml.cs
deleted file mode 100644
index 715f47e..0000000
--- a/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class BmEditChangePage : Page
-    {
-        public BmEditChangePage()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml b/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml
deleted file mode 100644
index 5089904..0000000
--- a/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml
+++ /dev/null
@@ -1,108 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmEditDefectPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    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"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <vm:BmDefectsViewModel />
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
-            <TextBlock
-                Margin="0,10,0,10"
-                HorizontalAlignment="Center"
-                FontSize="20"
-                FontWeight="Bold"
-                Text="Defect Information" />
-            <StackPanel Orientation="Horizontal">
-                <StackPanel Margin="0,5,30,0">
-                    <ListView
-                        Width="500"
-                        Height="534"
-                        ItemsSource="{Binding DefectTemplate.Pictures, Mode=TwoWay}"
-                        SelectedItem="{Binding SelectedDefectPicture, Mode=TwoWay}">
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <Image
-                                    Width="400"
-                                    Margin="10"
-                                    Source="{Binding Picture}" />
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-                    <StackPanel Margin="10" Orientation="Horizontal">
-                        <Button
-                            Margin="30,0,0,0"
-                            Command="{Binding UploadDefectPictureCommand}"
-                            Content="Upload Picture" />
-                        <Button
-                            Margin="170,0,0,0"
-                            Command="{Binding DeleteDefectPictureTempCommand}"
-                            Content="Delete Picture" />
-                    </StackPanel>
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
-                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
-                </StackPanel>
-                <StackPanel Width="400" Margin="0,0,50,0">
-                    <TextBlock Margin="0,10,0,10" Text="Name" />
-                    <TextBox Text="{Binding DefectTemplate.Name, Mode=TwoWay}" />
-                    <StackPanel Margin="0,10,0,10" Orientation="Horizontal">
-                        <TextBlock
-                            Margin="0,0,10,0"
-                            VerticalAlignment="Center"
-                            Text="Apartment number" />
-                        <TextBox Text="{Binding DefectTemplate.ApartmentId, Mode=TwoWay}" />
-                        <TextBlock
-                            Margin="20,0,10,0"
-                            VerticalAlignment="Center"
-                            Text="Status" />
-                        <TextBox Width="128" Text="{Binding DefectTemplate.Status, Mode=TwoWay}" />
-                    </StackPanel>
-                    <TextBlock Margin="0,0,0,10" Text="Description" />
-                    <TextBox
-                        Height="375"
-                        Text="{Binding DefectTemplate.Description, Mode=TwoWay}"
-                        TextWrapping="Wrap" />
-                    <StackPanel
-                        Margin="0,20,0,0"
-                        HorizontalAlignment="Right"
-                        Orientation="Horizontal">
-                        <Button
-                            Margin="0,0,20,0"
-                            HorizontalAlignment="Right"
-                            Command="{Binding GetDefectsCommand}"
-                            Content="Go back">
-
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="Click">
-                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmDefectsPage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </Button>
-                        <Button
-                            HorizontalAlignment="Right"
-                            Background="#FF274CCD"
-                            Command="{Binding UpdateDefectCommand}"
-                            Content="Update"
-                            Foreground="White">
-
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="Click">
-                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmDefectsPage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </Button>
-                    </StackPanel>
-                </StackPanel>
-            </StackPanel>
-        </StackPanel>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml.cs
deleted file mode 100644
index edba09e..0000000
--- a/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class BmEditDefectPage : Page
-    {
-        public BmEditDefectPage()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmMainPage.xaml b/ApartmentManager/ApartmentManager/View/BmMainPage.xaml
deleted file mode 100644
index 3cf03a3..0000000
--- a/ApartmentManager/ApartmentManager/View/BmMainPage.xaml
+++ /dev/null
@@ -1,86 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmMainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    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"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <TextBlock
-            Margin="80,30,0,0"
-            FontSize="36"
-            Text="Welcome, board member!" />
-        <Grid Margin="100,100,0,0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="600" />
-                <ColumnDefinition Width="200" />
-            </Grid.ColumnDefinitions>
-            <Image
-                Grid.Column="0"
-                VerticalAlignment="Top"
-                Source="ms-appx:///Assets/Ostbanehus.jpg" />
-            <StackPanel Grid.Column="1" Margin="20,0,0,0">
-                <TextBlock
-                    Margin="0,0,0,10"
-                    HorizontalAlignment="Stretch"
-                    FontSize="20"
-                    Text="Manage:" />
-                <Button
-                    Margin="0,0,0,10"
-                    HorizontalAlignment="Stretch"
-                    Content="Apartments">
-                    <interactivity:Interaction.Behaviors>
-                        <core:EventTriggerBehavior EventName="Click">
-                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmApartmentsPage" />
-                        </core:EventTriggerBehavior>
-                    </interactivity:Interaction.Behaviors>
-                </Button>
-                <Button
-                    Margin="0,0,0,10"
-                    HorizontalAlignment="Stretch"
-                    Content="Contract owners">
-                    <interactivity:Interaction.Behaviors>
-                        <core:EventTriggerBehavior EventName="Click">
-                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmUsersPage" />
-                        </core:EventTriggerBehavior>
-                    </interactivity:Interaction.Behaviors>
-                </Button>
-                <Button
-                    Margin="0,0,0,10"
-                    HorizontalAlignment="Stretch"
-                    Content="Residents">
-                    <interactivity:Interaction.Behaviors>
-                        <core:EventTriggerBehavior EventName="Click">
-                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmResidentsPage" />
-                        </core:EventTriggerBehavior>
-                    </interactivity:Interaction.Behaviors>
-                </Button>
-                <Button
-                    Margin="0,0,0,10"
-                    HorizontalAlignment="Stretch"
-                    Content="Defects">
-                    <interactivity:Interaction.Behaviors>
-                        <core:EventTriggerBehavior EventName="Click">
-                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmDefectsPage" />
-                        </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.BmApartmentChangesPage" />
-                        </core:EventTriggerBehavior>
-                    </interactivity:Interaction.Behaviors>
-                </Button>
-            </StackPanel>
-        </Grid>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmMainPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmMainPage.xaml.cs
deleted file mode 100644
index 5d287f1..0000000
--- a/ApartmentManager/ApartmentManager/View/BmMainPage.xaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// Main page for board members.
-    /// </summary>
-    public sealed partial class BmMainPage : Page
-    {
-        public BmMainPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml b/ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml
deleted file mode 100644
index 332ef2a..0000000
--- a/ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml
+++ /dev/null
@@ -1,167 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmResidentsPage"
-    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:local="using:ApartmentManager.View"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.Resources>
-        <Style x:Key="ListItemStyle" TargetType="ListViewItem">
-            <Setter Property="Background" Value="White" />
-            <Setter Property="Padding" Value="0" />
-            <Setter Property="Margin" Value="12,12,12,0" />
-            <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="BorderBrush" Value="#DFE0E4" />
-            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ListViewItem">
-                        <ListViewItemPresenter />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style x:Key="TextBlockStyle" TargetType="TextBlock">
-            <Setter Property="Margin" Value="0,0,0,10" />
-            <Setter Property="Foreground" Value="White" />
-        </Style>
-        <Style x:Key="ActionButtonStyle" TargetType="Button">
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Height" Value="40" />
-            <Setter Property="Width" Value="40" />
-            <Setter Property="HorizontalAlignment" Value="Right" />
-            <Setter Property="VerticalAlignment" Value="Top" />
-        </Style>
-    </Page.Resources>
-
-    <Page.DataContext>
-        <vm:BmResidentsViewModel />
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="50" />
-                <RowDefinition />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition Width="450" />
-            </Grid.ColumnDefinitions>
-
-            <Grid Background="#E9EBEE">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock
-                        Margin="50,0,10,0"
-                        VerticalAlignment="Center"
-                        FontSize="18"
-                        Text="Search: " />
-                    <TextBox Height="32" PlaceholderText="Type search parameters..." />
-                </StackPanel>
-                <AppBarButton
-                    Grid.Column="1"
-                    HorizontalAlignment="Right"
-                    Command="{Binding ClearResidentTemplateCommand}"
-                    Icon="Add" />
-            </Grid>
-            <ListView
-                Grid.Row="1"
-                Padding="10"
-                Background="#E9EBEE"
-                ItemsSource="{Binding BmSingleton.Residents}"
-                SelectedItem="{Binding ResidentTemplate, Mode=TwoWay}">
-
-                <ListView.ItemContainerStyle>
-                    <Style BasedOn="{StaticResource ListItemStyle}" TargetType="ListViewItem" />
-                </ListView.ItemContainerStyle>
-
-                <ListView.ItemTemplate>
-
-                    <DataTemplate>
-                        <Grid Height="150">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="150" />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-
-                            <Image
-                                Margin="5"
-                                Source="{Binding Picture}"
-                                Stretch="Fill" />
-
-                            <Grid Grid.Column="1">
-                                <StackPanel Margin="10,0,0,0" VerticalAlignment="Center">
-                                    <TextBlock FontSize="20"><Run Text="Name: " /><Run Text="{Binding FirstName}" /><Run Text=" " /><Run Text="{Binding LastName}" /></TextBlock>
-                                    <TextBlock><Run Text="Apartment number: " /><Run Text="{Binding ApartmentId}" /></TextBlock>
-                                    <TextBlock><Run Text="Birth date: " /><Run Text="{Binding BirthDate.Day}" /><Run Text="." /><Run Text="{Binding BirthDate.Month}" /><Run Text="." /><Run Text="{Binding BirthDate.Year}" /></TextBlock>
-                                    <TextBlock><Run Text="E-mail address: " /><Run Text="{Binding Email}" /></TextBlock>
-                                    <TextBlock><Run Text="Phone number: " /><Run Text="{Binding Phone}" /></TextBlock>
-                                </StackPanel>
-                            </Grid>
-                        </Grid>
-                    </DataTemplate>
-
-                </ListView.ItemTemplate>
-            </ListView>
-            <StackPanel
-                Grid.RowSpan="2"
-                Grid.Column="1"
-                Width="400"
-                HorizontalAlignment="Center">
-                <TextBlock
-                    Margin="0,5,0,10"
-                    HorizontalAlignment="Center"
-                    FontSize="20"
-                    FontWeight="Bold"
-                    Text="Resident Info" />
-                <Image
-                    Width="150"
-                    Height="150"
-                    Source="{Binding ResidentTemplate.Picture, Mode=TwoWay}" />
-                <Button
-                    Margin="0,5,0,0"
-                    HorizontalAlignment="Stretch"
-                    Command="{Binding UploadResidentPhotoCommand}"
-                    Content="Upload Picture" />
-                <TextBlock Margin="0,5,0,1" Text="Apartment number" />
-                <TextBox Text="{Binding ResidentTemplate.ApartmentId, Mode=TwoWay}" />
-                <TextBlock Margin="0,5,0,1" Text=" First name" />
-                <TextBox Text="{Binding ResidentTemplate.FirstName, Mode=TwoWay}" />
-                <TextBlock Margin="0,5,0,1" Text="Last Name" />
-                <TextBox Text="{Binding ResidentTemplate.LastName, Mode=TwoWay}" />
-                <TextBlock Margin="0,5,0,1" Text="Birth date" />
-                <DatePicker HorizontalAlignment="Stretch" Date="{Binding ResidentTemplate.BirthDate, Mode=TwoWay}" />
-                <TextBlock Margin="0,5,0,1" Text="Email address" />
-                <TextBox Text="{Binding ResidentTemplate.Email, Mode=TwoWay}" />
-                <TextBlock Margin="0,5,0,1" Text="Phone number" />
-                <TextBox Text="{Binding ResidentTemplate.Phone, Mode=TwoWay}" />
-
-                <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
-                    <Button
-                        Width="125"
-                        Margin="0"
-                        Command="{Binding CreateResidentCommand}"
-                        Content="Create" />
-                    <Button
-                        Width="125"
-                        Margin="10,0"
-                        Command="{Binding DeleteResidentCommand}"
-                        Content="Delete" />
-                    <Button
-                        Width="125"
-                        Margin="0"
-                        Command="{Binding UpdateResidentCommand}"
-                        Content="Update" />
-                </StackPanel>
-            </StackPanel>
-        </Grid>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml.cs
deleted file mode 100644
index 2a43996..0000000
--- a/ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class BmResidentsPage : Page
-    {
-        public BmResidentsPage()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmSingleChangePage.xaml b/ApartmentManager/ApartmentManager/View/BmSingleChangePage.xaml
deleted file mode 100644
index 195095b..0000000
--- a/ApartmentManager/ApartmentManager/View/BmSingleChangePage.xaml
+++ /dev/null
@@ -1,135 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmSingleChangePage"
-    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:local="using:ApartmentManager.View"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <vm:BmChangesViewModel />
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <ScrollViewer>
-            <StackPanel>
-                <StackPanel Margin="10,10,10,0" Orientation="Horizontal">
-                    <TextBlock
-                        Margin="100,0,0,0"
-                        FontSize="30"
-                        FontWeight="Bold"
-                        Text="Name :" />
-                    <TextBlock
-                        Margin="10,0,0,0"
-                        FontSize="30"
-                        Text="{Binding ChangeTemplate.Name}" />
-                    <TextBlock
-                        Margin="700,0,0,0"
-                        FontSize="30"
-                        FontWeight="Bold"
-                        Text="Status :" />
-                    <TextBlock
-                        Margin="10,0,0,0"
-                        FontSize="30"
-                        Text="{Binding ChangeTemplate.Status}" />
-                </StackPanel>
-                <StackPanel Margin="20,0,20,20" Orientation="Horizontal">
-                    <StackPanel Width="620" Margin="0,50,0,0">
-                        <GridView
-                            Width="500"
-                            Height="420"
-                            ItemsSource="{Binding ChangeTemplate.Documents, Mode=TwoWay}">
-                            <GridView.ItemTemplate>
-                                <DataTemplate>
-                                    <Image
-                                        Width="220"
-                                        Margin="10,0,10,10"
-                                        Source="{Binding Document}" />
-                                </DataTemplate>
-                            </GridView.ItemTemplate>
-
-                        </GridView>
-                    </StackPanel>
-                    <StackPanel Width="620">
-                        <TextBlock
-                            Margin="10,0,0,10"
-                            FontSize="30"
-                            FontWeight="Bold"
-                            Text="Description" />
-                        <Grid BorderBrush="Black" BorderThickness="1">
-                            <TextBlock
-                                Height="400"
-                                Margin="10"
-                                Text="{Binding ChangeTemplate.Description, Mode=TwoWay}"
-                                TextWrapping="WrapWholeWords" />
-                        </Grid>
-
-
-                    </StackPanel>
-
-
-                </StackPanel>
-                <StackPanel Width="600" Margin="0,20,0,0">
-                    <TextBlock
-                        Margin="10,0,0,10"
-                        FontSize="30"
-                        FontWeight="Bold"
-                        Text="Comments" />
-                    <StackPanel Orientation="Horizontal">
-
-                        <TextBox
-                            Width="500"
-                            Height="80"
-                            Text="{Binding NewChangeComment.Comment, Mode=TwoWay}"
-                            TextWrapping="Wrap" />
-                        <Button
-                            Margin="10,0,0,0"
-                            Command="{Binding CreateChangeCommentCommand}"
-                            Content="Comment" />
-                    </StackPanel>
-
-
-                    <ListView ItemsSource="{Binding ChangeTemplate.Comments}">
-                        <ListView.ItemContainerStyle>
-                            <Style TargetType="ListViewItem">
-                                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                            </Style>
-                        </ListView.ItemContainerStyle>
-
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <Grid Margin="10">
-                                    <StackPanel>
-                                        <TextBlock
-                                            Margin="5,0,0,0"
-                                            FontWeight="Bold"
-                                            Text="{Binding Name}" />
-                                        <TextBlock
-                                            Margin="5"
-                                            Text="{Binding Comment}"
-                                            TextWrapping="WrapWholeWords" />
-                                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                                            <TextBlock Margin="0,0,0,5">
-                                                <Run FontWeight="Bold" Text="{Binding Date.Year}" />
-                                                <Run FontWeight="Bold" Text="-" />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Month}" />
-                                                <Run FontWeight="Bold" Text="-" />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Day}" />
-                                                <Run FontWeight="Bold" Text="  " />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Hour}" />
-                                                <Run FontWeight="Bold" Text=":" />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Minute}" />
-                                            </TextBlock>
-                                        </StackPanel>
-                                    </StackPanel>
-                                </Grid>
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-                </StackPanel>
-            </StackPanel>
-        </ScrollViewer>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmSingleChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmSingleChangePage.xaml.cs
deleted file mode 100644
index d4bcc40..0000000
--- a/ApartmentManager/ApartmentManager/View/BmSingleChangePage.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class BmSingleChangePage : Page
-    {
-        public BmSingleChangePage()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmSingleDefectPage.xaml b/ApartmentManager/ApartmentManager/View/BmSingleDefectPage.xaml
deleted file mode 100644
index 2e7a935..0000000
--- a/ApartmentManager/ApartmentManager/View/BmSingleDefectPage.xaml
+++ /dev/null
@@ -1,135 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmSingleDefectPage"
-    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:local="using:ApartmentManager.View"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <vm:BmDefectsViewModel />
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <ScrollViewer>
-            <StackPanel>
-                <StackPanel Margin="10,10,10,0" Orientation="Horizontal">
-                    <TextBlock
-                        Margin="100,0,0,0"
-                        FontSize="30"
-                        FontWeight="Bold"
-                        Text="Name :" />
-                    <TextBlock
-                        Margin="10,0,0,0"
-                        FontSize="30"
-                        Text="{Binding DefectTemplate.Name}" />
-                    <TextBlock
-                        Margin="700,0,0,0"
-                        FontSize="30"
-                        FontWeight="Bold"
-                        Text="Status :" />
-                    <TextBlock
-                        Margin="10,0,0,0"
-                        FontSize="30"
-                        Text="{Binding DefectTemplate.Status}" />
-                </StackPanel>
-                <StackPanel Margin="20,0,20,20" Orientation="Horizontal">
-                    <StackPanel Width="620" Margin="0,50,0,0">
-                        <GridView
-                            Width="500"
-                            Height="420"
-                            ItemsSource="{Binding DefectTemplate.Pictures, Mode=TwoWay}">
-                            <GridView.ItemTemplate>
-                                <DataTemplate>
-                                    <Image
-                                        Width="220"
-                                        Margin="10,0,10,10"
-                                        Source="{Binding Picture}" />
-                                </DataTemplate>
-                            </GridView.ItemTemplate>
-
-                        </GridView>
-                    </StackPanel>
-                    <StackPanel Width="620">
-                        <TextBlock
-                            Margin="10,0,0,10"
-                            FontSize="30"
-                            FontWeight="Bold"
-                            Text="Description" />
-                        <Grid BorderBrush="Black" BorderThickness="1">
-                            <TextBlock
-                                Height="400"
-                                Margin="10"
-                                Text="{Binding DefectTemplate.Description, Mode=TwoWay}"
-                                TextWrapping="WrapWholeWords" />
-                        </Grid>
-
-
-                    </StackPanel>
-
-
-                </StackPanel>
-                <StackPanel Width="600" Margin="0,20,0,0">
-                    <TextBlock
-                        Margin="10,0,0,10"
-                        FontSize="30"
-                        FontWeight="Bold"
-                        Text="Comments" />
-                    <StackPanel Orientation="Horizontal">
-
-                        <TextBox
-                            Width="500"
-                            Height="80"
-                            Text="{Binding NewDefectComment.Comment, Mode=TwoWay}"
-                            TextWrapping="Wrap" />
-                        <Button
-                            Margin="10,0,0,0"
-                            Command="{Binding CreateDefectCommentCommand}"
-                            Content="Comment" />
-                    </StackPanel>
-
-
-                    <ListView ItemsSource="{Binding DefectTemplate.Comments}">
-                        <ListView.ItemContainerStyle>
-                            <Style TargetType="ListViewItem">
-                                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                            </Style>
-                        </ListView.ItemContainerStyle>
-
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <Grid Margin="10">
-                                    <StackPanel>
-                                        <TextBlock
-                                            Margin="5,0,0,0"
-                                            FontWeight="Bold"
-                                            Text="{Binding Name}" />
-                                        <TextBlock
-                                            Margin="5"
-                                            Text="{Binding Comment}"
-                                            TextWrapping="WrapWholeWords" />
-                                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                                            <TextBlock Margin="0,0,0,5">
-                                                <Run FontWeight="Bold" Text="{Binding Date.Year}" />
-                                                <Run FontWeight="Bold" Text="-" />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Month}" />
-                                                <Run FontWeight="Bold" Text="-" />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Day}" />
-                                                <Run FontWeight="Bold" Text="  " />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Hour}" />
-                                                <Run FontWeight="Bold" Text=":" />
-                                                <Run FontWeight="Bold" Text="{Binding Date.Minute}" />
-                                            </TextBlock>
-                                        </StackPanel>
-                                    </StackPanel>
-                                </Grid>
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-                </StackPanel>
-            </StackPanel>
-        </ScrollViewer>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmSingleDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmSingleDefectPage.xaml.cs
deleted file mode 100644
index 340e86a..0000000
--- a/ApartmentManager/ApartmentManager/View/BmSingleDefectPage.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class BmSingleDefectPage : Page
-    {
-        public BmSingleDefectPage()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/BmUsersPage.xaml b/ApartmentManager/ApartmentManager/View/BmUsersPage.xaml
deleted file mode 100644
index 77c60f7..0000000
--- a/ApartmentManager/ApartmentManager/View/BmUsersPage.xaml
+++ /dev/null
@@ -1,177 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.BmUsersPage"
-    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:local="using:ApartmentManager.View"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:vm="using:ApartmentManager.ViewModel"
-    mc:Ignorable="d">
-
-    <Page.Resources>
-        <Style x:Key="ListItemStyle" TargetType="ListViewItem">
-            <Setter Property="Background" Value="White" />
-            <Setter Property="Padding" Value="0" />
-            <Setter Property="Margin" Value="12,12,12,0" />
-            <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="BorderBrush" Value="#DFE0E4" />
-            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ListViewItem">
-                        <ListViewItemPresenter />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style x:Key="TextBlockStyle" TargetType="TextBlock">
-            <Setter Property="Margin" Value="0,0,0,10" />
-            <Setter Property="Foreground" Value="White" />
-        </Style>
-        <Style x:Key="ActionButtonStyle" TargetType="Button">
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Height" Value="40" />
-            <Setter Property="Width" Value="40" />
-            <Setter Property="HorizontalAlignment" Value="Right" />
-            <Setter Property="VerticalAlignment" Value="Top" />
-        </Style>
-    </Page.Resources>
-
-    <Page.DataContext>
-        <vm:BmUsersViewModel />
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="50" />
-                <RowDefinition />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition Width="450" />
-            </Grid.ColumnDefinitions>
-
-            <Grid Background="#E9EBEE">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock
-                        Margin="50,0,10,0"
-                        VerticalAlignment="Center"
-                        FontSize="18"
-                        Text="Search: " />
-                    <TextBox Height="32" PlaceholderText="Type search parameters..." />
-                </StackPanel>
-                <AppBarButton
-                    Grid.Column="1"
-                    HorizontalAlignment="Right"
-                    Command="{Binding ClearUserTemplateCommand}"
-                    Icon="Add" />
-            </Grid>
-            <ListView
-                Grid.Row="1"
-                Padding="10"
-                Background="#E9EBEE"
-                ItemsSource="{Binding BmSingleton.Users}"
-                SelectedItem="{Binding UserTemplate, Mode=TwoWay}">
-
-                <ListView.ItemContainerStyle>
-                    <Style BasedOn="{StaticResource ListItemStyle}" TargetType="ListViewItem" />
-                </ListView.ItemContainerStyle>
-
-                <ListView.ItemTemplate>
-
-                    <DataTemplate>
-                        <Grid Height="150">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="150" />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-
-                            <Image
-                                Margin="5"
-                                Source="{Binding Picture}"
-                                Stretch="Fill" />
-
-                            <Grid Grid.Column="1">
-                                <StackPanel Margin="10,0,0,0" VerticalAlignment="Center">
-                                    <TextBlock FontSize="20"><Run Text="Name: " /><Run Text="{Binding FirstName}" /><Run Text=" " /><Run Text="{Binding LastName}" /></TextBlock>
-                                    <TextBlock><Run Text="Apartment number: " /><Run Text="{Binding ApartmentId}" /></TextBlock>
-                                    <TextBlock><Run Text="Birth date: " /><Run Text="{Binding BirthDate.Day}" /><Run Text="." /><Run Text="{Binding BirthDate.Month}" /><Run Text="." /><Run Text="{Binding BirthDate.Year}" /></TextBlock>
-                                    <TextBlock><Run Text="E-mail address: " /><Run Text="{Binding Email}" /></TextBlock>
-                                    <TextBlock><Run Text="Phone number: " /><Run Text="{Binding Phone}" /></TextBlock>
-                                </StackPanel>
-                            </Grid>
-                        </Grid>
-                    </DataTemplate>
-
-                </ListView.ItemTemplate>
-            </ListView>
-            <Grid Grid.RowSpan="2" Grid.Column="1">
-                <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition Height="60" />
-                </Grid.RowDefinitions>
-                <ScrollViewer>
-                    <StackPanel Width="400" HorizontalAlignment="Center">
-                        <Image
-                            Width="150"
-                            Height="150"
-                            Source="{Binding UserTemplate.Picture, Mode=TwoWay}" />
-                        <Button
-                            Margin="0,5,0,0"
-                            HorizontalAlignment="Stretch"
-                            Command="{Binding UploadUserPhotoCommand}"
-                            Content="Upload Picture" />
-                        <TextBlock Margin="0,5,0,1" Text="Username" />
-                        <TextBox Text="{Binding UserTemplate.Username, Mode=TwoWay}" />
-                        <TextBlock Margin="0,5,0,1" Text="Password" />
-                        <PasswordBox Password="{Binding UserTemplate.Password, Mode=TwoWay}" />
-                        <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
-                            <TextBlock VerticalAlignment="Center" Text="Apartment number:" />
-                            <TextBox Margin="10,0,40,0" Text="{Binding UserTemplate.ApartmentId, Mode=TwoWay}" />
-                            <CheckBox Content="Board member" IsChecked="{Binding UserTemplate.IsBm}" />
-                        </StackPanel>
-                        <TextBlock Margin="0,5,0,1" Text=" First name" />
-                        <TextBox Text="{Binding UserTemplate.FirstName, Mode=TwoWay}" />
-                        <TextBlock Margin="0,5,0,1" Text="Last Name" />
-                        <TextBox Text="{Binding UserTemplate.LastName, Mode=TwoWay}" />
-                        <TextBlock Margin="0,5,0,1" Text="Birth date" />
-                        <DatePicker HorizontalAlignment="Stretch" Date="{Binding UserTemplate.BirthDate, Mode=TwoWay}" />
-                        <TextBlock Margin="0,5,0,1" Text="Email address" />
-                        <TextBox Text="{Binding UserTemplate.Email, Mode=TwoWay}" />
-                        <TextBlock Margin="0,5,0,1" Text="Phone number" />
-                        <TextBox Text="{Binding UserTemplate.Phone, Mode=TwoWay}" />
-                        <TextBlock Margin="0,5,0,1" Text="Move-in date" />
-                        <DatePicker HorizontalAlignment="Stretch" Date="{Binding UserTemplate.MoveInDate, Mode=TwoWay}" />
-                    </StackPanel>
-                </ScrollViewer>
-                <StackPanel
-                    Grid.Row="1"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Orientation="Horizontal">
-                    <Button
-                        Width="125"
-                        Margin="0"
-                        Command="{Binding CreateUserCommand}"
-                        Content="Create" />
-                    <Button
-                        Width="125"
-                        Margin="10,0"
-                        Command="{Binding DeleteUserCommand}"
-                        Content="Delete" />
-                    <Button
-                        Width="125"
-                        Margin="0"
-                        Command="{Binding UpdateUserCommand}"
-                        Content="Update" />
-                </StackPanel>
-            </Grid>
-        </Grid>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmUsersPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BmUsersPage.xaml.cs
deleted file mode 100644
index de51f22..0000000
--- a/ApartmentManager/ApartmentManager/View/BmUsersPage.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class BmUsersPage : Page
-    {
-        public BmUsersPage()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml
new file mode 100644
index 0000000..78907a0
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml	
@@ -0,0 +1,134 @@
+<Page
+    x:Class="ApartmentManager.View.BmApartmentsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <Style x:Key="ListItemStyle" TargetType="ListViewItem">
+            <Setter Property="Background" Value="White" />
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="Margin" Value="12,12,12,0" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="BorderBrush" Value="#DFE0E4" />
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListViewItem">
+                        <ListViewItemPresenter />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+            <Setter Property="Margin" Value="0,0,0,10" />
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+        <Style x:Key="ActionButtonStyle" TargetType="Button">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Height" Value="40" />
+            <Setter Property="Width" Value="40" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+        </Style>
+    </Page.Resources>
+    <Page.DataContext>
+        <vm:BmApartmentsViewModel />
+    </Page.DataContext>
+    <Page.BottomAppBar>
+        <CommandBar>
+            <CommandBar.Content>
+                <Grid />
+            </CommandBar.Content>
+            <AppBarButton
+                Click="GoToCreateApartmentPage"
+                Command="{Binding ClearApartmentTemplateCommand}"
+                Icon="Add"
+                Label="Create Apartment">
+                <AppBarButton.DataContext>
+                    <vm:BmApartmentsViewModel />
+                </AppBarButton.DataContext>
+            </AppBarButton>
+        </CommandBar>
+    </Page.BottomAppBar>
+    <Grid Background="#E9EBEE">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <StackPanel Background="{StaticResource AppBarBackgroundThemeBrush}" Orientation="Horizontal">
+            <TextBlock
+                Margin="40,0,10,0"
+                VerticalAlignment="Center"
+                Text="Floor: " />
+            <ComboBox
+                VerticalAlignment="Center"
+                ItemsSource="{Binding FloorNumbers}"
+                SelectedItem="{Binding SelectedFloor, Mode=TwoWay}" />
+            <TextBlock
+                Margin="10,0"
+                VerticalAlignment="Center"
+                Text="Apartment number: " />
+            <TextBox Height="32" />
+        </StackPanel>
+        <ListView
+            x:Name="ApartmentsList"
+            Grid.Row="1"
+            ItemsSource="{Binding BmSingleton.Apartments}"
+            SelectedItem="{Binding ApartmentTemplate, Mode=TwoWay}">
+            <ListView.ItemContainerStyle>
+                <Style BasedOn="{StaticResource ListItemStyle}" TargetType="ListViewItem" />
+            </ListView.ItemContainerStyle>
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="50px" />
+                            </Grid.ColumnDefinitions>
+                            <StackPanel Padding="10">
+                                <TextBlock><Run Text="Apartment number: " /><Run Text="{Binding ApartmentId}" /></TextBlock>
+                                <TextBlock><Run Text="Floor: " /><Run Text="{Binding Floor}" /></TextBlock>
+                                <TextBlock><Run Text="Address: " /><Run Text="{Binding Address}" /></TextBlock>
+                            </StackPanel>
+                            <Button
+                                Grid.Column="1"
+                                Click="SelectItem"
+                                Command="{Binding DeleteApartmentCommand}"
+                                DataContext="{Binding ElementName=ApartmentsList, Path=DataContext}"
+                                Style="{StaticResource ActionButtonStyle}">
+                                <SymbolIcon Symbol="Clear" ToolTipService.ToolTip="Delete" />
+                            </Button>
+                            <Button
+                                Grid.Column="1"
+                                Margin="0,40,0,0"
+                                Click="SelectItem"
+                                DataContext="{Binding ElementName=ApartmentsList, Path=DataContext}"
+                                Style="{StaticResource ActionButtonStyle}">
+                                <SymbolIcon Symbol="Edit" ToolTipService.ToolTip="Edit" />
+
+                                <interactivity:Interaction.Behaviors>
+                                    <core:EventTriggerBehavior EventName="Click">
+                                        <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmEditApartmentPage" />
+                                    </core:EventTriggerBehavior>
+                                </interactivity:Interaction.Behaviors>
+                            </Button>
+                        </Grid>
+                    </Grid>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml.cs
new file mode 100644
index 0000000..d7d67e6
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml.cs	
@@ -0,0 +1,29 @@
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// Page for managing apartments.
+    /// </summary>
+    public sealed partial class BmApartmentsPage : Page
+    {
+        public BmApartmentsPage()
+        {
+            InitializeComponent();
+        }
+
+        private void SelectItem(object sender, RoutedEventArgs e)
+        {
+            var item = ((Grid)((Button)sender).Parent).DataContext;
+            var container = (ListViewItem)ApartmentsList.ContainerFromItem(item);
+
+            container.IsSelected = true;
+        }
+
+        private void GoToCreateApartmentPage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(BmCreateApartmentPage));
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml
new file mode 100644
index 0000000..b0e9a45
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml	
@@ -0,0 +1,146 @@
+<Page
+    x:Class="ApartmentManager.View.BmChangesPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <Style x:Key="ListItemStyle" TargetType="ListViewItem">
+            <Setter Property="Background" Value="White" />
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="Margin" Value="12,12,12,0" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="BorderBrush" Value="#DFE0E4" />
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListViewItem">
+                        <ListViewItemPresenter />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+            <Setter Property="Margin" Value="0,0,0,10" />
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+        <Style x:Key="ActionButtonStyle" TargetType="Button">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Height" Value="40" />
+            <Setter Property="Width" Value="40" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+        </Style>
+    </Page.Resources>
+    <Page.DataContext>
+        <vm:BmChangesViewModel />
+    </Page.DataContext>
+    <Page.BottomAppBar>
+        <CommandBar>
+            <CommandBar.Content>
+                <Grid />
+            </CommandBar.Content>
+            <AppBarButton
+                Click="GoToCreateChangePage"
+                Command="{Binding ClearChangeTemplateCommand}"
+                Icon="Add"
+                Label="Create Apartment">
+                <AppBarButton.DataContext>
+                    <vm:BmChangesViewModel />
+                </AppBarButton.DataContext>
+            </AppBarButton>
+        </CommandBar>
+    </Page.BottomAppBar>
+    <Grid Background="#E9EBEE">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <StackPanel Background="{StaticResource AppBarBackgroundThemeBrush}" Orientation="Horizontal">
+            <TextBlock
+                Margin="40,0,10,0"
+                VerticalAlignment="Center"
+                Text="Change ID: " />
+            <TextBox Height="32" />
+            <TextBlock
+                Margin="10,0"
+                VerticalAlignment="Center"
+                Text="Apartment number: " />
+            <TextBox Height="32" />
+        </StackPanel>
+        <ListView
+            x:Name="ChangesList"
+            Grid.Row="1"
+            ItemsSource="{Binding BmSingleton.Changes}"
+            SelectedItem="{Binding ChangeTemplate, Mode=TwoWay}">
+            <ListView.ItemContainerStyle>
+                <Style BasedOn="{StaticResource ListItemStyle}" TargetType="ListViewItem" />
+            </ListView.ItemContainerStyle>
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="150" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="50px" />
+                        </Grid.ColumnDefinitions>
+                        <Image
+                            Margin="5"
+                            Source="{Binding Documents[0].Document}"
+                            Stretch="Fill" />
+                        <StackPanel Grid.Column="1" Padding="10">
+                            <TextBlock><Run Text="Change ID: " /><Run Text="{Binding ChangeId}" /></TextBlock>
+                            <TextBlock><Run Text="Apartment number: " /><Run Text="{Binding ApartmentId}" /></TextBlock>
+                            <TextBlock><Run Text="Name: " /><Run Text="{Binding Name}" /></TextBlock>
+                            <TextBlock><Run Text="Status: " /><Run Text="{Binding Status}" /></TextBlock>
+                            <TextBlock><Run Text="Upload date: " /><Run Text="{Binding UploadDate.Day}" /><Run Text="." /><Run Text="{Binding UploadDate.Month}" /><Run Text="." /><Run Text="{Binding UploadDate.Year}" /></TextBlock>
+                        </StackPanel>
+                        <Button
+                            Grid.Column="2"
+                            Click="SelectItem"
+                            Command="{Binding DeleteChangeCommand}"
+                            DataContext="{Binding ElementName=ChangesList, Path=DataContext}"
+                            Style="{StaticResource ActionButtonStyle}">
+                            <SymbolIcon Symbol="Clear" ToolTipService.ToolTip="Delete" />
+                        </Button>
+                        <Button
+                            Grid.Column="2"
+                            Margin="0,40,0,0"
+                            Click="SelectItem"
+                            DataContext="{Binding ElementName=ChangesList, Path=DataContext}"
+                            Style="{StaticResource ActionButtonStyle}">
+                            <SymbolIcon Symbol="Edit" ToolTipService.ToolTip="Edit" />
+
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmEditChangePage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                        <Button
+                            Grid.Column="2"
+                            Margin="0,80,0,0"
+                            Click="SelectItem"
+                            DataContext="{Binding ElementName=ChangesList, Path=DataContext}"
+                            Style="{StaticResource ActionButtonStyle}">
+                            <SymbolIcon Symbol="View" ToolTipService.ToolTip="View" />
+
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmSingleChangePage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                    </Grid>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml.cs
new file mode 100644
index 0000000..a63f85c
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml.cs	
@@ -0,0 +1,29 @@
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// Page for managing apartment changes.
+    /// </summary>
+    public sealed partial class BmChangesPage : Page
+    {
+        public BmChangesPage()
+        {
+            InitializeComponent();
+        }
+
+        private void SelectItem(object sender, RoutedEventArgs e)
+        {
+            var item = ((Grid)((Button)sender).Parent).DataContext;
+            var container = (ListViewItem)ChangesList.ContainerFromItem(item);
+
+            container.IsSelected = true;
+        }
+
+        private void GoToCreateChangePage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(BmCreateChangePage));
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml
new file mode 100644
index 0000000..3c63754
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml	
@@ -0,0 +1,87 @@
+<Page
+    x:Class="ApartmentManager.View.BmCreateApartmentPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <vm:BmApartmentsViewModel />
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="600" />
+                <ColumnDefinition Width="300" />
+            </Grid.ColumnDefinitions>
+            <Button
+                Margin="0,20,20,0"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                Command="{Binding UploadApartmentPlanCommand}"
+                Content="Add plan" />
+            <Image
+                Margin="20,80"
+                VerticalAlignment="Top"
+                Source="{Binding ApartmentTemplate.PlanPicture}" />
+            <StackPanel
+                Grid.Column="1"
+                Margin="20,0,0,0"
+                VerticalAlignment="Top"
+                Orientation="Vertical">
+                <TextBlock
+                    Margin="0,10,0,10"
+                    HorizontalAlignment="Center"
+                    FontSize="20"
+                    FontWeight="Bold"
+                    Text="Apartment information:" />
+                <TextBlock Margin="0,10,0,10" Text="Apartment number:" />
+                <TextBox Text="{Binding ApartmentTemplate.ApartmentId, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Square meters:" />
+                <TextBox Text="{Binding ApartmentTemplate.Size, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Number of rooms:" />
+                <TextBox Text="{Binding ApartmentTemplate.NumberOfRooms, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Monthly charge:" />
+                <TextBox Text="{Binding ApartmentTemplate.MonthlyCharge, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Floor:" />
+                <TextBox Text="{Binding ApartmentTemplate.Floor, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Address:" />
+                <TextBox Text="{Binding ApartmentTemplate.Address, Mode=TwoWay}" />
+                <StackPanel
+                    Width="150"
+                    Margin="0,20,0,0"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
+                    <Button
+                        Margin="0,0,20,0"
+                        HorizontalAlignment="Right"
+                        Content="Go back">
+                        <interactivity:Interaction.Behaviors>
+                            <core:EventTriggerBehavior EventName="Click">
+                                <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmApartmentsPage" />
+                            </core:EventTriggerBehavior>
+                        </interactivity:Interaction.Behaviors>
+                    </Button>
+                    <Button
+                        HorizontalAlignment="Right"
+                        Background="#FF274CCD"
+                        Command="{Binding CreateApartmentCommand}"
+                        Content="Add"
+                        Foreground="White">
+                        <interactivity:Interaction.Behaviors>
+                            <core:EventTriggerBehavior EventName="Click">
+                                <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmApartmentsPage" />
+                            </core:EventTriggerBehavior>
+                        </interactivity:Interaction.Behaviors>
+                    </Button>
+                </StackPanel>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml.cs
new file mode 100644
index 0000000..41c3f67
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml.cs	
@@ -0,0 +1,15 @@
+using Windows.UI.Xaml.Controls;
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// Page for adding new apartment.
+    /// </summary>
+    public sealed partial class BmCreateApartmentPage : Page
+    {
+        public BmCreateApartmentPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml
new file mode 100644
index 0000000..e2e19cd
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml	
@@ -0,0 +1,97 @@
+<Page
+    x:Class="ApartmentManager.View.BmCreateChangePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <vm:BmChangesViewModel />
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
+            <TextBlock
+                Margin="0,10,0,10"
+                HorizontalAlignment="Center"
+                FontSize="20"
+                FontWeight="Bold"
+                Text="Apartment change information" />
+            <StackPanel Orientation="Horizontal">
+                <StackPanel Margin="0,5,30,0">
+                    <ListView
+                        Width="500"
+                        Height="534"
+                        ItemsSource="{Binding ChangeTemplate.Documents, Mode=TwoWay}"
+                        SelectedItem="{Binding SelectedChangeDocument, Mode=TwoWay}">
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Image
+                                    Width="400"
+                                    Margin="10"
+                                    Source="{Binding Document}" />
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                    <StackPanel Margin="10" Orientation="Horizontal">
+                        <Button
+                            Margin="30,0,0,0"
+                            Command="{Binding UploadChangeDocumentCommand}"
+                            Content="Upload document" />
+                        <Button
+                            Margin="170,0,0,0"
+                            Command="{Binding DeleteChangeDocumentCommand}"
+                            Content="Delete document" />
+                    </StackPanel>
+                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
+                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
+                </StackPanel>
+                <StackPanel Width="400" Margin="0,0,50,0">
+                    <TextBlock Margin="0,10,0,10" Text="Name" />
+                    <TextBox Text="{Binding ChangeTemplate.Name, Mode=TwoWay}" />
+                    <TextBlock Margin="0,10,0,10" Text="Apartment number" />
+                    <TextBox Text="{Binding ChangeTemplate.ApartmentId, Mode=TwoWay}" />
+                    <TextBlock Margin="0,10,0,10" Text="Description" />
+                    <TextBox
+                        Height="345"
+                        Text="{Binding ChangeTemplate.Description, Mode=TwoWay}"
+                        TextWrapping="Wrap" />
+                    <StackPanel
+                        Margin="0,20,0,0"
+                        HorizontalAlignment="Right"
+                        Orientation="Horizontal">
+                        <Button
+                            Margin="0,0,20,0"
+                            HorizontalAlignment="Right"
+                            Content="Go back">
+
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmChangesPage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                        <Button
+                            HorizontalAlignment="Right"
+                            Background="#FF274CCD"
+                            Command="{Binding CreateChangeCommand}"
+                            Content="Add"
+                            Foreground="White">
+
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmChangesPage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                    </StackPanel>
+                </StackPanel>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml.cs
new file mode 100644
index 0000000..054bca6
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml.cs	
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class BmCreateChangePage : Page
+    {
+        public BmCreateChangePage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml
new file mode 100644
index 0000000..e667583
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml	
@@ -0,0 +1,97 @@
+<Page
+    x:Class="ApartmentManager.View.BmCreateDefectPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <vm:BmDefectsViewModel />
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
+            <TextBlock
+                Margin="0,10,0,10"
+                HorizontalAlignment="Center"
+                FontSize="20"
+                FontWeight="Bold"
+                Text="Defect Information" />
+            <StackPanel Orientation="Horizontal">
+                <StackPanel Margin="0,5,30,0">
+                    <ListView
+                        Width="500"
+                        Height="534"
+                        ItemsSource="{Binding DefectTemplate.Pictures, Mode=TwoWay}"
+                        SelectedItem="{Binding SelectedDefectPicture, Mode=TwoWay}">
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Image
+                                    Width="400"
+                                    Margin="10"
+                                    Source="{Binding Picture}" />
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                    <StackPanel Margin="10" Orientation="Horizontal">
+                        <Button
+                            Margin="30,0,0,0"
+                            Command="{Binding UploadDefectPictureCommand}"
+                            Content="Upload Picture" />
+                        <Button
+                            Margin="170,0,0,0"
+                            Command="{Binding DeleteDefectPictureCommand}"
+                            Content="Delete Picture" />
+                    </StackPanel>
+                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
+                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
+                </StackPanel>
+                <StackPanel Width="400" Margin="0,0,50,0">
+                    <TextBlock Margin="0,10,0,10" Text="Name" />
+                    <TextBox Text="{Binding DefectTemplate.Name, Mode=TwoWay}" />
+                    <TextBlock Margin="0,10,0,10" Text="Apartment number" />
+                    <TextBox Text="{Binding DefectTemplate.ApartmentId, Mode=TwoWay}" />
+                    <TextBlock Margin="0,10,0,10" Text="Description" />
+                    <TextBox
+                        Height="345"
+                        Text="{Binding DefectTemplate.Description, Mode=TwoWay}"
+                        TextWrapping="Wrap" />
+                    <StackPanel
+                        Margin="0,20,0,0"
+                        HorizontalAlignment="Right"
+                        Orientation="Horizontal">
+                        <Button
+                            Margin="0,0,20,0"
+                            HorizontalAlignment="Right"
+                            Content="Go back">
+
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmDefectsPage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                        <Button
+                            HorizontalAlignment="Right"
+                            Background="#FF274CCD"
+                            Command="{Binding CreateDefectCommand}"
+                            Content="Add"
+                            Foreground="White">
+
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmDefectsPage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                    </StackPanel>
+                </StackPanel>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml.cs
new file mode 100644
index 0000000..62fc8d2
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml.cs	
@@ -0,0 +1,15 @@
+using Windows.UI.Xaml.Controls;
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// Page for creating new defect.
+    /// </summary>
+    public sealed partial class BmCreateDefectPage : Page
+    {
+        public BmCreateDefectPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml
new file mode 100644
index 0000000..b6c9759
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml	
@@ -0,0 +1,150 @@
+<Page
+    x:Class="ApartmentManager.View.BmDefectsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <Style x:Key="ListItemStyle" TargetType="ListViewItem">
+            <Setter Property="Background" Value="White" />
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="Margin" Value="12,12,12,0" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="BorderBrush" Value="#DFE0E4" />
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListViewItem">
+                        <ListViewItemPresenter />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+            <Setter Property="Margin" Value="0,0,0,10" />
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+        <Style x:Key="ActionButtonStyle" TargetType="Button">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Height" Value="40" />
+            <Setter Property="Width" Value="40" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+        </Style>
+    </Page.Resources>
+    
+    <Page.DataContext>
+        <vm:BmDefectsViewModel />
+    </Page.DataContext>
+    
+    <Page.BottomAppBar>
+        <CommandBar>
+            <CommandBar.Content>
+                <Grid />
+            </CommandBar.Content>
+            <AppBarButton
+                Click="GoToCreateDefectPage"
+                Command="{Binding ClearDefectTemplateCommand}"
+                Icon="Add"
+                Label="Create Apartment">
+                <AppBarButton.DataContext>
+                    <vm:BmDefectsViewModel />
+                </AppBarButton.DataContext>
+            </AppBarButton>
+        </CommandBar>
+    </Page.BottomAppBar>
+    
+    <Grid Background="#E9EBEE">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <StackPanel Background="{StaticResource AppBarBackgroundThemeBrush}" Orientation="Horizontal">
+            <TextBlock
+                Margin="40,0,10,0"
+                VerticalAlignment="Center"
+                Text="Defect ID: " />
+            <TextBox Height="32" />
+            <TextBlock
+                Margin="10,0"
+                VerticalAlignment="Center"
+                Text="Apartment number: " />
+            <TextBox Height="32" />
+        </StackPanel>
+        
+        <ListView
+            x:Name="DefectsList"
+            Grid.Row="1"
+            ItemsSource="{Binding BmSingleton.Defects}"
+            SelectedItem="{Binding DefectTemplate, Mode=TwoWay}">
+            <ListView.ItemContainerStyle>
+                <Style BasedOn="{StaticResource ListItemStyle}" TargetType="ListViewItem" />
+            </ListView.ItemContainerStyle>
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="150" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="50px" />
+                        </Grid.ColumnDefinitions>
+                        <Image
+                            Margin="5"
+                            Source="{Binding Pictures[0].Picture}"
+                            Stretch="Fill" />
+                        <StackPanel Grid.Column="1" Padding="10">
+                            <TextBlock><Run Text="Defect ID: " /><Run Text="{Binding DefectId}" /></TextBlock>
+                            <TextBlock><Run Text="Apartment number: " /><Run Text="{Binding ApartmentId}" /></TextBlock>
+                            <TextBlock><Run Text="Name: " /><Run Text="{Binding Name}" /></TextBlock>
+                            <TextBlock><Run Text="Status: " /><Run Text="{Binding Status}" /></TextBlock>
+                            <TextBlock><Run Text="Upload date: " /><Run Text="{Binding UploadDate.Day}" /><Run Text="." /><Run Text="{Binding UploadDate.Month}" /><Run Text="." /><Run Text="{Binding UploadDate.Year}" /></TextBlock>
+                        </StackPanel>
+                        <Button
+                            Grid.Column="2"
+                            Click="SelectItem"
+                            Command="{Binding DeleteDefectCommand}"
+                            DataContext="{Binding ElementName=DefectsList, Path=DataContext}"
+                            Style="{StaticResource ActionButtonStyle}">
+                            <SymbolIcon Symbol="Clear" ToolTipService.ToolTip="Delete" />
+                        </Button>
+                        <Button
+                            Grid.Column="2"
+                            Margin="0,40,0,0"
+                            Click="SelectItem"
+                            DataContext="{Binding ElementName=DefectsList, Path=DataContext}"
+                            Style="{StaticResource ActionButtonStyle}">
+                            <SymbolIcon Symbol="Edit" ToolTipService.ToolTip="Edit" />
+
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmEditDefectPage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                        <Button
+                            Grid.Column="2"
+                            Margin="0,80,0,0"
+                            Click="SelectItem"
+                            DataContext="{Binding ElementName=DefectsList, Path=DataContext}"
+                            Style="{StaticResource ActionButtonStyle}">
+                            <SymbolIcon Symbol="View" ToolTipService.ToolTip="View" />
+
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmSingleDefectPage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                    </Grid>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml.cs
new file mode 100644
index 0000000..8b38af0
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml.cs	
@@ -0,0 +1,29 @@
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// Page for managing defects.
+    /// </summary>
+    public sealed partial class BmDefectsPage : Page
+    {
+        public BmDefectsPage()
+        {
+            InitializeComponent();
+        }
+
+        private void SelectItem(object sender, RoutedEventArgs e)
+        {
+            var item = ((Grid)((Button)sender).Parent).DataContext;
+            var container = (ListViewItem)DefectsList.ContainerFromItem(item);
+
+            container.IsSelected = true;
+        }
+
+        private void GoToCreateDefectPage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(BmCreateDefectPage));
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml
new file mode 100644
index 0000000..46ea641
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml	
@@ -0,0 +1,87 @@
+<Page
+    x:Class="ApartmentManager.View.BmEditApartmentPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+    <Page.DataContext>
+        <vm:BmApartmentsViewModel />
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="600" />
+                <ColumnDefinition Width="300" />
+            </Grid.ColumnDefinitions>
+            <Button
+                Margin="0,20,20,0"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                Command="{Binding UploadApartmentPlanCommand}"
+                Content="Add plan" />
+            <Image
+                Margin="20,80"
+                VerticalAlignment="Top"
+                Source="{Binding ApartmentTemplate.PlanPicture}" />
+            <StackPanel
+                Grid.Column="1"
+                Margin="20,0,0,0"
+                VerticalAlignment="Top"
+                Orientation="Vertical">
+                <TextBlock
+                    Margin="0,10,0,10"
+                    HorizontalAlignment="Center"
+                    FontSize="20"
+                    FontWeight="Bold"
+                    Text="Apartment information:" />
+                <TextBlock Margin="0,10,0,10" Text="Apartment number:" />
+                <TextBox Text="{Binding ApartmentTemplate.ApartmentId, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Square meters:" />
+                <TextBox Text="{Binding ApartmentTemplate.Size, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Number of rooms:" />
+                <TextBox Text="{Binding ApartmentTemplate.NumberOfRooms, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Monthly charge:" />
+                <TextBox Text="{Binding ApartmentTemplate.MonthlyCharge, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Floor:" />
+                <TextBox Text="{Binding ApartmentTemplate.Floor, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Address:" />
+                <TextBox Text="{Binding ApartmentTemplate.Address, Mode=TwoWay}" />
+                <StackPanel
+                    Width="170"
+                    Margin="0,20,0,0"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal">
+                    <Button
+                        Margin="0,0,20,0"
+                        HorizontalAlignment="Right"
+                        Command="{Binding GetApartmentsCommand}"
+                        Content="Go back">
+                        <interactivity:Interaction.Behaviors>
+                            <core:EventTriggerBehavior EventName="Click">
+                                <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmApartmentsPage" />
+                            </core:EventTriggerBehavior>
+                        </interactivity:Interaction.Behaviors>
+                    </Button>
+                    <Button
+                        HorizontalAlignment="Right"
+                        Background="#FF274CCD"
+                        Command="{Binding UpdateApartmentCommand}"
+                        Content="Update"
+                        Foreground="White">
+                        <interactivity:Interaction.Behaviors>
+                            <core:EventTriggerBehavior EventName="Click">
+                                <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmApartmentsPage" />
+                            </core:EventTriggerBehavior>
+                        </interactivity:Interaction.Behaviors>
+                    </Button>
+                </StackPanel>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml.cs
new file mode 100644
index 0000000..63e71eb
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml.cs	
@@ -0,0 +1,15 @@
+using Windows.UI.Xaml.Controls;
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// Page for editing apartment.
+    /// </summary>
+    public sealed partial class BmEditApartmentPage : Page
+    {
+        public BmEditApartmentPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml
new file mode 100644
index 0000000..6d8518a
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml	
@@ -0,0 +1,108 @@
+<Page
+    x:Class="ApartmentManager.View.BmEditChangePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <vm:BmChangesViewModel />
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
+            <TextBlock
+                Margin="0,10,0,10"
+                HorizontalAlignment="Center"
+                FontSize="20"
+                FontWeight="Bold"
+                Text="Apartment change information" />
+            <StackPanel Orientation="Horizontal">
+                <StackPanel Margin="0,5,30,0">
+                    <ListView
+                        Width="500"
+                        Height="534"
+                        ItemsSource="{Binding ChangeTemplate.Documents, Mode=TwoWay}"
+                        SelectedItem="{Binding SelectedChangeDocument, Mode=TwoWay}">
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Image
+                                    Width="400"
+                                    Margin="10"
+                                    Source="{Binding Document}" />
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                    <StackPanel Margin="10" Orientation="Horizontal">
+                        <Button
+                            Margin="30,0,0,0"
+                            Command="{Binding UploadChangeDocumentCommand}"
+                            Content="Upload Picture" />
+                        <Button
+                            Margin="170,0,0,0"
+                            Command="{Binding DeleteChangeDocumentTempCommand}"
+                            Content="Delete Picture" />
+                    </StackPanel>
+                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
+                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
+                </StackPanel>
+                <StackPanel Width="400" Margin="0,0,50,0">
+                    <TextBlock Margin="0,10,0,10" Text="Name" />
+                    <TextBox Text="{Binding ChangeTemplate.Name, Mode=TwoWay}" />
+                    <StackPanel Margin="0,10,0,10" Orientation="Horizontal">
+                        <TextBlock
+                            Margin="0,0,10,0"
+                            VerticalAlignment="Center"
+                            Text="Apartment number" />
+                        <TextBox Text="{Binding ChangeTemplate.ApartmentId, Mode=TwoWay}" />
+                        <TextBlock
+                            Margin="20,0,10,0"
+                            VerticalAlignment="Center"
+                            Text="Status" />
+                        <TextBox Width="128" Text="{Binding ChangeTemplate.Status, Mode=TwoWay}" />
+                    </StackPanel>
+                    <TextBlock Margin="0,0,0,10" Text="Description" />
+                    <TextBox
+                        Height="375"
+                        Text="{Binding ChangeTemplate.Description, Mode=TwoWay}"
+                        TextWrapping="Wrap" />
+                    <StackPanel
+                        Margin="0,20,0,0"
+                        HorizontalAlignment="Right"
+                        Orientation="Horizontal">
+                        <Button
+                            Margin="0,0,20,0"
+                            HorizontalAlignment="Right"
+                            Command="{Binding GetChangesCommand}"
+                            Content="Go back">
+
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmChangesPage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                        <Button
+                            HorizontalAlignment="Right"
+                            Background="#FF274CCD"
+                            Command="{Binding UpdateChangeCommand}"
+                            Content="Update"
+                            Foreground="White">
+
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmChangesPage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                    </StackPanel>
+                </StackPanel>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Page>
\ No newline at end of file
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml.cs
new file mode 100644
index 0000000..715f47e
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml.cs	
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class BmEditChangePage : Page
+    {
+        public BmEditChangePage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml
new file mode 100644
index 0000000..5089904
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml	
@@ -0,0 +1,108 @@
+<Page
+    x:Class="ApartmentManager.View.BmEditDefectPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <vm:BmDefectsViewModel />
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
+            <TextBlock
+                Margin="0,10,0,10"
+                HorizontalAlignment="Center"
+                FontSize="20"
+                FontWeight="Bold"
+                Text="Defect Information" />
+            <StackPanel Orientation="Horizontal">
+                <StackPanel Margin="0,5,30,0">
+                    <ListView
+                        Width="500"
+                        Height="534"
+                        ItemsSource="{Binding DefectTemplate.Pictures, Mode=TwoWay}"
+                        SelectedItem="{Binding SelectedDefectPicture, Mode=TwoWay}">
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Image
+                                    Width="400"
+                                    Margin="10"
+                                    Source="{Binding Picture}" />
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                    <StackPanel Margin="10" Orientation="Horizontal">
+                        <Button
+                            Margin="30,0,0,0"
+                            Command="{Binding UploadDefectPictureCommand}"
+                            Content="Upload Picture" />
+                        <Button
+                            Margin="170,0,0,0"
+                            Command="{Binding DeleteDefectPictureTempCommand}"
+                            Content="Delete Picture" />
+                    </StackPanel>
+                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
+                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
+                </StackPanel>
+                <StackPanel Width="400" Margin="0,0,50,0">
+                    <TextBlock Margin="0,10,0,10" Text="Name" />
+                    <TextBox Text="{Binding DefectTemplate.Name, Mode=TwoWay}" />
+                    <StackPanel Margin="0,10,0,10" Orientation="Horizontal">
+                        <TextBlock
+                            Margin="0,0,10,0"
+                            VerticalAlignment="Center"
+                            Text="Apartment number" />
+                        <TextBox Text="{Binding DefectTemplate.ApartmentId, Mode=TwoWay}" />
+                        <TextBlock
+                            Margin="20,0,10,0"
+                            VerticalAlignment="Center"
+                            Text="Status" />
+                        <TextBox Width="128" Text="{Binding DefectTemplate.Status, Mode=TwoWay}" />
+                    </StackPanel>
+                    <TextBlock Margin="0,0,0,10" Text="Description" />
+                    <TextBox
+                        Height="375"
+                        Text="{Binding DefectTemplate.Description, Mode=TwoWay}"
+                        TextWrapping="Wrap" />
+                    <StackPanel
+                        Margin="0,20,0,0"
+                        HorizontalAlignment="Right"
+                        Orientation="Horizontal">
+                        <Button
+                            Margin="0,0,20,0"
+                            HorizontalAlignment="Right"
+                            Command="{Binding GetDefectsCommand}"
+                            Content="Go back">
+
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmDefectsPage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                        <Button
+                            HorizontalAlignment="Right"
+                            Background="#FF274CCD"
+                            Command="{Binding UpdateDefectCommand}"
+                            Content="Update"
+                            Foreground="White">
+
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmDefectsPage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                    </StackPanel>
+                </StackPanel>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml.cs
new file mode 100644
index 0000000..edba09e
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml.cs	
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class BmEditDefectPage : Page
+    {
+        public BmEditDefectPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml
new file mode 100644
index 0000000..e812cc0
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml	
@@ -0,0 +1,134 @@
+<Page
+    x:Class="ApartmentManager.View.BmMainPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <TextBlock
+            Margin="80,30,0,0"
+            FontSize="36"
+            Text="Welcome, board member!" />
+        <Grid Margin="100,100,0,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="600" />
+                <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="200" />
+            </Grid.ColumnDefinitions>
+            <Image
+                Grid.Column="0"
+                VerticalAlignment="Top"
+                Source="ms-appx:///Assets/Ostbanehus.jpg" />
+            <StackPanel Grid.Column="1" Margin="20,0,0,0">
+                <TextBlock
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    FontSize="20"
+                    Text="Manage all:" />
+                <Button
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    Content="Apartments">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmApartmentsPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </Button>
+                <Button
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    Content="Contract owners">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmUsersPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </Button>
+                <Button
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    Content="Residents">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmResidentsPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </Button>
+                <Button
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    Content="Defects">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmDefectsPage" />
+                        </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.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>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml.cs
new file mode 100644
index 0000000..5d287f1
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml.cs	
@@ -0,0 +1,16 @@
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// Main page for board members.
+    /// </summary>
+    public sealed partial class BmMainPage : Page
+    {
+        public BmMainPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml
new file mode 100644
index 0000000..332ef2a
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml	
@@ -0,0 +1,167 @@
+<Page
+    x:Class="ApartmentManager.View.BmResidentsPage"
+    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:local="using:ApartmentManager.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <Style x:Key="ListItemStyle" TargetType="ListViewItem">
+            <Setter Property="Background" Value="White" />
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="Margin" Value="12,12,12,0" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="BorderBrush" Value="#DFE0E4" />
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListViewItem">
+                        <ListViewItemPresenter />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+            <Setter Property="Margin" Value="0,0,0,10" />
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+        <Style x:Key="ActionButtonStyle" TargetType="Button">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Height" Value="40" />
+            <Setter Property="Width" Value="40" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+        </Style>
+    </Page.Resources>
+
+    <Page.DataContext>
+        <vm:BmResidentsViewModel />
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="50" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition Width="450" />
+            </Grid.ColumnDefinitions>
+
+            <Grid Background="#E9EBEE">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock
+                        Margin="50,0,10,0"
+                        VerticalAlignment="Center"
+                        FontSize="18"
+                        Text="Search: " />
+                    <TextBox Height="32" PlaceholderText="Type search parameters..." />
+                </StackPanel>
+                <AppBarButton
+                    Grid.Column="1"
+                    HorizontalAlignment="Right"
+                    Command="{Binding ClearResidentTemplateCommand}"
+                    Icon="Add" />
+            </Grid>
+            <ListView
+                Grid.Row="1"
+                Padding="10"
+                Background="#E9EBEE"
+                ItemsSource="{Binding BmSingleton.Residents}"
+                SelectedItem="{Binding ResidentTemplate, Mode=TwoWay}">
+
+                <ListView.ItemContainerStyle>
+                    <Style BasedOn="{StaticResource ListItemStyle}" TargetType="ListViewItem" />
+                </ListView.ItemContainerStyle>
+
+                <ListView.ItemTemplate>
+
+                    <DataTemplate>
+                        <Grid Height="150">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="150" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+
+                            <Image
+                                Margin="5"
+                                Source="{Binding Picture}"
+                                Stretch="Fill" />
+
+                            <Grid Grid.Column="1">
+                                <StackPanel Margin="10,0,0,0" VerticalAlignment="Center">
+                                    <TextBlock FontSize="20"><Run Text="Name: " /><Run Text="{Binding FirstName}" /><Run Text=" " /><Run Text="{Binding LastName}" /></TextBlock>
+                                    <TextBlock><Run Text="Apartment number: " /><Run Text="{Binding ApartmentId}" /></TextBlock>
+                                    <TextBlock><Run Text="Birth date: " /><Run Text="{Binding BirthDate.Day}" /><Run Text="." /><Run Text="{Binding BirthDate.Month}" /><Run Text="." /><Run Text="{Binding BirthDate.Year}" /></TextBlock>
+                                    <TextBlock><Run Text="E-mail address: " /><Run Text="{Binding Email}" /></TextBlock>
+                                    <TextBlock><Run Text="Phone number: " /><Run Text="{Binding Phone}" /></TextBlock>
+                                </StackPanel>
+                            </Grid>
+                        </Grid>
+                    </DataTemplate>
+
+                </ListView.ItemTemplate>
+            </ListView>
+            <StackPanel
+                Grid.RowSpan="2"
+                Grid.Column="1"
+                Width="400"
+                HorizontalAlignment="Center">
+                <TextBlock
+                    Margin="0,5,0,10"
+                    HorizontalAlignment="Center"
+                    FontSize="20"
+                    FontWeight="Bold"
+                    Text="Resident Info" />
+                <Image
+                    Width="150"
+                    Height="150"
+                    Source="{Binding ResidentTemplate.Picture, Mode=TwoWay}" />
+                <Button
+                    Margin="0,5,0,0"
+                    HorizontalAlignment="Stretch"
+                    Command="{Binding UploadResidentPhotoCommand}"
+                    Content="Upload Picture" />
+                <TextBlock Margin="0,5,0,1" Text="Apartment number" />
+                <TextBox Text="{Binding ResidentTemplate.ApartmentId, Mode=TwoWay}" />
+                <TextBlock Margin="0,5,0,1" Text=" First name" />
+                <TextBox Text="{Binding ResidentTemplate.FirstName, Mode=TwoWay}" />
+                <TextBlock Margin="0,5,0,1" Text="Last Name" />
+                <TextBox Text="{Binding ResidentTemplate.LastName, Mode=TwoWay}" />
+                <TextBlock Margin="0,5,0,1" Text="Birth date" />
+                <DatePicker HorizontalAlignment="Stretch" Date="{Binding ResidentTemplate.BirthDate, Mode=TwoWay}" />
+                <TextBlock Margin="0,5,0,1" Text="Email address" />
+                <TextBox Text="{Binding ResidentTemplate.Email, Mode=TwoWay}" />
+                <TextBlock Margin="0,5,0,1" Text="Phone number" />
+                <TextBox Text="{Binding ResidentTemplate.Phone, Mode=TwoWay}" />
+
+                <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+                    <Button
+                        Width="125"
+                        Margin="0"
+                        Command="{Binding CreateResidentCommand}"
+                        Content="Create" />
+                    <Button
+                        Width="125"
+                        Margin="10,0"
+                        Command="{Binding DeleteResidentCommand}"
+                        Content="Delete" />
+                    <Button
+                        Width="125"
+                        Margin="0"
+                        Command="{Binding UpdateResidentCommand}"
+                        Content="Update" />
+                </StackPanel>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml.cs
new file mode 100644
index 0000000..2a43996
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml.cs	
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class BmResidentsPage : Page
+    {
+        public BmResidentsPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleChangePage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleChangePage.xaml
new file mode 100644
index 0000000..195095b
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleChangePage.xaml	
@@ -0,0 +1,135 @@
+<Page
+    x:Class="ApartmentManager.View.BmSingleChangePage"
+    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:local="using:ApartmentManager.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <vm:BmChangesViewModel />
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <ScrollViewer>
+            <StackPanel>
+                <StackPanel Margin="10,10,10,0" Orientation="Horizontal">
+                    <TextBlock
+                        Margin="100,0,0,0"
+                        FontSize="30"
+                        FontWeight="Bold"
+                        Text="Name :" />
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="30"
+                        Text="{Binding ChangeTemplate.Name}" />
+                    <TextBlock
+                        Margin="700,0,0,0"
+                        FontSize="30"
+                        FontWeight="Bold"
+                        Text="Status :" />
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="30"
+                        Text="{Binding ChangeTemplate.Status}" />
+                </StackPanel>
+                <StackPanel Margin="20,0,20,20" Orientation="Horizontal">
+                    <StackPanel Width="620" Margin="0,50,0,0">
+                        <GridView
+                            Width="500"
+                            Height="420"
+                            ItemsSource="{Binding ChangeTemplate.Documents, Mode=TwoWay}">
+                            <GridView.ItemTemplate>
+                                <DataTemplate>
+                                    <Image
+                                        Width="220"
+                                        Margin="10,0,10,10"
+                                        Source="{Binding Document}" />
+                                </DataTemplate>
+                            </GridView.ItemTemplate>
+
+                        </GridView>
+                    </StackPanel>
+                    <StackPanel Width="620">
+                        <TextBlock
+                            Margin="10,0,0,10"
+                            FontSize="30"
+                            FontWeight="Bold"
+                            Text="Description" />
+                        <Grid BorderBrush="Black" BorderThickness="1">
+                            <TextBlock
+                                Height="400"
+                                Margin="10"
+                                Text="{Binding ChangeTemplate.Description, Mode=TwoWay}"
+                                TextWrapping="WrapWholeWords" />
+                        </Grid>
+
+
+                    </StackPanel>
+
+
+                </StackPanel>
+                <StackPanel Width="600" Margin="0,20,0,0">
+                    <TextBlock
+                        Margin="10,0,0,10"
+                        FontSize="30"
+                        FontWeight="Bold"
+                        Text="Comments" />
+                    <StackPanel Orientation="Horizontal">
+
+                        <TextBox
+                            Width="500"
+                            Height="80"
+                            Text="{Binding NewChangeComment.Comment, Mode=TwoWay}"
+                            TextWrapping="Wrap" />
+                        <Button
+                            Margin="10,0,0,0"
+                            Command="{Binding CreateChangeCommentCommand}"
+                            Content="Comment" />
+                    </StackPanel>
+
+
+                    <ListView ItemsSource="{Binding ChangeTemplate.Comments}">
+                        <ListView.ItemContainerStyle>
+                            <Style TargetType="ListViewItem">
+                                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                            </Style>
+                        </ListView.ItemContainerStyle>
+
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Grid Margin="10">
+                                    <StackPanel>
+                                        <TextBlock
+                                            Margin="5,0,0,0"
+                                            FontWeight="Bold"
+                                            Text="{Binding Name}" />
+                                        <TextBlock
+                                            Margin="5"
+                                            Text="{Binding Comment}"
+                                            TextWrapping="WrapWholeWords" />
+                                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                                            <TextBlock Margin="0,0,0,5">
+                                                <Run FontWeight="Bold" Text="{Binding Date.Year}" />
+                                                <Run FontWeight="Bold" Text="-" />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Month}" />
+                                                <Run FontWeight="Bold" Text="-" />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Day}" />
+                                                <Run FontWeight="Bold" Text="  " />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Hour}" />
+                                                <Run FontWeight="Bold" Text=":" />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Minute}" />
+                                            </TextBlock>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Grid>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                </StackPanel>
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleChangePage.xaml.cs
new file mode 100644
index 0000000..d4bcc40
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleChangePage.xaml.cs	
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class BmSingleChangePage : Page
+    {
+        public BmSingleChangePage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleDefectPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleDefectPage.xaml
new file mode 100644
index 0000000..2e7a935
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleDefectPage.xaml	
@@ -0,0 +1,135 @@
+<Page
+    x:Class="ApartmentManager.View.BmSingleDefectPage"
+    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:local="using:ApartmentManager.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <vm:BmDefectsViewModel />
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <ScrollViewer>
+            <StackPanel>
+                <StackPanel Margin="10,10,10,0" Orientation="Horizontal">
+                    <TextBlock
+                        Margin="100,0,0,0"
+                        FontSize="30"
+                        FontWeight="Bold"
+                        Text="Name :" />
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="30"
+                        Text="{Binding DefectTemplate.Name}" />
+                    <TextBlock
+                        Margin="700,0,0,0"
+                        FontSize="30"
+                        FontWeight="Bold"
+                        Text="Status :" />
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="30"
+                        Text="{Binding DefectTemplate.Status}" />
+                </StackPanel>
+                <StackPanel Margin="20,0,20,20" Orientation="Horizontal">
+                    <StackPanel Width="620" Margin="0,50,0,0">
+                        <GridView
+                            Width="500"
+                            Height="420"
+                            ItemsSource="{Binding DefectTemplate.Pictures, Mode=TwoWay}">
+                            <GridView.ItemTemplate>
+                                <DataTemplate>
+                                    <Image
+                                        Width="220"
+                                        Margin="10,0,10,10"
+                                        Source="{Binding Picture}" />
+                                </DataTemplate>
+                            </GridView.ItemTemplate>
+
+                        </GridView>
+                    </StackPanel>
+                    <StackPanel Width="620">
+                        <TextBlock
+                            Margin="10,0,0,10"
+                            FontSize="30"
+                            FontWeight="Bold"
+                            Text="Description" />
+                        <Grid BorderBrush="Black" BorderThickness="1">
+                            <TextBlock
+                                Height="400"
+                                Margin="10"
+                                Text="{Binding DefectTemplate.Description, Mode=TwoWay}"
+                                TextWrapping="WrapWholeWords" />
+                        </Grid>
+
+
+                    </StackPanel>
+
+
+                </StackPanel>
+                <StackPanel Width="600" Margin="0,20,0,0">
+                    <TextBlock
+                        Margin="10,0,0,10"
+                        FontSize="30"
+                        FontWeight="Bold"
+                        Text="Comments" />
+                    <StackPanel Orientation="Horizontal">
+
+                        <TextBox
+                            Width="500"
+                            Height="80"
+                            Text="{Binding NewDefectComment.Comment, Mode=TwoWay}"
+                            TextWrapping="Wrap" />
+                        <Button
+                            Margin="10,0,0,0"
+                            Command="{Binding CreateDefectCommentCommand}"
+                            Content="Comment" />
+                    </StackPanel>
+
+
+                    <ListView ItemsSource="{Binding DefectTemplate.Comments}">
+                        <ListView.ItemContainerStyle>
+                            <Style TargetType="ListViewItem">
+                                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                            </Style>
+                        </ListView.ItemContainerStyle>
+
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Grid Margin="10">
+                                    <StackPanel>
+                                        <TextBlock
+                                            Margin="5,0,0,0"
+                                            FontWeight="Bold"
+                                            Text="{Binding Name}" />
+                                        <TextBlock
+                                            Margin="5"
+                                            Text="{Binding Comment}"
+                                            TextWrapping="WrapWholeWords" />
+                                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                                            <TextBlock Margin="0,0,0,5">
+                                                <Run FontWeight="Bold" Text="{Binding Date.Year}" />
+                                                <Run FontWeight="Bold" Text="-" />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Month}" />
+                                                <Run FontWeight="Bold" Text="-" />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Day}" />
+                                                <Run FontWeight="Bold" Text="  " />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Hour}" />
+                                                <Run FontWeight="Bold" Text=":" />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Minute}" />
+                                            </TextBlock>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Grid>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                </StackPanel>
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleDefectPage.xaml.cs
new file mode 100644
index 0000000..340e86a
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmSingleDefectPage.xaml.cs	
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class BmSingleDefectPage : Page
+    {
+        public BmSingleDefectPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmUsersPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmUsersPage.xaml
new file mode 100644
index 0000000..77c60f7
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmUsersPage.xaml	
@@ -0,0 +1,177 @@
+<Page
+    x:Class="ApartmentManager.View.BmUsersPage"
+    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:local="using:ApartmentManager.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <Style x:Key="ListItemStyle" TargetType="ListViewItem">
+            <Setter Property="Background" Value="White" />
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="Margin" Value="12,12,12,0" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="BorderBrush" Value="#DFE0E4" />
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListViewItem">
+                        <ListViewItemPresenter />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+            <Setter Property="Margin" Value="0,0,0,10" />
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+        <Style x:Key="ActionButtonStyle" TargetType="Button">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Height" Value="40" />
+            <Setter Property="Width" Value="40" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+        </Style>
+    </Page.Resources>
+
+    <Page.DataContext>
+        <vm:BmUsersViewModel />
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="50" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition Width="450" />
+            </Grid.ColumnDefinitions>
+
+            <Grid Background="#E9EBEE">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock
+                        Margin="50,0,10,0"
+                        VerticalAlignment="Center"
+                        FontSize="18"
+                        Text="Search: " />
+                    <TextBox Height="32" PlaceholderText="Type search parameters..." />
+                </StackPanel>
+                <AppBarButton
+                    Grid.Column="1"
+                    HorizontalAlignment="Right"
+                    Command="{Binding ClearUserTemplateCommand}"
+                    Icon="Add" />
+            </Grid>
+            <ListView
+                Grid.Row="1"
+                Padding="10"
+                Background="#E9EBEE"
+                ItemsSource="{Binding BmSingleton.Users}"
+                SelectedItem="{Binding UserTemplate, Mode=TwoWay}">
+
+                <ListView.ItemContainerStyle>
+                    <Style BasedOn="{StaticResource ListItemStyle}" TargetType="ListViewItem" />
+                </ListView.ItemContainerStyle>
+
+                <ListView.ItemTemplate>
+
+                    <DataTemplate>
+                        <Grid Height="150">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="150" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+
+                            <Image
+                                Margin="5"
+                                Source="{Binding Picture}"
+                                Stretch="Fill" />
+
+                            <Grid Grid.Column="1">
+                                <StackPanel Margin="10,0,0,0" VerticalAlignment="Center">
+                                    <TextBlock FontSize="20"><Run Text="Name: " /><Run Text="{Binding FirstName}" /><Run Text=" " /><Run Text="{Binding LastName}" /></TextBlock>
+                                    <TextBlock><Run Text="Apartment number: " /><Run Text="{Binding ApartmentId}" /></TextBlock>
+                                    <TextBlock><Run Text="Birth date: " /><Run Text="{Binding BirthDate.Day}" /><Run Text="." /><Run Text="{Binding BirthDate.Month}" /><Run Text="." /><Run Text="{Binding BirthDate.Year}" /></TextBlock>
+                                    <TextBlock><Run Text="E-mail address: " /><Run Text="{Binding Email}" /></TextBlock>
+                                    <TextBlock><Run Text="Phone number: " /><Run Text="{Binding Phone}" /></TextBlock>
+                                </StackPanel>
+                            </Grid>
+                        </Grid>
+                    </DataTemplate>
+
+                </ListView.ItemTemplate>
+            </ListView>
+            <Grid Grid.RowSpan="2" Grid.Column="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition Height="60" />
+                </Grid.RowDefinitions>
+                <ScrollViewer>
+                    <StackPanel Width="400" HorizontalAlignment="Center">
+                        <Image
+                            Width="150"
+                            Height="150"
+                            Source="{Binding UserTemplate.Picture, Mode=TwoWay}" />
+                        <Button
+                            Margin="0,5,0,0"
+                            HorizontalAlignment="Stretch"
+                            Command="{Binding UploadUserPhotoCommand}"
+                            Content="Upload Picture" />
+                        <TextBlock Margin="0,5,0,1" Text="Username" />
+                        <TextBox Text="{Binding UserTemplate.Username, Mode=TwoWay}" />
+                        <TextBlock Margin="0,5,0,1" Text="Password" />
+                        <PasswordBox Password="{Binding UserTemplate.Password, Mode=TwoWay}" />
+                        <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center" Text="Apartment number:" />
+                            <TextBox Margin="10,0,40,0" Text="{Binding UserTemplate.ApartmentId, Mode=TwoWay}" />
+                            <CheckBox Content="Board member" IsChecked="{Binding UserTemplate.IsBm}" />
+                        </StackPanel>
+                        <TextBlock Margin="0,5,0,1" Text=" First name" />
+                        <TextBox Text="{Binding UserTemplate.FirstName, Mode=TwoWay}" />
+                        <TextBlock Margin="0,5,0,1" Text="Last Name" />
+                        <TextBox Text="{Binding UserTemplate.LastName, Mode=TwoWay}" />
+                        <TextBlock Margin="0,5,0,1" Text="Birth date" />
+                        <DatePicker HorizontalAlignment="Stretch" Date="{Binding UserTemplate.BirthDate, Mode=TwoWay}" />
+                        <TextBlock Margin="0,5,0,1" Text="Email address" />
+                        <TextBox Text="{Binding UserTemplate.Email, Mode=TwoWay}" />
+                        <TextBlock Margin="0,5,0,1" Text="Phone number" />
+                        <TextBox Text="{Binding UserTemplate.Phone, Mode=TwoWay}" />
+                        <TextBlock Margin="0,5,0,1" Text="Move-in date" />
+                        <DatePicker HorizontalAlignment="Stretch" Date="{Binding UserTemplate.MoveInDate, Mode=TwoWay}" />
+                    </StackPanel>
+                </ScrollViewer>
+                <StackPanel
+                    Grid.Row="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Orientation="Horizontal">
+                    <Button
+                        Width="125"
+                        Margin="0"
+                        Command="{Binding CreateUserCommand}"
+                        Content="Create" />
+                    <Button
+                        Width="125"
+                        Margin="10,0"
+                        Command="{Binding DeleteUserCommand}"
+                        Content="Delete" />
+                    <Button
+                        Width="125"
+                        Margin="0"
+                        Command="{Binding UpdateUserCommand}"
+                        Content="Update" />
+                </StackPanel>
+            </Grid>
+        </Grid>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/Board member pages/BmUsersPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmUsersPage.xaml.cs
new file mode 100644
index 0000000..de51f22
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmUsersPage.xaml.cs	
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class BmUsersPage : Page
+    {
+        public BmUsersPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesPage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesPage.xaml
new file mode 100644
index 0000000..e94b0dc
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesPage.xaml	
@@ -0,0 +1,124 @@
+<Page
+    x:Class="ApartmentManager.View.ApartmentChangesPage"
+    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: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 />
+    </Page.DataContext>
+
+    <Page.BottomAppBar>
+        <CommandBar>
+            <CommandBar.Content>
+                <Grid />
+            </CommandBar.Content>
+            <AppBarButton
+                Click="GotoNewChangePage"
+                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.Changes}"
+            SelectedItem="{Binding CatalogSingleton.SelectedChange, Mode=TwoWay}"
+            SelectionChanged="GotoApartmentChangeViewPage">
+            <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="300" />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+
+                        <Image Margin="5" Source="{Binding Documents[0].Document}" />
+
+                        <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/User pages/ApartmentChangesPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesPage.xaml.cs
new file mode 100644
index 0000000..c498d1d
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesPage.xaml.cs	
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class ApartmentChangesPage : Page
+    {
+        public ApartmentChangesPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void GotoApartmentChangeViewPage(object sender, SelectionChangedEventArgs e)
+        {
+            Frame.Navigate(typeof(ApartmentChangesViewPage));
+        }
+
+        private void GotoNewChangePage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(ApartmentNewChangePage));
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesViewPage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesViewPage.xaml
new file mode 100644
index 0000000..dc957d1
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesViewPage.xaml	
@@ -0,0 +1,147 @@
+<Page
+    x:Class="ApartmentManager.View.ApartmentChangesViewPage"
+    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:viewModel="using:ApartmentManager.ViewModel"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <viewModel:ApartmentViewModel />
+    </Page.DataContext>
+
+    <Page.BottomAppBar>
+        <CommandBar>
+            <CommandBar.Content>
+                <Grid />
+            </CommandBar.Content>
+            <AppBarButton
+                Click="GotoApartmentChangesPage"
+                Icon="back"
+                Label="Create Defect" />
+        </CommandBar>
+    </Page.BottomAppBar>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <ScrollViewer>
+            <StackPanel>
+                <StackPanel Margin="10,10,10,0" Orientation="Horizontal">
+                    <TextBlock
+                        Margin="100,0,0,0"
+                        FontSize="30"
+                        FontWeight="Bold"
+                        Text="Name :" />
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="30"
+                        Text="{Binding CatalogSingleton.SelectedChange.Name}" />
+                    <TextBlock
+                        Margin="700,0,0,0"
+                        FontSize="30"
+                        FontWeight="Bold"
+                        Text="Status :" />
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="30"
+                        Text="{Binding CatalogSingleton.SelectedChange.Status}" />
+                </StackPanel>
+                <StackPanel Margin="20,0,20,20" Orientation="Horizontal">
+                    <StackPanel Width="620" Margin="0,50,0,0">
+                        <GridView
+                            Width="500"
+                            Height="420"
+                            ItemsSource="{Binding CatalogSingleton.SelectedChange.Documents, Mode=TwoWay}">
+                            <GridView.ItemTemplate>
+                                <DataTemplate>
+                                    <Image
+                                        Width="220"
+                                        Margin="10,0,10,10"
+                                        Source="{Binding Document}" />
+                                </DataTemplate>
+                            </GridView.ItemTemplate>
+
+                        </GridView>
+                    </StackPanel>
+                    <StackPanel Width="620">
+                        <TextBlock
+                            Margin="10,0,0,10"
+                            FontSize="30"
+                            FontWeight="Bold"
+                            Text="Description" />
+                        <Grid BorderBrush="Black" BorderThickness="1">
+                            <TextBlock
+                                Height="400"
+                                Margin="10"
+                                Text="{Binding CatalogSingleton.SelectedChange.Description, Mode=TwoWay}"
+                                TextWrapping="WrapWholeWords" />
+                        </Grid>
+
+
+                    </StackPanel>
+
+
+                </StackPanel>
+                <StackPanel Width="600" Margin="0,20,0,0">
+                    <TextBlock
+                        Margin="10,0,0,10"
+                        FontSize="30"
+                        FontWeight="Bold"
+                        Text="Comments" />
+                    <StackPanel Orientation="Horizontal">
+
+                        <TextBox
+                            Width="500"
+                            Height="80"
+                            Text="{Binding NewChangeComment.Comment, Mode=TwoWay}"
+                            TextWrapping="Wrap" />
+                        <Button
+                            Margin="10,0,0,0"
+                            Command="{Binding CreateChangeComment}"
+                            Content="Comment" />
+                    </StackPanel>
+
+
+                    <ListView ItemsSource="{Binding CatalogSingleton.SelectedChange.Comments}">
+                        <ListView.ItemContainerStyle>
+                            <Style TargetType="ListViewItem">
+                                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                            </Style>
+                        </ListView.ItemContainerStyle>
+
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Grid Margin="10">
+                                    <StackPanel>
+                                        <TextBlock
+                                            Margin="5,0,0,0"
+                                            FontWeight="Bold"
+                                            Text="{Binding Name}" />
+                                        <TextBlock
+                                            Margin="5"
+                                            Text="{Binding Comment}"
+                                            TextWrapping="WrapWholeWords" />
+                                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                                            <TextBlock Margin="0,0,0,5">
+                                                <Run FontWeight="Bold" Text="{Binding Date.Year}" />
+                                                <Run FontWeight="Bold" Text="-" />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Month}" />
+                                                <Run FontWeight="Bold" Text="-" />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Day}" />
+                                                <Run FontWeight="Bold" Text="  " />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Hour}" />
+                                                <Run FontWeight="Bold" Text=":" />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Minute}" />
+                                            </TextBlock>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Grid>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+
+                </StackPanel>
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesViewPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesViewPage.xaml.cs
new file mode 100644
index 0000000..d3030ff
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentChangesViewPage.xaml.cs	
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class ApartmentChangesViewPage : Page
+    {
+        public ApartmentChangesViewPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void GotoApartmentChangesPage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(ApartmentChangesPage));
+        }
+    }
+}
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/User pages/ApartmentDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectPage.xaml.cs
new file mode 100644
index 0000000..9ff9dd4
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectPage.xaml.cs	
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+using ApartmentManager.ViewModel;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class ApartmentDefectPage : Page
+    {
+        public ApartmentDefectPage()
+        {
+            this.InitializeComponent();
+            
+        }
+        private void NavigateNewDefect(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(ApartmentNewDefect));
+        }
+        private void NavigateDefectViewPage(object sender, SelectionChangedEventArgs e)
+        {
+            Frame.Navigate(typeof(ApartmentDefectViewPagexaml));
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectViewPage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectViewPage.xaml
new file mode 100644
index 0000000..9052d3a
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectViewPage.xaml	
@@ -0,0 +1,149 @@
+<Page
+    x:Class="ApartmentManager.View.ApartmentDefectViewPagexaml"
+    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"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <ViewModel:ApartmentViewModel />
+    </Page.DataContext>
+
+    <Page.BottomAppBar>
+        <CommandBar>
+            <CommandBar.Content>
+                <Grid />
+            </CommandBar.Content>
+            <AppBarButton
+                Icon="back"
+                Label="Create Defect" Click="BackToDefectPage" >
+            </AppBarButton>
+        </CommandBar>
+    </Page.BottomAppBar>
+    
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <ScrollViewer>
+            <StackPanel>
+                <StackPanel Margin="10,10,10,0" Orientation="Horizontal">
+                    <TextBlock
+                        Margin="100,0,0,0"
+                        FontSize="30"
+                        FontWeight="Bold"
+                        Text="Name :" />
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="30"
+                        Text="{Binding CatalogSingleton.SelectedDefect.Name}" />
+                    <TextBlock
+                        Margin="700,0,0,0"
+                        FontSize="30"
+                        FontWeight="Bold"
+                        Text="Status :" />
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontSize="30"
+                        Text="{Binding CatalogSingleton.SelectedDefect.Status}" />
+                </StackPanel>
+                <StackPanel Margin="20,0,20,20" Orientation="Horizontal">
+                    <StackPanel Width="620" Margin="0,50,0,0">
+                        <GridView
+                            Width="500"
+                            Height="420"
+                            ItemsSource="{Binding CatalogSingleton.SelectedDefect.Pictures, Mode=TwoWay}">
+                            <GridView.ItemTemplate>
+                                <DataTemplate>
+                                    <Image
+                                        Width="220"
+                                        Margin="10,0,10,10"
+                                        Source="{Binding Picture}" />
+                                </DataTemplate>
+                            </GridView.ItemTemplate>
+
+                        </GridView>
+                    </StackPanel>
+                    <StackPanel Width="620">
+                        <TextBlock
+                            Margin="10,0,0,10"
+                            FontSize="30"
+                            FontWeight="Bold"
+                            Text="Description" />
+                        <Grid BorderBrush="Black" BorderThickness="1">
+                            <TextBlock
+                                Height="400"
+                                Margin="10"
+                                Text="{Binding CatalogSingleton.SelectedDefect.Description, Mode=TwoWay}"
+                                TextWrapping="WrapWholeWords" />
+                        </Grid>
+
+
+                    </StackPanel>
+
+
+                </StackPanel>
+                <StackPanel Width="600" Margin="0,20,0,0">
+                    <TextBlock
+                        Margin="10,0,0,10"
+                        FontSize="30"
+                        FontWeight="Bold"
+                        Text="Comments" />
+                    <StackPanel Orientation="Horizontal">
+
+                        <TextBox
+                            Width="500"
+                            Height="80"
+                            Text="{Binding NewChangeComment.Comment, Mode=TwoWay}"
+                            TextWrapping="Wrap" />
+                        <Button
+                            Margin="10,0,0,0"
+                            Command="{Binding CreateDefectComment}"
+                            Content="Comment" />
+                    </StackPanel>
+
+
+                    <ListView ItemsSource="{Binding CatalogSingleton.SelectedDefect.Comments}">
+                        <ListView.ItemContainerStyle>
+                            <Style TargetType="ListViewItem">
+                                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                            </Style>
+                        </ListView.ItemContainerStyle>
+
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Grid Margin="10">
+                                    <StackPanel>
+                                        <TextBlock
+                                            Margin="5,0,0,0"
+                                            FontWeight="Bold"
+                                            Text="{Binding Name}" />
+                                        <TextBlock
+                                            Margin="5"
+                                            Text="{Binding Comment}"
+                                            TextWrapping="WrapWholeWords" />
+                                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                                            <TextBlock Margin="0,0,0,5">
+                                                <Run FontWeight="Bold" Text="{Binding Date.Year}" />
+                                                <Run FontWeight="Bold" Text="-" />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Month}" />
+                                                <Run FontWeight="Bold" Text="-" />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Day}" />
+                                                <Run FontWeight="Bold" Text="  " />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Hour}" />
+                                                <Run FontWeight="Bold" Text=":" />
+                                                <Run FontWeight="Bold" Text="{Binding Date.Minute}" />
+                                            </TextBlock>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Grid>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+
+                </StackPanel>
+
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectViewPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectViewPage.xaml.cs
new file mode 100644
index 0000000..6225ebc
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentDefectViewPage.xaml.cs	
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+using ApartmentManager.ViewModel;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class ApartmentDefectViewPagexaml : Page
+    {
+        private ApartmentViewModel vm;
+        public ApartmentDefectViewPagexaml()
+        {
+            this.InitializeComponent();
+            vm = new ApartmentViewModel();
+            DataContext = vm;
+        }
+
+        private void BackToDefectPage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(ApartmentDefectPage));
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewChangePage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewChangePage.xaml
new file mode 100644
index 0000000..43f3998
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewChangePage.xaml	
@@ -0,0 +1,90 @@
+<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: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"
+    mc:Ignorable="d">
+
+    <Page.BottomAppBar>
+        <CommandBar>
+            <CommandBar.Content>
+                <Grid />
+            </CommandBar.Content>
+            <AppBarButton
+                Click="BackToChangePage"
+                Icon="Back"
+                Label="Create Defect" />
+        </CommandBar>
+    </Page.BottomAppBar>
+
+
+    <Page.DataContext>
+        <ViewModel:ApartmentViewModel />
+    </Page.DataContext>
+
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
+
+            <TextBlock
+                Margin="0,10,0,10"
+                HorizontalAlignment="Center"
+                FontSize="20"
+                FontWeight="Bold"
+                Text="Change Information" />
+
+            <StackPanel Orientation="Horizontal">
+                <StackPanel Margin="0,5,30,0">
+                    <ListView
+                        Width="500"
+                        Height="600"
+                        ItemsSource="{Binding NewChange.Documents, Mode=TwoWay}"
+                        SelectedItem="{Binding SelectedChangeDocument, Mode=TwoWay}">
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Image
+                                    Width="400"
+                                    Margin="10"
+                                    Source="{Binding Document}" />
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+
+                    <StackPanel Margin="10" Orientation="Horizontal">
+                        <Button
+                            Margin="30,0,0,0"
+                            Command="{Binding UploadChangePicture}"
+                            Content="Upload Picture" />
+                        <Button
+                            Margin="170,0,0,0"
+                            Command="{Binding DeleteChangePicture}"
+                            Content="Delete Picture" />
+                    </StackPanel>
+
+                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
+                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
+
+                </StackPanel>
+
+                <StackPanel Width="400" Margin="0,0,50,0">
+                    <TextBlock Margin="0,10,0,10" Text="Name" />
+                    <TextBox Text="{Binding NewChange.Name, Mode=TwoWay}" />
+                    <TextBlock Margin="0,10,0,10" Text="Description" />
+                    <TextBox
+                        Height="417"
+                        Text="{Binding NewChange.Description, Mode=TwoWay}"
+                        TextWrapping="Wrap" />
+                    <Button
+                        Margin="0,20,0,0"
+                        HorizontalAlignment="Stretch"
+                        Click="CreateChange"
+                        Content="Create" />
+                </StackPanel>
+
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewChangePage.xaml.cs
new file mode 100644
index 0000000..44abaf7
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewChangePage.xaml.cs	
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+using ApartmentManager.ViewModel;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class ApartmentNewChangePage : Page
+    {
+        private ApartmentViewModel vm;
+        public ApartmentNewChangePage()
+        {
+            this.InitializeComponent();
+            vm = new ApartmentViewModel();
+            DataContext = vm;
+        }
+
+        private void BackToChangePage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(ApartmentChangesPage));
+        }
+
+        private void CreateChange(object sender, RoutedEventArgs e)
+        {
+            
+            
+                vm.CreateChange.Execute(null);
+                if (vm.CreateChange.CanExecute(null))
+                {
+                    Frame.Navigate(typeof(ApartmentChangesPage));
+                }
+            
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewDefect.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewDefect.xaml
new file mode 100644
index 0000000..4743bd3
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewDefect.xaml	
@@ -0,0 +1,86 @@
+<Page
+    x:Class="ApartmentManager.View.ApartmentNewDefect"
+    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"
+    mc:Ignorable="d">
+
+    <Page.BottomAppBar>
+        <CommandBar>
+            <CommandBar.Content>
+                <Grid />
+            </CommandBar.Content>
+            <AppBarButton
+                Icon="back"
+                Label="Create Defect" Click="BackToDefectPage">
+            </AppBarButton>
+        </CommandBar>
+    </Page.BottomAppBar>
+
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
+
+            <TextBlock
+                Margin="0,10,0,10"
+                HorizontalAlignment="Center"
+                FontSize="20"
+                FontWeight="Bold"
+                Text="Defect Information" />
+
+            <StackPanel Orientation="Horizontal">
+                <StackPanel Margin="0,5,30,0">
+                    <ListView
+                        Width="500"
+                        Height="600"
+                        ItemsSource="{Binding NewDefect.Pictures, Mode=TwoWay}"
+                        SelectedItem="{Binding SelectedDefectPicture, Mode=TwoWay}">
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Image
+                                    Width="400"
+                                    Margin="10"
+                                    Source="{Binding Picture}" />
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+
+                    </ListView>
+
+                    <StackPanel Margin="10" Orientation="Horizontal">
+                        <Button
+                            Margin="30,0,0,0"
+                            Command="{Binding UploadDefectPicture}"
+                            Content="Upload Picture" />
+                        <Button
+                            Margin="170,0,0,0"
+                            Command="{Binding DeleteDefectPicture}"
+                            Content="Delete Picture" />
+                    </StackPanel>
+
+                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
+                    <StackPanel Margin="0,30,0,0" Orientation="Horizontal" />
+
+                </StackPanel>
+
+                <StackPanel Width="400" Margin="0,0,50,0">
+                    <TextBlock Margin="0,10,0,10" Text="Name" />
+                    <TextBox Text="{Binding NewDefect.Name, Mode=TwoWay}" />
+                    <TextBlock Margin="0,10,0,10" Text="Description" />
+                    <TextBox
+                        Height="417"
+                        Text="{Binding NewDefect.Description, Mode=TwoWay}"
+                        TextWrapping="Wrap" />
+                    <Button
+                        Margin="0,20,0,0"
+                        HorizontalAlignment="Stretch"
+                        Click="Navigate"
+                        Content="Create" />
+                </StackPanel>
+
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewDefect.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewDefect.xaml.cs
new file mode 100644
index 0000000..31ce2a2
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentNewDefect.xaml.cs	
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+using ApartmentManager.ViewModel;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class ApartmentNewDefect : Page
+    {
+        private ApartmentViewModel vm;
+        public ApartmentNewDefect()
+        {
+            this.InitializeComponent();
+            vm = new ApartmentViewModel();
+            DataContext = vm;
+            
+        }
+
+        private void Navigate(object sender, RoutedEventArgs e)
+        {
+            vm.CreateDefect.Execute(null);
+            if (vm.CreateDefect.CanExecute(null))
+            {
+                Frame.Navigate(typeof(ApartmentDefectPage));
+            }
+        }
+
+        private void BackToDefectPage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(ApartmentDefectPage));
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPage.xaml
new file mode 100644
index 0000000..481cf18
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPage.xaml	
@@ -0,0 +1,132 @@
+<Page
+    x:Class="ApartmentManager.View.ApartmentPage"
+    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"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <ViewModel:ApartmentViewModel />
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel
+            Margin="50"
+            VerticalAlignment="Top"
+            Orientation="Horizontal">
+
+            <StackPanel Margin="50,0,20,0" VerticalAlignment="Top">
+                <Image
+                    MaxWidth="800"
+                    MaxHeight="650"
+                    Source="{Binding CatalogSingleton.Apartment.PlanPicture}" />
+            </StackPanel>
+
+            <StackPanel>
+
+                <StackPanel>
+
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock
+                            Margin="0,0,10,0"
+                            FontSize="20"
+                            FontWeight="Bold"
+                            Text="Address :" />
+                        <TextBlock FontSize="20" Text="{Binding CatalogSingleton.Apartment.Address}" />
+                    </StackPanel>
+
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock
+                            Margin="0,0,10,0"
+                            FontSize="20"
+                            FontWeight="Bold"
+                            Text="Floor :" />
+                        <TextBlock FontSize="20" Text="{Binding CatalogSingleton.Apartment.Floor}" />
+                    </StackPanel>
+
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock
+                            Margin="0,0,10,0"
+                            FontSize="20"
+                            FontWeight="Bold"
+                            Text="Apartment Number :" />
+                        <TextBlock FontSize="20" Text="{Binding CatalogSingleton.Apartment.ApartmentId}" />
+                    </StackPanel>
+
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock
+                            Margin="0,0,10,0"
+                            FontSize="20"
+                            FontWeight="Bold"
+                            Text="Size :" />
+                        <TextBlock
+                            Margin="0,0,10,0"
+                            FontSize="20"
+                            Text="{Binding CatalogSingleton.Apartment.Size}" />
+                        <TextBlock FontSize="20" Text="m2" />
+                    </StackPanel>
+
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock
+                            Margin="0,0,10,0"
+                            FontSize="20"
+                            FontWeight="Bold"
+                            Text="Number of Rooms :" />
+                        <TextBlock FontSize="20" Text="{Binding CatalogSingleton.Apartment.NumberOfRooms}" />
+                    </StackPanel>
+
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock
+                            Margin="0,0,10,0"
+                            FontSize="20"
+                            FontWeight="Bold"
+                            Text="Monthly Charge:" />
+                        <TextBlock
+                            Margin="0,0,10,0"
+                            FontSize="20"
+                            Text="{Binding CatalogSingleton.Apartment.MonthlyCharge}" />
+                        <TextBlock FontSize="20" Text="DKK" />
+                    </StackPanel>
+
+                </StackPanel>
+
+                <StackPanel
+                    Width="250"
+                    Margin="0,20,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top">
+                    <Button
+                        Margin="0,10,0,10"
+                        HorizontalAlignment="Stretch"
+                        Click="GotoApartmentPlanPage"
+                        Content="Apartment Plan" />
+                    <Button
+                        Margin="0,10,0,10"
+                        HorizontalAlignment="Stretch"
+                        Click="GotoPernalInfoPage"
+                        Content="Personal Info" />
+                    <Button
+                        Margin="0,10,0,10"
+                        HorizontalAlignment="Stretch"
+                        Click="ResidentPage"
+                        Content="Apartment Residents" />
+                    <Button
+                        Margin="0,10,0,10"
+                        HorizontalAlignment="Stretch"
+                        Content="Apartment Changes" Click="GotoChangesPage" />
+                    <Button
+                        Margin="0,10,0,10"
+                        HorizontalAlignment="Stretch"
+                        Click="DefectPage"
+                        Content="Apartment Defects" />
+                </StackPanel>
+
+            </StackPanel>
+
+        </StackPanel>
+
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPage.xaml.cs
new file mode 100644
index 0000000..b6752d9
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPage.xaml.cs	
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class ApartmentPage : Page
+    {
+        public ApartmentPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void GotoApartmentPlanPage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(ApartmentPlanPage));
+        }
+
+        private void GotoPernalInfoPage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(PersonalInfoPage));
+        }
+
+        private void ResidentPage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(ApartmentResidentsPage));
+        }
+
+        private void DefectPage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(ApartmentDefectPage));
+        }
+
+        private void GotoChangesPage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(ApartmentChangesPage));
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentPlanPage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPlanPage.xaml
new file mode 100644
index 0000000..a9b71e5
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPlanPage.xaml	
@@ -0,0 +1,19 @@
+<Page
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ViewModel="using:ApartmentManager.ViewModel"
+    x:Class="ApartmentManager.View.ApartmentPlanPage"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <ViewModel:ApartmentViewModel/>
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <Image  Source="{Binding CatalogSingleton.Apartment.PlanPicture}"  MaxWidth="800" MaxHeight="650" Margin="50"/>
+
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentPlanPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPlanPage.xaml.cs
new file mode 100644
index 0000000..45feb63
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentPlanPage.xaml.cs	
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class ApartmentPlanPage : Page
+    {
+        public ApartmentPlanPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentResidentsPage.xaml b/ApartmentManager/ApartmentManager/View/User pages/ApartmentResidentsPage.xaml
new file mode 100644
index 0000000..00b6a75
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentResidentsPage.xaml	
@@ -0,0 +1,256 @@
+<Page
+    x:Class="ApartmentManager.View.ApartmentResidentsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Common="using:ApartmentManager.Common"
+    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"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <ViewModel:ApartmentViewModel />
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel
+            Margin="10"
+            HorizontalAlignment="Center"
+            VerticalAlignment="top"
+            Orientation="Horizontal">
+            <StackPanel Margin="10">
+                <Grid
+                    Width="800"
+                    Height="150"
+                    Margin="0,0,0,5"
+                    Background="LightGray">
+
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="150" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+
+                    <Grid
+                        Grid.Column="0"
+                        Background="Gray"
+                        BorderBrush="#CCFFFFFF"
+                        BorderThickness="0,0,2,0">
+                        <Image Source="{Binding UserSingleton.CurrentUser.Picture}" Stretch="Fill" />
+                    </Grid>
+
+                    <Grid Grid.Column="1" Margin="3,3,3,3">
+
+                        <StackPanel Margin="10">
+
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    FontSize="30"
+                                    FontWeight="Bold"
+                                    Text="Full Name :" />
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    FontSize="30"
+                                    Text="{Binding UserSingleton.CurrentUser.FirstName}" />
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    FontSize="30"
+                                    Text="{Binding UserSingleton.CurrentUser.LastName}" />
+                            </StackPanel>
+
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    FontSize="20"
+                                    FontWeight="Bold"
+                                    Text="Email Address :" />
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    FontSize="20"
+                                    Text="{Binding UserSingleton.CurrentUser.Email}" />
+                            </StackPanel>
+
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    FontSize="20"
+                                    FontWeight="Bold"
+                                    Text="Phone Number :" />
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    FontSize="20"
+                                    Text="{Binding UserSingleton.CurrentUser.Phone}" />
+                            </StackPanel>
+
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="0,0,10,0"
+                                    FontSize="20"
+                                    FontWeight="Bold"
+                                    Text="Birth Date :" />
+                                <TextBlock FontSize="20" Text="{Binding UserSingleton.CurrentUser.BirthDate.Year}" />
+                                <TextBlock FontSize="20" Text="-" />
+                                <TextBlock FontSize="20" Text="{Binding UserSingleton.CurrentUser.BirthDate.Month}" />
+                                <TextBlock FontSize="20" Text="-" />
+                                <TextBlock FontSize="20" Text="{Binding UserSingleton.CurrentUser.BirthDate.Day}" />
+                            </StackPanel>
+
+                        </StackPanel>
+                    </Grid>
+                </Grid>
+
+                <ListView
+                    Margin="10,10,10,116"
+                    ItemsSource="{Binding CatalogSingleton.Residents}"
+                    SelectedItem="{Binding NewResident, Mode=TwoWay}">
+
+                    <ListView.ItemContainerStyle>
+                        <Style TargetType="ListViewItem">
+                            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                        </Style>
+                    </ListView.ItemContainerStyle>
+
+                    <ListView.ItemTemplate>
+
+                        <DataTemplate>
+                            <Grid
+                                Width="800"
+                                Height="150"
+                                Margin="0,0,0,5"
+                                Background="LightGray">
+
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="150" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+
+                                <Grid
+                                    Grid.Column="0"
+                                    Background="Gray"
+                                    BorderBrush="#CCFFFFFF"
+                                    BorderThickness="0,0,2,0">
+                                    <Image Source="{Binding Picture}" Stretch="Fill" />
+                                </Grid>
+
+                                <Grid Grid.Column="1" Margin="3,3,3,3">
+
+                                    <StackPanel Margin="10">
+
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock
+                                                Margin="0,0,10,0"
+                                                FontSize="30"
+                                                FontWeight="Bold"
+                                                Text="Full Name :" />
+                                            <TextBlock
+                                                Margin="0,0,10,0"
+                                                FontSize="30"
+                                                Text="{Binding FirstName}" />
+                                            <TextBlock
+                                                Margin="0,0,10,0"
+                                                FontSize="30"
+                                                Text="{Binding LastName}" />
+                                        </StackPanel>
+
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock
+                                                Margin="0,0,10,0"
+                                                FontSize="20"
+                                                FontWeight="Bold"
+                                                Text="Email Address :" />
+                                            <TextBlock
+                                                Margin="0,0,10,0"
+                                                FontSize="20"
+                                                Text="{Binding Email}" />
+                                        </StackPanel>
+
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock
+                                                Margin="0,0,10,0"
+                                                FontSize="20"
+                                                FontWeight="Bold"
+                                                Text="Phone Number :" />
+                                            <TextBlock
+                                                Margin="0,0,10,0"
+                                                FontSize="20"
+                                                Text="{Binding Phone}" />
+                                        </StackPanel>
+
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock
+                                                Margin="0,0,10,0"
+                                                FontSize="20"
+                                                FontWeight="Bold"
+                                                Text="Birth Date :" />
+                                            <TextBlock FontSize="20" Text="{Binding BirthDate.Year}" />
+                                            <TextBlock FontSize="20" Text="-" />
+                                            <TextBlock FontSize="20" Text="{Binding BirthDate.Month}" />
+                                            <TextBlock FontSize="20" Text="-" />
+                                            <TextBlock FontSize="20" Text="{Binding BirthDate.Day}" />
+                                        </StackPanel>
+
+                                    </StackPanel>
+                                </Grid>
+                            </Grid>
+                        </DataTemplate>
+
+                    </ListView.ItemTemplate>
+                </ListView>
+            </StackPanel>
+
+            <StackPanel Width="400" Margin="0,0,50,0">
+
+                <TextBlock
+                    Margin="0,5,0,10"
+                    HorizontalAlignment="Center"
+                    FontSize="20"
+                    FontWeight="Bold"
+                    Text="Resident Info" />
+                <Image
+                    Width="150"
+                    Height="150"
+                    Source="{Binding NewResident.Picture, Mode=TwoWay}" />
+                <Button
+                    Margin="0,10,0,0"
+                    HorizontalAlignment="Stretch"
+                    Command="{Binding UploadResidentPhoto}"
+                    Content="Upload Picture" />
+                <TextBlock Margin="0,10,0,10" Text="Name" />
+                <TextBox Text="{Binding NewResident.FirstName, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Last Name" />
+                <TextBox Text="{Binding NewResident.LastName, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Birthdate" />
+                <DatePicker HorizontalAlignment="Stretch" Date="{Binding NewResident.BirthDate, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Email Address" />
+                <TextBox Text="{Binding NewResident.Email, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Phone Number" />
+                <TextBox Text="{Binding NewResident.Phone, Mode=TwoWay}" />
+
+
+                <StackPanel Orientation="Horizontal">
+                    <Button
+                        Width="125"
+                        Margin="0,5,12,10"
+                        Command="{Binding CreateResidentCommand}"
+                        Content="Create" />
+                    <Button
+                        Width="125"
+                        Margin="0,5,0,10"
+                        Command="{Binding DeleteResidentCommand}"
+                        Content="Delete" />
+                    <Button
+                        Width="125"
+                        Margin="13,5,0,10"
+                        Command="{Binding UpdateResidentCommand}"
+                        Content="Update" />
+                </StackPanel>
+
+            </StackPanel>
+
+
+        </StackPanel>
+
+    </Grid>
+
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/User pages/ApartmentResidentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/User pages/ApartmentResidentsPage.xaml.cs
new file mode 100644
index 0000000..b1272bb
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/User pages/ApartmentResidentsPage.xaml.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+using ApartmentManager.ViewModel;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace ApartmentManager.View
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class ApartmentResidentsPage : Page
+    {
+        public ApartmentResidentsPage()
+        {
+            this.InitializeComponent();          
+        }
+    }
+}
-- 
cgit v1.2.3