diff --git a/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs b/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs
index d713c3015ef09c899754b3d3a1fd89f57f90f66d..4dbb97bfb51123a3bc3d17ed8c4d013daf8d0d2f 100644
--- a/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs
+++ b/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs
@@ -14,11 +14,15 @@ namespace azure_m.Droid
 {
 	
 	
+<<<<<<< HEAD
 <<<<<<< HEAD
 	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.4.160")]
 =======
 	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.3.3.31")]
 >>>>>>> 108246eb6eb34ea252cb4299ec76dc22dbbf9391
+=======
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.3.0.26")]
+>>>>>>> 1614288fa7948eb70301b952cc27dc6ea66ccdff
 	public partial class Resource
 	{
 		
diff --git a/azure_m/azure_m/azure_m/ViewModels/VMDetailsViewModel.cs b/azure_m/azure_m/azure_m/ViewModels/VMDetailsViewModel.cs
index 6317ec505b3d997aebaf8d57210f6ab94dc7ebd0..0418b85731d0da84b3663ab891baecabff09cd36 100644
--- a/azure_m/azure_m/azure_m/ViewModels/VMDetailsViewModel.cs
+++ b/azure_m/azure_m/azure_m/ViewModels/VMDetailsViewModel.cs
@@ -66,6 +66,7 @@ namespace azure_m.ViewModels
 
 
         public Command CreateOrUpdateVM { get; set; }
+        public static event EventHandler<int> CreateFinishd;
 
         public CreateOrUpdateNIRequest nIRequest { get; set; } = new CreateOrUpdateNIRequest { body = new CreateOrUpdateNIBody { properties = new NetworkInterfacesProperties { ipConfigurations = new NetworkInterfaceIPConfiguration[1] } } };
 
@@ -80,32 +81,29 @@ namespace azure_m.ViewModels
             }
         }
 
-        public string AdminUsername
-        {
-            get => vm.body.properties.osProfile.adminUsername;
-            set => vm.body.properties.osProfile.adminUsername = value;
-        }
+        public string AdminUsername;
+        
 
-    #endregion
+        #endregion
 
-    #region initialize
+        #region initialize
     public VMDetailsViewModel()
     {
-#if DEBUG
         subscribes = new Dictionary<string, string> { { "免费试用", "123" } };
+#if DEBUG
         resourceGroups = new List<string> { "wfpres", "wfpppres" };
-        AreaSources = new List<string> { "japaneast" };
+        vnetworks = new List<string> { "new_group-vnet" };
+#endif
+
+        AreaSources = new List<string> { "japaneast" , "AsiaEast"};
         Zones = new List<string> { "Zones 1", "Zones 2", "Zones 3" };
         Images = new List<ImageReference> { new ImageReference() { sku = "20_04-lts-gen2", publisher = "Canonical", version = "latest", offer = "0001-com-ubuntu-server-focal"  } };
         vmSizes = new List<string> { "Standard_B1s", "Standard_D2s_v3" };
         ports = new List<string> { "HTTPS(443)", "HTTP(80)", "SSH(22)" };
-
-        vnetworks = new List<string> { "new_group-vnet" };
         net_ports = new List<string> { "HTTPS(443)", "HTTP(80)", "SSH(22)", "RDP(3389)" };
 
-#endif
-
         subscribesNames = subscribes.Keys.ToList();
+
         #region subscription events
         Views.AddVmDetailsPage.SubscribeIndexChange += ChangeSubID;
         Views.AddVmDetailsPage.ResourceGroupIndexChanged += (sender, e) => { vm.uri.resourceGroupName = (sender as Picker).SelectedItem.ToString(); };
@@ -157,16 +155,16 @@ namespace azure_m.ViewModels
         portsChange = new Command((sender) => { });
         net_portsChange = new Command((sender) => { });
 
-        #region 创建虚拟机 Command
-        //过程: 创建公网&&创建虚拟网络 -> 创建虚拟网卡 -> 创建虚拟机
-        //约定：
-        //1. 只有一个系统盘，无数据盘
-        //2. 如果区域不同，那么将默认创建虚拟网络
-        //3. 无论虚拟网络是否新建，都将使用默认虚拟子网。
-        CreateOrUpdateVM = new Command(async (sender) =>
+            #region 创建虚拟机 Command
+            //过程: 创建公网&&创建虚拟网络 -> 创建虚拟网卡 -> 创建虚拟机
+            //约定：
+            //1. 只有一个系统盘，无数据盘
+            //2. 如果区域不同，那么将默认创建虚拟网络
+            //3. 无论虚拟网络是否新建，都将使用默认虚拟子网。
+
+            CreateOrUpdateVM = new Command(async (sender) =>
         {
-            //subnet 选择的是已经有的subnet, 选择默认的ipaddress？
-            //nic 创建一个叫{UID}的nic
+
             #region local var
             PublicIPAdressOperations publicIPAddressOperations = new PublicIPAdressOperations();
 
@@ -183,6 +181,7 @@ namespace azure_m.ViewModels
             string networkInterfaceName = $"ipconfig_{UID}";
 
             string resourceGroup = vm.uri.resourceGroupName;
+            int StatusCode;
             #endregion
 
             #region PublicIPAddress
@@ -281,15 +280,17 @@ namespace azure_m.ViewModels
                 resourceGroup,
                 networkInterfaceName);
 
-            await vmDataStore.queryCreateOrUpdateVM(vm);//调用，创建
-            #endregion
+            StatusCode = await vmDataStore.queryCreateOrUpdateVM(vm);//调用，创建
 
+            CreateFinishd?.Invoke(this, StatusCode);
+            #endregion
         });
-        #endregion
+#endregion
 
-        #endregion
+#endregion
+            
     }
-    #endregion
+#endregion
 
     private void ChangeSubID(object sender, int i)
     {
diff --git a/azure_m/azure_m/azure_m/Views/AddPage.xaml.cs b/azure_m/azure_m/azure_m/Views/AddPage.xaml.cs
index 2cc35a0632f624ff292b2e60c815a2ecf9ca580b..0d174a1726c34d99dfdb21e58547f9cef6e8223e 100644
--- a/azure_m/azure_m/azure_m/Views/AddPage.xaml.cs
+++ b/azure_m/azure_m/azure_m/Views/AddPage.xaml.cs
@@ -29,7 +29,9 @@ namespace azure_m.Views
                 {
                     //TODO
                     await Task.Delay(1000);
+                    Xamarin.Essentials.Vibration.Vibrate(500);
                 });
+            
 
         }
         public void CreateServiceFuncApp(object sender, EventArgs e)
diff --git a/azure_m/azure_m/azure_m/Views/AddVMDetailsPage.xaml b/azure_m/azure_m/azure_m/Views/AddVMDetailsPage.xaml
index 53ddeff54a8f73fd70c3da9452ce18cf41a61ee7..0cd39e9ead525b21414b4768a7a7d6fd3034d1f2 100644
--- a/azure_m/azure_m/azure_m/Views/AddVMDetailsPage.xaml
+++ b/azure_m/azure_m/azure_m/Views/AddVMDetailsPage.xaml
@@ -12,39 +12,71 @@
             <Style x:Key="itemLabel" TargetType="Label">
                 <Setter Property="FontSize" Value="15"/>
                 <Setter Property="VerticalOptions" Value="Center"/>
-                <Setter Property="Margin" Value="15,0,0,0"/>
+                <Setter Property="Margin" Value="2,0,0,0"/>
                 <Setter Property="TextColor" Value="Black"/>
+                <Setter Property="BackgroundColor" Value="White"/>
             </Style>
 
             <Style x:Key="ItemPicker" TargetType="Picker">
                 <Setter Property="HorizontalTextAlignment" Value="Center"/>
                 <Setter Property="VerticalTextAlignment" Value="Center"/>
                 <Setter Property="HorizontalOptions" Value="CenterAndExpand"/>
-                <Setter Property="VerticalOptions" Value="Center"/>
+                <Setter Property="WidthRequest" Value="200"/>
+                <Setter Property="VerticalOptions" Value="End"/>
                 <Setter Property="Margin" Value="20,0,0,0"/>
                 <Setter Property="FontSize" Value="15"/>
                 <Setter Property="TextColor" Value="Black"/>
+                <Setter Property="BackgroundColor" Value="White"/>
             </Style>
 
             <Style x:Key="entryStyle" TargetType="Entry">
                 <Setter Property="FontSize" Value="15"/>
                 <Setter Property="TextColor" Value="Black"/>
                 <Setter Property="MaxLength" Value="100"/>
-                <!--<Setter Property="VerticalOptions" Value="Center"/>
+                <Setter Property="VerticalOptions" Value="CenterAndExpand"/>
                 <Setter Property="HorizontalOptions" Value="Center"/>
+                <Setter Property="WidthRequest" Value="200"/>
                 <Setter Property="VerticalTextAlignment" Value="Center"/>
-                <Setter Property="HorizontalTextAlignment" Value="Center"/>-->
+                <Setter Property="HorizontalTextAlignment" Value="Center"/>
+                <Setter Property="BackgroundColor" Value="White"/>
+            </Style>
+
+            <Style x:Key="frameStyle" TargetType="Frame">
+                <Setter Property="BorderColor" Value="White"/>
+                <Setter Property="HasShadow" Value="False"/>
+                <Setter Property="HorizontalOptions" Value="Center"/>
+                <Setter Property="VerticalOptions" Value="CenterAndExpand"/>
+                <Setter Property="BackgroundColor" Value="White"/>
+            </Style>
+
+            <Style x:Key="CollectionStyle" TargetType="CollectionView">
+                <Setter Property="HorizontalOptions" Value="Center"/>
+                <Setter Property="VerticalOptions" Value="CenterAndExpand"/>
+            </Style>
+
+            <Style x:Key="BoldBorder" TargetType="Line">
+                <Setter Property="HeightRequest" Value="2"/>
+                <Setter Property="VerticalOptions" Value="Start"/>
+                <Setter Property="BackgroundColor" Value="LightGray"/>
             </Style>
             
+            <Style x:Key="ThinBorder" TargetType="Line">
+                <Setter Property="HeightRequest" Value="1"/>
+                <Setter Property="VerticalOptions" Value="Start"/>
+                <Setter Property="BackgroundColor" Value="lightGray"/>
+                <Setter Property="HorizontalOptions" Value="Start"/>
+                <Setter Property="WidthRequest" Value="400"/>
+            </Style>
         </ResourceDictionary>
     </CarouselPage.Resources>
     
     <ContentPage BackgroundColor="white" x:Name="Basic">
         <StackLayout Margin="5,5,0,5">
             <ScrollView>
-                <Grid ColumnDefinitions="*,2*" >
+                <Grid ColumnDefinitions="*,2*" RowDefinitions="40,50,50,50,50,50,50,50,50,50,50,50,50,50,50,100,50,50">
                     <!--#region 项目详细信息-->
-                    <Label VerticalTextAlignment="Center" Text="项目详细信息" Grid.ColumnSpan="2" FontSize="20" />
+                    <Label VerticalTextAlignment="Center" Text="项目详细信息" Grid.ColumnSpan="2" FontSize="20"  />
+                    <Line Grid.Row="1" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="1" Style="{StaticResource itemLabel}" >
                         <Label.FormattedText>
                             <FormattedString>
@@ -54,6 +86,7 @@
                         </Label.FormattedText>
                     </Label>
                     <Picker Grid.Row="1" Grid.Column="1" x:Name="subscribe" Title="请选择订阅" ItemsSource="{Binding subscribesNames}" SelectedIndex="{Binding DefaultIndex0}" SelectedIndexChanged="subscribe_SelectedIndexChanged" Style="{StaticResource ItemPicker}"/>
+                    <Line Grid.Row="2" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="2"  Style="{StaticResource itemLabel}">
                         <Label.FormattedText>
                             <FormattedString>
@@ -65,8 +98,10 @@
                     <Picker Grid.Row="2" Grid.Column="1" x:Name="resourcesGroup" Title="请选择资源组" ItemsSource="{Binding resourceGroups}"  SelectedIndex="{Binding DefaultIndex0}" SelectedIndexChanged="resourcesGroup_SelectedIndexChanged" Style="{StaticResource ItemPicker}"/>
                     <!--#endregion-->
 
+                    <Line Grid.Row="3" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource BoldBorder}"/>
                     <!--#region 实例详细信息-->
-                    <Label VerticalTextAlignment="Center" Text="实例详细信息" Grid.ColumnSpan="2" FontSize="20" Grid.Row="3" />
+                    <Label VerticalTextAlignment="Center" x:Name="instanceLabel" Text="实例详细信息" Grid.ColumnSpan="2" FontSize="20" Grid.Row="3" />
+                    <Line Grid.Row="4" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="4"  Style="{StaticResource itemLabel}">
                         <Label.FormattedText>
                             <FormattedString>
@@ -76,6 +111,7 @@
                         </Label.FormattedText>
                     </Label>
                     <Entry Style="{StaticResource entryStyle}" Grid.Row="4" Grid.Column="1" x:Name="VMName" Text="{Binding VMName}" />
+                    <Line Grid.Row="5" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="5"  Style="{StaticResource itemLabel}">
                         <Label.FormattedText>
                             <FormattedString>
@@ -84,11 +120,13 @@
                             </FormattedString>
                         </Label.FormattedText>
                     </Label>
-                    <Picker Grid.Row="5" x:Name="areas" Grid.Column="1" Title="请选择区域" ItemsSource="{Binding AreaSources}"   SelectedIndex="{Binding DefaultIndex0}" SelectedIndexChanged="areas_SelectedIndexChanged" Style="{StaticResource ItemPicker}"/>
-
+                    <StackLayout Grid.Row="5" Grid.Column="1" VerticalOptions="Center" WidthRequest="200" HorizontalOptions="Center">
+                        <Picker  x:Name="areas"  Title="请选择区域" ItemsSource="{Binding AreaSources}"   SelectedIndex="{Binding DefaultIndex0}" SelectedIndexChanged="areas_SelectedIndexChanged" Style="{StaticResource ItemPicker}"/>
+                    </StackLayout>
 
+                    <Line Grid.Row="6" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="6" Text="可用性选项"  Style="{StaticResource itemLabel}"/>
-                    <Picker Grid.Row="6" x:Name="availabilty" Grid.Column="1" SelectedIndexChanged="availabilty_SelectedIndexChanged" Style="{StaticResource ItemPicker}">
+                    <Picker Grid.Row="6" x:Name="availabilty" Grid.Column="1" SelectedIndexChanged="availabilty_SelectedIndexChanged" Style="{StaticResource ItemPicker}" SelectedIndex="{Binding DefaultIndex1}">
                         <Picker.Items>
                             <x:String>无需基础结构冗余</x:String>
                             <x:String>可用性区域</x:String>
@@ -96,6 +134,7 @@
                             <x:String>可用性集</x:String>
                         </Picker.Items>
                     </Picker>
+                    <Line Grid.Row="7"  VerticalOptions="Center" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="7"  Style="{StaticResource itemLabel}">
                         <Label.FormattedText>
                             <FormattedString>
@@ -104,14 +143,11 @@
                             </FormattedString>
                         </Label.FormattedText>
                     </Label>
-                    <Frame Grid.Row="7" Grid.Column="1">
-                        <CollectionView HeightRequest="70" x:Name="accessAreas" ItemsSource="{Binding Zones}" SelectionMode="Multiple" SelectionChangedCommand="{Binding ZonesIndexChange}" VerticalOptions="Center" SelectionChangedCommandParameter="{x:Reference accessAreas}" SelectionChanged="accessAreas_SelectionChanged">
-                            <CollectionView.ItemsLayout >
-                                <GridItemsLayout Orientation="Vertical" Span="1" />
-                            </CollectionView.ItemsLayout>
+                    <Frame   Grid.Row="7" Grid.Column="1" Style="{StaticResource frameStyle}">
+                        <CollectionView Style="{StaticResource CollectionStyle}" HeightRequest="70" x:Name="accessAreas" ItemsSource="{Binding Zones}" SelectionMode="Multiple" SelectionChangedCommand="{Binding ZonesIndexChange}" VerticalOptions="Center" SelectionChangedCommandParameter="{x:Reference accessAreas}" SelectionChanged="accessAreas_SelectionChanged">
                         </CollectionView>
                     </Frame>
-
+                    <Line Grid.Row="8" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="8" Text="安全类型"  Style="{StaticResource itemLabel}"/>
                     <Picker Grid.Row="8" x:Name="safetymode" Grid.Column="1" SelectedIndexChanged="safetymode_SelectedIndexChanged" SelectedIndex="{Binding DefaultIndex0}" Style="{StaticResource ItemPicker}" >
                         <Picker.Items>
@@ -119,6 +155,8 @@
                             <x:String>受信任启动虚拟机</x:String>
                         </Picker.Items>
                     </Picker>
+
+                    <Line Grid.Row="9" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="9"  Style="{StaticResource itemLabel}">
                         <Label.FormattedText>
                             <FormattedString>
@@ -127,10 +165,14 @@
                             </FormattedString>
                         </Label.FormattedText>
                     </Label>
-                    <Picker Grid.Row="9" x:Name="images" Grid.Column="1" ItemsSource="{Binding Images}"  SelectedIndexChanged="images_SelectedIndexChanged"  SelectedIndex="{Binding DefaultIndex0}" Style="{StaticResource ItemPicker}" />
+                    <Picker Grid.Row="9" x:Name="images" Grid.Column="1" ItemsSource="{Binding Images}"  SelectedIndexChanged="images_SelectedIndexChanged"  SelectedIndex="{Binding DefaultIndex0}" Style="{StaticResource ItemPicker}" >
+                        
+                    </Picker>
 
+                    <Line Grid.Row="10" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="10" Text="Azure现成VM实例"  Style="{StaticResource itemLabel}"/>
                     <CheckBox Grid.Row="10" x:Name="ready_instance" Grid.Column="1"/>
+                    <Line Grid.Row="11" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="11"  Style="{StaticResource itemLabel}" >
                         <Label.FormattedText>
                             <FormattedString>
@@ -143,9 +185,10 @@
 
                     <!--#endregion-->
 
+                    <Line Grid.Row="12" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource BoldBorder}"/>
                     <!--#region 管理员账户-->
                     <Label VerticalTextAlignment="Center" Text="管理员账户" Grid.ColumnSpan="2" FontSize="20" Grid.Row="12"/>
-
+                    <Line Grid.Row="13" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="13" Style="{StaticResource itemLabel}">
                         <Label.FormattedText>
                             <FormattedString>
@@ -159,6 +202,7 @@
                             <x:String>密码</x:String>
                         </Picker.Items>
                     </Picker>
+                    <Line Grid.Row="14" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="14" Style="{StaticResource itemLabel}">
                         <Label.FormattedText>
                             <FormattedString>
@@ -169,8 +213,9 @@
                     </Label>
                     <Entry Style="{StaticResource entryStyle}" Grid.Row="14" Grid.Column="1" x:Name="UserName" Text="{Binding AdminUsername}" />
 
+                    <Line Grid.Row="15" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <!--#region ssh公钥-->
-                    <Frame Grid.Row="15" Grid.RowSpan="2" Grid.ColumnSpan="2" x:Name="sshFrame" IsVisible="False">
+                    <Frame   Style="{StaticResource frameStyle}"  Grid.Row="15" Grid.RowSpan="2" Grid.ColumnSpan="2" x:Name="sshFrame" IsVisible="False">
                         <Grid RowDefinitions="*,2*" ColumnDefinitions="*,*">
                             <Label VerticalTextAlignment="Center" Grid.Row="0"  Style="{StaticResource itemLabel}">
                                 <Label.FormattedText>
@@ -200,7 +245,7 @@
                     <!--#endregion-->
 
                     <!--#region 密码-->
-                    <Frame Grid.Row="15" Grid.RowSpan="2" Grid.ColumnSpan="2" x:Name="pswdFrame">
+                    <Frame  Style="{StaticResource frameStyle}" Grid.Row="15" Grid.RowSpan="2" Grid.ColumnSpan="2" x:Name="pswdFrame" Padding="2,0,0,2">
                         <Grid RowDefinitions="*,2*" ColumnDefinitions="*,*">
                             <Label VerticalTextAlignment="Center" Grid.Row="0" Style="{StaticResource itemLabel}" >
                                 <Label.FormattedText>
@@ -218,15 +263,17 @@
                                     </FormattedString>
                                 </Label.FormattedText>
                             </Label>
-                            <Entry Style="{StaticResource entryStyle}" Grid.Row="1" Grid.Column="1" x:Name="passwd2" IsPassword="True" Completed="passwd2_Completed" Unfocused="passwd2_Completed"/>
+                            <Entry Style="{StaticResource entryStyle}" HorizontalOptions="Start" Grid.Row="1" Grid.Column="1" x:Name="passwd2" IsPassword="True" Completed="passwd2_Completed" Unfocused="passwd2_Completed"/>
                         </Grid>
                     </Frame>
                     <!--#endregion-->
 
                     <!--#endregion-->
 
+                    <Line Grid.Row="17" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource BoldBorder}"/>
                     <!--#region 入站端口规则-->
                     <Label VerticalTextAlignment="Center" Text="入站端口规则" Grid.ColumnSpan="2" FontSize="20" Grid.Row="17"/>
+                    <Line Grid.Row="18" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="18" Style="{StaticResource itemLabel}">
                         <Label.FormattedText>
                             <FormattedString>
@@ -241,6 +288,7 @@
                             <x:String>允许选定的端口</x:String>
                         </Picker.Items>
                     </Picker>
+                    <Line Grid.Row="19" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource ThinBorder}"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="19" BindingContext="{Reference openentryPort}" IsVisible="{Binding SelectedIndex}" Style="{StaticResource itemLabel}" >
                         <Label.FormattedText>
                             <FormattedString>
@@ -254,7 +302,7 @@
                     <!--#endregion-->
                 </Grid>
             </ScrollView>
-            <Button Text="Create" HorizontalOptions="Center" Command="{Binding CreateOrUpdateVM}"/>
+            <Button Text="Create" HorizontalOptions="Center" Clicked="view_clicked"/>
         </StackLayout>
     </ContentPage>
 
@@ -322,6 +370,7 @@
                     <CheckBox Grid.Row="5" Grid.Column="1" x:Name="super_disk_compatible" />
                     <!--#endregion-->
 
+                    <Line Grid.Row="6" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource BoldBorder}"/>
                     <!--#region 数据磁盘-->
                     <Label VerticalTextAlignment="Center" Text="数据磁盘" Grid.Row="6" Grid.ColumnSpan="2" FontSize="20"/>
                     <Label VerticalTextAlignment="Center" Grid.Row="7" Style="{StaticResource itemLabel}">
@@ -341,7 +390,7 @@
     </ContentPage >
 
     <ContentPage BackgroundColor="white" x:Name="Net">
-        <StackLayout Margin="10,5,0,10">
+        <StackLayout Margin="5,5,0,5">
             <Grid ColumnDefinitions="*,2*" >
                 <!--#region 网络接口-->
                 <Label VerticalTextAlignment="Center" Text="网络接口" Grid.ColumnSpan="2" FontSize="20" />
@@ -416,6 +465,7 @@
                 <CheckBox Grid.Row="12" Grid.Column="1" x:Name="faster_network" />
                 <!--#endregion-->
 
+                <Line Grid.Row="13" Grid.ColumnSpan="2" VerticalOptions="Start" Style="{StaticResource BoldBorder}"/>
                 <!--#region 负载均衡-->
                 <Label VerticalTextAlignment="Center" Text="负载均衡" Grid.ColumnSpan="2" FontSize="20" Grid.Row="13"/>
                 <Label VerticalTextAlignment="Center" Grid.Row="14" Style="{StaticResource itemLabel}">
@@ -567,8 +617,8 @@
     <ContentPage BackgroundColor="white" x:Name="Create">
         <StackLayout>
             <ScrollView>
-                <StackLayout Orientation="Vertical" Margin="10,0,0,0">
-                    <Frame Margin="10,5,10,0">
+                <StackLayout Orientation="Vertical" Margin="5,5,0,5">
+                    <Frame  Margin="10,5,10,0">
                         <StackLayout>
                             <Label Text="TERMS"></Label>
                             <Label Text="clicking '创建',I (a) agree to the legal terms and privacy statement(s) associated with the Marketplace offering(s) listed above; (b) authorize Microsoft to bill my current payment method for the fees associated with the offering(s), with the same billing frequency as my Azure subscription; and (c) agree that Microsoft may share my contact, usage and transactional information with the provider(s) of the offering(s) for support, billing and other transactional activities. Microsoft does not provide rights for third-party offerings. See the Azure Marketplace Terms for additional details."/>
@@ -628,7 +678,7 @@
                         </StackLayout>
                         <StackLayout Orientation="Horizontal" Grid.Row="8" Grid.Column="0">
                             <Label Text="大小" Style="{StaticResource itemLabel}"/>
-                            <Label Text="{Binding vm.body.properties.hardWareProfile.vmSize}" Style="{StaticResource itemLabel}"/>
+                            <Label Text="{Binding vm.body.properties.hardwareProfile.vmSize}" Style="{StaticResource itemLabel}"/>
                         </StackLayout>
                         <StackLayout Orientation="Horizontal" Grid.Row="9" Grid.Column="0">
                             <Label Text="身份认证类型" Style="{StaticResource itemLabel}"/>
diff --git a/azure_m/azure_m/azure_m/Views/AddVMDetailsPage.xaml.cs b/azure_m/azure_m/azure_m/Views/AddVMDetailsPage.xaml.cs
index 36ed572b4cc1ba6777af9e6f149bbee2fc4f2352..be83076b9c4fa36456a95b5951c3179dbdb19607 100644
--- a/azure_m/azure_m/azure_m/Views/AddVMDetailsPage.xaml.cs
+++ b/azure_m/azure_m/azure_m/Views/AddVMDetailsPage.xaml.cs
@@ -15,6 +15,21 @@ namespace azure_m.Views
         public AddVmDetailsPage()
         {
             InitializeComponent();
+            ViewModels.VMDetailsViewModel.CreateFinishd += VMDetailsViewModel_CreateFinishd;
+        }
+
+        private void VMDetailsViewModel_CreateFinishd(object sender, int StatusCode)
+        {
+            if(StatusCode < 300 && StatusCode > 199)
+            {
+                Navigation.PopAsync();
+                DisplayAlert($"虚拟机{(sender as ViewModels.VMDetailsViewModel).VMName}创建成功","","OK");
+            }
+            else
+            {
+                Xamarin.Essentials.Vibration.Vibrate(500);
+                DisplayAlert($"虚拟机创建失败", "", "OK");
+            }
         }
 
         private void valid_SelectedIndexChanged(object sender, EventArgs e)
@@ -165,5 +180,11 @@ namespace azure_m.Views
         {
             DeleteOptionChanged?.Invoke(sender, EventArgs.Empty);
         }
+
+        private void view_clicked(object sender, EventArgs eventArgs)
+        {
+            CurrentPage = Create;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/azure_m/azure_m/azure_m/Views/MainPage.xaml b/azure_m/azure_m/azure_m/Views/MainPage.xaml
index 7112b1e0f90c5f5c44c2f71aafd1eabe7784033f..fd210772665d272b7426f07dd46b2b0ea1fa156e 100644
--- a/azure_m/azure_m/azure_m/Views/MainPage.xaml
+++ b/azure_m/azure_m/azure_m/Views/MainPage.xaml
@@ -115,7 +115,7 @@
                     </Grid.ColumnDefinitions>
                     <Label Text="名称" FontAttributes="Bold" Grid.Row="0" Grid.Column="0"/>
                     <Label Text="类型" FontSize="15" HorizontalTextAlignment="Center" Grid.Row="0" Grid.Column="1"/>
-                    <Label Text="上次查看" FontSize="15" Grid.Row="0" Grid.Column="2"/>
+                    <Label Text="地点" FontSize="15" Grid.Row="0" Grid.Column="2" HorizontalOptions="Center"/>
                 </Grid>
                 <ScrollView>
                     <StackLayout x:Name="ResourceLayout" Margin="5,0,0,5" >
diff --git a/azure_m/azure_m/azure_m/Views/MainPage.xaml.cs b/azure_m/azure_m/azure_m/Views/MainPage.xaml.cs
index 2c274921dea0ce5823d918a0095041af8e4189d1..ab8a20c8030acb6c7a7fa3b62f5fe490c23d2e4a 100644
--- a/azure_m/azure_m/azure_m/Views/MainPage.xaml.cs
+++ b/azure_m/azure_m/azure_m/Views/MainPage.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+#define DEBUG
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using Xamarin.Forms;
@@ -23,7 +24,7 @@ namespace azure_m.Views
         /// 
         /// </summary>
         /// <param name="type">0表示Recent，1表示Favorite</param>
-        public void  GetResources(int type = 0)
+        public async void  GetResources(int type = 0)
         {
             ResourceLayout.Children.Clear();
             List<Resource> resources = new List<Resource>();
@@ -31,7 +32,7 @@ namespace azure_m.Views
             //resources = await GetResourcesByApi(type)...
             //resources.sort by type nad name (or linq
 
-            ///DEBUG
+#if DEBUG
             if (type == 0)
                 
             {
@@ -50,7 +51,9 @@ namespace azure_m.Views
                     name = "虚拟机"
                 });
             }
-
+#else
+            resources = await queryResources();
+#endif
             //no resources
             if (resources.Count == 0)
             {
@@ -84,19 +87,19 @@ namespace azure_m.Views
                     {
                         Margin = new Thickness(20, 0, 20, 0),
                         HorizontalOptions = LayoutOptions.FillAndExpand,
-                        BackgroundColor = Color.MintCream,
                         RowSpacing = 10,
                         ColumnDefinitions =
                 {
-                    //new ColumnDefinition { Width = new GridLength (1, GridUnitType.Star) },
                     new ColumnDefinition { Width = new GridLength (1, GridUnitType.Star) },
                     new ColumnDefinition { Width = new GridLength (2, GridUnitType.Star) },
                     new ColumnDefinition { Width = new GridLength (1, GridUnitType.Star) }
                 }
                     };
-                    grid.Children.Add(new Image { Source = getSourceByType(o.type), HeightRequest = 15, VerticalOptions = LayoutOptions.Start }, 0, 0);
-                    grid.Children.Add(new Label { Text = o.name, HeightRequest = grid.Height, VerticalOptions = LayoutOptions.Center, HorizontalOptions = LayoutOptions.Start }, 0, 0);
+                    grid.Children.Add(new Image { Source = getSourceByType(o.type), HeightRequest = 15, HorizontalOptions = LayoutOptions.Start }, 0, 0);
+                    grid.Children.Add(new Label { Text = o.name, HeightRequest = grid.Height, VerticalOptions = LayoutOptions.Center, HorizontalOptions = LayoutOptions.Center }, 0, 0);
                     grid.Children.Add(new Label { Text = o.type, HeightRequest = grid.Height, VerticalOptions = LayoutOptions.Center, HorizontalOptions = LayoutOptions.Center }, 1, 0);
+                    grid.Children.Add(new Label { Text = o.location, HeightRequest = grid.Height, VerticalOptions = LayoutOptions.Center, HorizontalOptions = LayoutOptions.Center }, 2, 0);
+                    grid.Children.Add(new Xamarin.Forms.Shapes.Rectangle { HeightRequest = 1, VerticalOptions = LayoutOptions.End, BackgroundColor = Color.LightGray },0,3,0,1);
                     ResourceLayout.Children.Add(grid);
                 });
             }