diff --git a/HeavenlyWind.Base/HeavenlyWind.Base.csproj b/HeavenlyWind.Base/HeavenlyWind.Base.csproj
index e5431af4..78bad1e4 100644
--- a/HeavenlyWind.Base/HeavenlyWind.Base.csproj
+++ b/HeavenlyWind.Base/HeavenlyWind.Base.csproj
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
@@ -41,23 +41,23 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.103.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.103\lib\net45\System.Data.SQLite.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\lib\net45\System.Data.SQLite.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xaml" />
@@ -85,8 +85,6 @@
     <Compile Include="GameConstants.cs" />
     <Compile Include="HasFlagExtension.cs" />
     <Compile Include="IntegerRangeValidationRule.cs" />
-    <Compile Include="Internal\OldPreference.cs" />
-    <Compile Include="Internal\OldPreferenceMappingAttribute.cs" />
     <Compile Include="LanguageInfo.cs" />
     <Compile Include="LogItem.cs" />
     <Compile Include="Logger.cs" />
@@ -121,6 +119,7 @@
     <Compile Include="Models\Preferences\WindowPreference.cs" />
     <Compile Include="Models\Preferences\WindowsPreference.cs" />
     <Compile Include="Models\ScreenshotImageFormat.cs" />
+    <Compile Include="Models\StatusBarSortieInfoPlacement.cs" />
     <Compile Include="Models\UpdateChannel.cs" />
     <Compile Include="Models\UpdateNotificationMode.cs" />
     <Compile Include="MultiplyConverter.cs" />
@@ -159,12 +158,12 @@
     <EmbeddedResource Include="Resources\Strings\SimplifiedChinese.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" />
+  <Import Project="$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/HeavenlyWind.Base/Internal/OldPreference.cs b/HeavenlyWind.Base/Internal/OldPreference.cs
deleted file mode 100644
index 3c57cc32..00000000
--- a/HeavenlyWind.Base/Internal/OldPreference.cs
+++ /dev/null
@@ -1,285 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Sakuno.KanColle.Amatsukaze.Models;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Sakuno.KanColle.Amatsukaze.Internal
-{
-    class OldPreference
-    {
-        [JsonProperty("language")]
-        [OldPreferenceMapping("main.language")]
-        public string Language { get; private set; }
-
-        [JsonProperty("language_extra")]
-        [OldPreferenceMapping("main.language_extra")]
-        public string ExtraResourceLanguage { get; private set; }
-
-        [JsonProperty("update")]
-        public UpdatePreference Update { get; private set; }
-
-        [JsonProperty("network")]
-        public NetworkPreference Network { get; private set; }
-
-        [JsonProperty("ui")]
-        public UserInterfacePreference UI { get; private set; }
-
-        [JsonProperty("game")]
-        public GamePreference Game { get; private set; }
-
-        [JsonProperty("cache")]
-        public CachePreference Cache { get; private set; }
-
-        [JsonProperty("browser")]
-        public BrowserPreference Browser { get; private set; }
-
-        [JsonProperty("notification")]
-        public NotificationPreference Notification { get; private set; }
-
-        [JsonProperty("windows")]
-        public WindowsPreference Windows { get; private set; }
-
-        [JsonProperty("layout")]
-        public LayoutPreference Layout { get; private set; } = new LayoutPreference();
-
-        [JsonProperty("other")]
-        public OtherPreference Other { get; private set; } = new OtherPreference();
-
-        public class UpdatePreference
-        {
-            [JsonProperty("notification")]
-            [OldPreferenceMapping("update.notification")]
-            public UpdateNotificationMode NotificationMode { get; private set; }
-
-            [JsonProperty("channel")]
-            [OldPreferenceMapping("update.channel")]
-            public UpdateChannel UpdateChannel { get; private set; }
-        }
-        public class NetworkPreference
-        {
-            [JsonProperty("port")]
-            [OldPreferenceMapping("network.port")]
-            public int Port { get; private set; }
-
-            [JsonProperty("allowremoterequests")]
-            [OldPreferenceMapping("network.allow_remote_requests")]
-            public bool AllowRequestsFromOtherDevices { get; private set; }
-
-            [JsonProperty("upstreamproxy")]
-            public UpstreamProxyPreference UpstreamProxy { get; private set; }
-        }
-        public class UpstreamProxyPreference
-        {
-            [JsonProperty("enabled")]
-            [OldPreferenceMapping("network.upstream_proxy.enabled")]
-            public bool Enabled { get; private set; }
-
-            [JsonProperty("host")]
-            [OldPreferenceMapping("network.upstream_proxy.host")]
-            public string Host { get; private set; }
-
-            [JsonProperty("port")]
-            [OldPreferenceMapping("network.upstream_proxy.port")]
-            public int Port { get; private set; }
-
-            [JsonProperty("http_only")]
-            [OldPreferenceMapping("network.upstream_proxy.http_only")]
-            public bool HttpOnly { get; private set; }
-        }
-        public class UserInterfacePreference
-        {
-            [JsonProperty("font")]
-            [OldPreferenceMapping("ui.font")]
-            public string Font { get; private set; }
-
-            [JsonProperty("zoom")]
-            [OldPreferenceMapping("ui.zoom")]
-            public double Zoom { get; private set; }
-
-            [JsonProperty("hd_line")]
-            public HeavyDamageLinePreference HeavyDamageLine { get; private set; }
-
-            [JsonProperty("use_game_material_icons")]
-            [OldPreferenceMapping("ui.use_game_material_icons")]
-            public bool UseGameMaterialIcons { get; private set; }
-        }
-        public class HeavyDamageLinePreference
-        {
-            [JsonProperty("color")]
-            [OldPreferenceMapping("ui.hd_line.color")]
-            public HeavyDamageLineType Type { get; private set; }
-
-            [JsonProperty("width")]
-            [OldPreferenceMapping("ui.hd_line.width")]
-            public int Width { get; private set; }
-        }
-        public class GamePreference
-        {
-            [JsonProperty("main_los_formula")]
-            [OldPreferenceMapping("game.formula.los")]
-            public FleetLoSFormula MainFleetLoSFormula { get; private set; }
-
-            [JsonProperty("main_fp_formula")]
-            [OldPreferenceMapping("game.formula.fighter_power")]
-            public FleetFighterPowerFormula MainFighterPowerFormula { get; private set; }
-
-            [JsonProperty("fatigue_ceiling")]
-            [OldPreferenceMapping("game.fatigue_ceiling")]
-            public int FatigueCeiling { get; private set; }
-
-            [JsonProperty("show_battle_info")]
-            [OldPreferenceMapping("game.sortie.show_battle_info")]
-            public bool ShowBattleInfo { get; private set; }
-
-            [JsonProperty("show_drop")]
-            [OldPreferenceMapping("game.sortie.show_drop")]
-            public bool ShowDrop { get; private set; }
-        }
-        public class CachePreference
-        {
-            [JsonProperty("mode")]
-            [OldPreferenceMapping("cache.mode")]
-            public CacheMode Mode { get; private set; }
-
-            [JsonProperty("path")]
-            [OldPreferenceMapping("cache.path")]
-            public string Path { get; private set; }
-        }
-        public class BrowserPreference
-        {
-            [JsonProperty("zoom")]
-            [OldPreferenceMapping("browser.zoom")]
-            public double Zoom { get; private set; }
-
-            [JsonProperty("homepage")]
-            [OldPreferenceMapping("browser.homepage")]
-            public string Homepage { get; private set; }
-
-            [JsonProperty("layoutengine")]
-            [OldPreferenceMapping("browser.layout_engine")]
-            public string CurrentLayoutEngine { get; private set; }
-
-            [JsonProperty("flash")]
-            public FlashPreference Flash { get; private set; }
-
-            [JsonProperty("screenshot")]
-            public ScreenshotPreference Screenshot { get; private set; }
-
-            [JsonProperty("action_bar_placement")]
-            [OldPreferenceMapping("browser.action_bar.placement")]
-            public bool ActionBarPlacement { get; private set; }
-
-            [JsonProperty("action_bar_stick_to_browser")]
-            [OldPreferenceMapping("browser.action_bar.stick_to_browser")]
-            public bool ActionBarStickToBrowser { get; private set; }
-        }
-        public class FlashPreference
-        {
-            [JsonProperty("quality")]
-            [OldPreferenceMapping("browser.flash.quality")]
-            public FlashQuality Quality { get; private set; }
-
-            [JsonProperty("rendermode")]
-            [OldPreferenceMapping("browser.flash.render_mode")]
-            public FlashRenderMode RenderMode { get; private set; }
-        }
-        public class ScreenshotPreference
-        {
-            [JsonProperty("destination")]
-            [OldPreferenceMapping("browser.screenshot.path")]
-            public string Destination { get; private set; }
-
-            [JsonProperty("filenameformat")]
-            [OldPreferenceMapping("browser.screenshot.filename_format")]
-            public string FilenameFormat { get; private set; }
-            [JsonProperty("imageformat")]
-            [OldPreferenceMapping("browser.screenshot.image_format")]
-            public ScreenshotImageFormat ImageFormat { get; private set; }
-        }
-        public class NotificationPreference
-        {
-            [JsonProperty("expedition")]
-            [OldPreferenceMapping("notification.expedition")]
-            public bool Expedition { get; private set; }
-
-            [JsonProperty("repair")]
-            [OldPreferenceMapping("notification.repair")]
-            public bool Repair { get; private set; }
-
-            [JsonProperty("construction")]
-            [OldPreferenceMapping("notification.construction")]
-            public bool Construction { get; private set; }
-
-            [JsonProperty("heavily_damaged")]
-            [OldPreferenceMapping("notification.heavy_damage")]
-            public bool HeavilyDamagedWarning { get; private set; }
-
-            [JsonProperty("recovery_from_fatigue")]
-            [OldPreferenceMapping("notification.recovery_from_fatigue")]
-            public bool RecoveryFromFatigue { get; private set; }
-
-            [JsonProperty("anchorage_repair")]
-            [OldPreferenceMapping("notification.anchorage_repair")]
-            public bool AnchorageRepair { get; private set; }
-
-            [JsonProperty("sound")]
-            [OldPreferenceMapping("notification.sound")]
-            public NotificationSound Sound { get; private set; }
-            [JsonProperty("sound_filename")]
-            [OldPreferenceMapping("notification.sound_filename")]
-            public string SoundFilename { get; private set; }
-
-            [JsonProperty("sound_hd")]
-            [OldPreferenceMapping("notification.sound_hd")]
-            public NotificationSound HeavilyDamagedWarningSound { get; private set; }
-            [JsonProperty("sound_filename_hd")]
-            [OldPreferenceMapping("notification.sound_filename_hd")]
-            public string HeavilyDamagedWarningSoundFilename { get; private set; }
-        }
-        public class WindowsPreference
-        {
-            [JsonProperty("landscape")]
-            [OldPreferenceMapping("main.windows")]
-            public JToken LandscapeArray { get; private set; }
-        }
-        public class LayoutPreference : ModelBase
-        {
-            [JsonProperty("landscape")]
-            [OldPreferenceMapping("ui.layout.lanscape")]
-            public Dock LandscapeDock { get; private set; }
-
-            [JsonProperty("portrait")]
-            [OldPreferenceMapping("ui.layout.portrait")]
-            public Dock PortraitDock { get; private set; }
-        }
-        public class OtherPreference
-        {
-            [JsonProperty("panic_key")]
-            public PanicKeyPreference PanicKey { get; private set; }
-
-            [JsonProperty("session_tool")]
-            public SessionToolPreference SessionTool { get; private set; }
-        }
-        public class PanicKeyPreference
-        {
-            [JsonProperty("enabled")]
-            [OldPreferenceMapping("other.panic_key.enabled")]
-            public bool Enabled { get; private set; }
-
-            [JsonProperty("modifier_keys")]
-            [OldPreferenceMapping("other.panic_key.modifier_keys")]
-            public int ModifierKeys { get; private set; }
-
-            [JsonProperty("key")]
-            [OldPreferenceMapping("other.panic_key.key")]
-            public int Key { get; private set; }
-        }
-        public class SessionToolPreference
-        {
-            [JsonProperty("start_recording_on_app_startup")]
-            [OldPreferenceMapping("other.session_tool.start_recording_on_app_startup")]
-            public bool StartRecordingOnAppStartup { get; private set; }
-        }
-    }
-}
diff --git a/HeavenlyWind.Base/Internal/OldPreferenceMappingAttribute.cs b/HeavenlyWind.Base/Internal/OldPreferenceMappingAttribute.cs
deleted file mode 100644
index a8729c31..00000000
--- a/HeavenlyWind.Base/Internal/OldPreferenceMappingAttribute.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace Sakuno.KanColle.Amatsukaze.Internal
-{
-    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
-    class OldPreferenceMappingAttribute : Attribute
-    {
-        public string Key { get; }
-
-        public OldPreferenceMappingAttribute(string rpKey)
-        {
-            Key = rpKey;
-        }
-    }
-}
diff --git a/HeavenlyWind.Base/Models/Preferences/GamePreference.cs b/HeavenlyWind.Base/Models/Preferences/GamePreference.cs
index 080938d1..49a9c86c 100644
--- a/HeavenlyWind.Base/Models/Preferences/GamePreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/GamePreference.cs
@@ -19,5 +19,7 @@ public class GamePreference
         public Property<bool> ShipOverview_ExceptSparklingShips { get; } = new Property<bool>("game.overview.ship.filter.except.sparkling");
         public Property<bool> ShipOverview_ExceptLevel1Ships { get; } = new Property<bool>("game.overview.ship.filter.except.lv1");
         public Property<bool> ShipOverview_ExceptMaxModernizationShips { get; } = new Property<bool>("game.overview.ship.filter.except.maxmodernization");
+
+        public Property<bool> DisableHeavyDamageBlinkingWarning { get; } = new Property<bool>("game.disable_heavy_damage_blinking_warning");
     }
 }
diff --git a/HeavenlyWind.Base/Models/Preferences/NetworkPreference.cs b/HeavenlyWind.Base/Models/Preferences/NetworkPreference.cs
index 0b1017c6..f1f0eec0 100644
--- a/HeavenlyWind.Base/Models/Preferences/NetworkPreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/NetworkPreference.cs
@@ -2,6 +2,7 @@
 {
     public class NetworkPreference
     {
+        public Property<bool> PortCustomization { get; } = new Property<bool>("network.port.customization", false);
         public Property<int> Port { get; } = new Property<int>("network.port", 15820);
 
         public Property<bool> AllowRequestsFromOtherDevices { get; } = new Property<bool>("network.allow_remote_requests");
diff --git a/HeavenlyWind.Base/Models/Preferences/Property`T.cs b/HeavenlyWind.Base/Models/Preferences/Property`T.cs
index e4d9cb70..fbe7b866 100644
--- a/HeavenlyWind.Base/Models/Preferences/Property`T.cs
+++ b/HeavenlyWind.Base/Models/Preferences/Property`T.cs
@@ -90,6 +90,8 @@ internal override void Reload(object rpValue)
             }
 
             OnPropertyReloaded();
+
+            OnPropertyChanged(nameof(Value));
         }
 
         public override void Save()
diff --git a/HeavenlyWind.Base/Models/Preferences/UserInterfacePreference.cs b/HeavenlyWind.Base/Models/Preferences/UserInterfacePreference.cs
index 565a7d9e..c2a2d49a 100644
--- a/HeavenlyWind.Base/Models/Preferences/UserInterfacePreference.cs
+++ b/HeavenlyWind.Base/Models/Preferences/UserInterfacePreference.cs
@@ -23,5 +23,9 @@ public class UserInterfacePreference
 
         public Property<bool> UseGameIconsInModernizationMessage { get; } = new Property<bool>("ui.modernization_message_use_game_icons");
         public Property<bool> ShowStatusGrowthInModernizationMessage { get; } = new Property<bool>("ui.modernization_message_show_status_growth");
+
+        public Property<StatusBarSortieInfoPlacement> StatusBarSortieInfo { get; } = new Property<StatusBarSortieInfoPlacement>("ui.startusbar.sortie_info_placement", StatusBarSortieInfoPlacement.Right);
+
+        public Property<bool> SwapPositionOfRepairDocksAndFleetOverviews { get; } = new Property<bool>("ui.exchange_repair_fleets");
     }
 }
diff --git a/HeavenlyWind.Base/Models/StatusBarSortieInfoPlacement.cs b/HeavenlyWind.Base/Models/StatusBarSortieInfoPlacement.cs
new file mode 100644
index 00000000..915b06dd
--- /dev/null
+++ b/HeavenlyWind.Base/Models/StatusBarSortieInfoPlacement.cs
@@ -0,0 +1,9 @@
+namespace Sakuno.KanColle.Amatsukaze.Models
+{
+    public enum StatusBarSortieInfoPlacement
+    {
+        Hidden,
+        Left,
+        Right,
+    }
+}
diff --git a/HeavenlyWind.Base/Preference.cs b/HeavenlyWind.Base/Preference.cs
index 3f1a0649..1a213464 100644
--- a/HeavenlyWind.Base/Preference.cs
+++ b/HeavenlyWind.Base/Preference.cs
@@ -1,12 +1,8 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Sakuno.KanColle.Amatsukaze.Internal;
-using Sakuno.KanColle.Amatsukaze.Models.Preferences;
+using Sakuno.KanColle.Amatsukaze.Models.Preferences;
 using System.Collections.Generic;
 using System.Data.SQLite;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 
 namespace Sakuno.KanColle.Amatsukaze
 {
@@ -59,8 +55,6 @@ public void Reload()
         {
             using (var rTransaction = Connection.BeginTransaction())
             {
-                MigrateFromPreviousVersion();
-
                 var rReloadedProperties = new List<Property>(Property.Instances.Count);
 
                 using (var rCommand = Connection.CreateCommand())
@@ -85,46 +79,8 @@ public void Reload()
                     rProperty.Save();
 
                 rTransaction.Commit();
-            }
-        }
-
-        void MigrateFromPreviousVersion()
-        {
-            var rFile = new FileInfo(@"Preferences\Preference.json");
-            if (!rFile.Exists)
-                return;
-
-            using (var rReader = new JsonTextReader(rFile.OpenText()))
-            {
-                var rSerializer = new JsonSerializer();
-                var rOldPreference = rSerializer.Deserialize<OldPreference>(rReader);
-
-                LoadFromOldPreference(rOldPreference);
-            }
-
-            rFile.Directory.Delete(true);
-        }
-        void LoadFromOldPreference(object rpObject)
-        {
-            foreach (var rOldProperty in rpObject.GetType().GetTypeInfo().DeclaredProperties)
-            {
-                if (!rOldProperty.IsDefined(typeof(OldPreferenceMappingAttribute)) && rOldProperty.PropertyType != typeof(JToken))
-                {
-                    LoadFromOldPreference(rOldProperty.GetValue(rpObject));
-
-                    continue;
-                }
-
-                var rMapping = rOldProperty.GetCustomAttribute<OldPreferenceMappingAttribute>();
-
-                Property rProperty;
-                if (!Property.Instances.TryGetValue(rMapping.Key, out rProperty))
-                    continue;
 
-                if (rProperty.Key != "main.windows")
-                    rProperty.SetValue(rOldProperty.GetValue(rpObject));
-                else
-                    rProperty.SetValue(((JToken)rOldProperty.GetValue(rpObject)).ToObject<WindowPreference[]>());
+                Property.Instances.Clear();
             }
         }
     }
diff --git a/HeavenlyWind.Base/PreferenceExtension.cs b/HeavenlyWind.Base/PreferenceExtension.cs
index 5785736e..0dba7294 100644
--- a/HeavenlyWind.Base/PreferenceExtension.cs
+++ b/HeavenlyWind.Base/PreferenceExtension.cs
@@ -19,6 +19,8 @@ public class PreferenceExtension : MarkupExtension
         public UpdateSourceTrigger UpdateSourceTrigger { get; set; }
         public ValidationRule ValidationRule { get; set; }
 
+        public string StringFormat { get; set; }
+
         public PreferenceExtension(string rpPath)
         {
             r_Path = rpPath + ".Value";
@@ -29,7 +31,7 @@ public override object ProvideValue(IServiceProvider rpServiceProvider)
             if (DesignerProperties.GetIsInDesignMode(r_DesignModeDetector))
                 return DependencyProperty.UnsetValue;
 
-            var rBinding = new Binding(r_Path) { Source = Preference.Instance, Mode = BindingMode.TwoWay, Converter = Converter, ConverterParameter = ConverterParameter, UpdateSourceTrigger = UpdateSourceTrigger };
+            var rBinding = new Binding(r_Path) { Source = Preference.Instance, Mode = BindingMode.TwoWay, Converter = Converter, ConverterParameter = ConverterParameter, UpdateSourceTrigger = UpdateSourceTrigger, StringFormat = StringFormat };
             if (ValidationRule != null)
                 rBinding.ValidationRules.Add(ValidationRule);
 
diff --git a/HeavenlyWind.Base/ProductInfo.cs b/HeavenlyWind.Base/ProductInfo.cs
index 6853ce55..7044001b 100644
--- a/HeavenlyWind.Base/ProductInfo.cs
+++ b/HeavenlyWind.Base/ProductInfo.cs
@@ -5,10 +5,10 @@ public static class ProductInfo
         public const string AppName = "いんてりじぇんと連装砲くん";
         public const string ProductName = "Intelligent Naval Gun";
 
-        public const string AssemblyVersionString = "0.1.13";
+        public const string AssemblyVersionString = "0.1.14";
 
         public static string Version => AssemblyVersionString;
-        public static string ReleaseCodeName => "Kimisaki";
+        public static string ReleaseCodeName => "Pokkle";
 
         public const string UserAgent = "ING/" + AssemblyVersionString;
     }
diff --git a/HeavenlyWind.Base/Resources/Strings/English.xml b/HeavenlyWind.Base/Resources/Strings/English.xml
index 3113ec59..aa5b055e 100644
--- a/HeavenlyWind.Base/Resources/Strings/English.xml
+++ b/HeavenlyWind.Base/Resources/Strings/English.xml
@@ -10,7 +10,7 @@
 
   <String Key="Log_Welcome">Ready</String>
   <String Key="Log_CheckForUpdate_Exception">Error occured when checking for update: {0}</String>
-  <String Key="Log_Exception_API_Failed">Error code from API「{0}」: {1}</String>
+  <String Key="Log_Exception_API_Failed">ERROR CAT! (API: {0}, Code: {1})</String>
   <String Key="Log_Exception_API_ParseException">Error occured when parsing API: {0}</String>
   <String Key="Log_Exception_Cache_FailedToSaveFile">Failed to save file: {0}</String>
   <String Key="Log_ExpeditionResult">/{0}"{1}" has returned from expedition {2}:{3}. (Result: [b]{4}[/b])</String>
@@ -72,10 +72,14 @@ The current version can't handle this problem. To mute/unmute, please do it with
   <String Key="InitializationPage_PortIsOccupied">The port is occupied by the other program</String>
   <String Key="InitializationPage_PortIsOccupied_Solution_KillProcess">Terminate this process</String>
   <String Key="InitializationPage_PortIsOccupied_Solution_ChangePort">Change the port number</String>
+  <String Key="InitializationPage_ConnectionCycle">The port is set casually</String>
+  <String Key="InitializationPage_ConnectionCycle_Content">Did you ignore the warning and kept setting it the same as the one of upstream proxy?</String>
+  <String Key="InitializationPage_ConnectionCycle_Solution_DisablePortCustomization">Disable port customization</String>
   <String Key="InitializationPage_UpstreamProxy">Upstream proxy is unavailable</String>
   <String Key="InitializationPage_UpstreamProxy_Solution_NotStarted">Forgot to start the program which provides the upstream proxy?</String>
   <String Key="InitializationPage_UpstreamProxy_Solution_WrongPort">Wrong port number?</String>
   <String Key="InitializationPage_Retry">Retry</String>
+  <String Key="InitializationPage_Skip">Skip</String>
 
   <String Key="GameInfomation_Waiting">Waiting for KanColle to start</String>
 
@@ -92,7 +96,6 @@ The current version can't handle this problem. To mute/unmute, please do it with
   <String Key="Tab_Maps">Maps</String>
   <String Key="Tab_Sortie">Sortie</String>
   <String Key="Tab_Quests">Quests</String>
-  <String Key="Tab_ExpeditionOverview">Expedition</String>
   <String Key="Tab_Tools">Tools</String>
 
   <String Key="Overview_Headquarter">Headquarter</String>
@@ -237,6 +240,9 @@ The current version can't handle this problem. To mute/unmute, please do it with
   <String Key="Sortie_SupportFleet_Ready">Support Fleet Ready</String>
   <String Key="Sortie_LandBaseAerialSupport_Ready">Land-base Aerial Support Ready</String>
   <String Key="Sortie_EnemyEncounters">Enemy Encounters</String>
+  <String Key="Sortie_EnemyAerialRaid">Enemy Aerial Raid</String>
+  <String Key="Sortie_EnemyAerialRaid_Message">[icon]fuel[/icon] or [icon]bauxite[/icon] has been lost [binding]Amount[/binding]</String>
+  <String Key="Sortie_EnemyAerialRaid_Message_NoDamage">No damage to the land-base</String>
 
   <String Key="AbyssalShip_Class_Normal" />
   <String Key="AbyssalShip_Class_Elite"> elite</String>
@@ -305,11 +311,6 @@ The current version can't handle this problem. To mute/unmute, please do it with
   <String Key="Quest_Requirement_OperationAGo_BossBattleVictory">Boss Battle Victory</String>
   <String Key="Quest_RewardSelection">One of the following</String>
 
-  <String Key="ExpeditionOverview_Time">Time</String>
-  <String Key="ExpeditionOverview_Consumption">Consumption</String>
-  <String Key="ExpeditionOverview_Rewards">Rewards</String>
-  <String Key="ExpeditionOverview_Rewards_GreatSuccessOnly">(Great Success Only)</String>
-
   <String Key="Window_Preferences">Setting</String>
   <String Key="Window_ShipOverview">Ship Overview</String>
   <String Key="Window_EquipmentOverview">Equipment Overview</String>
@@ -369,6 +370,12 @@ The current version can't handle this problem. To mute/unmute, please do it with
   <String Key="PreferenceWindow_UI_ModernizationMessage_Preview_Text_T1">Succeeded to modernize Amatsukaze Kai. (Torpedo MAX, Armor MAX; To MAX: Firepower 1, Luck 50)</String>
   <String Key="PreferenceWindow_UI_ModernizationMessage_Preview_Icon_T2">Succeeded to modernize Amatsukaze Kai. ([icon]torpedo[/icon] MAX, [icon]armor[/icon] MAX; [icon]firepower[/icon] +1, [icon]luck[/icon] +1)</String>
   <String Key="PreferenceWindow_UI_ModernizationMessage_Preview_Text_T2">Succeeded to modernize Amatsukaze Kai. (Torpedo MAX, Armor MAX; Firepower +1, Luck +1)</String>
+  <String Key="PreferenceWindow_UI_ModernizationMessage">Modernization Message</String>
+  <String Key="PreferenceWindow_UI_StatusBarSortieInfo">Sortie info in the status bar</String>
+  <String Key="PreferenceWindow_UI_StatusBarSortieInfo_Hidden">Hidden</String>
+  <String Key="PreferenceWindow_UI_StatusBarSortieInfo_Left">Left side</String>
+  <String Key="PreferenceWindow_UI_StatusBarSortieInfo_Right">Right side</String>
+  <String Key="PreferenceWindow_UI_SwapPositionOfRepairDocksAndFleetOverview">Exchange position of repair docks and fleet overview</String>
   <String Key="PreferenceWindow_Cache">Cache</String>
   <String Key="PreferenceWindow_Cache_Mode">Cache Mode</String>
   <String Key="PreferenceWindow_Cache_Mode_Disabled">Disabled</String>
@@ -379,6 +386,7 @@ The current version can't handle this problem. To mute/unmute, please do it with
   <String Key="PreferenceWindow_Behaviour_FatigueCeiling">Max fatigue value</String>
   <String Key="PreferenceWindow_Behaviour_ShowBattleInfo">Show battle info</String>
   <String Key="PreferenceWindow_Behaviour_ShowDrop">Show drop</String>
+  <String Key="PreferenceWindow_Behaviour_DisableHeavyDamageBlinkingWarning">Disable heavy damage blink warning</String>
   <String Key="PreferenceWindow_Notification">Notification</String>
   <String Key="PreferenceWindow_Notification_Construction">Notify the completion of construction</String>
   <String Key="PreferenceWindow_Notification_Expedition">Notify the return from an expedition</String>
@@ -489,8 +497,12 @@ The current version can't handle this problem. To mute/unmute, please do it with
   <String Key="ScrappingHistory_Reason_ConsumedInBattle">Battle</String>
 
   <String Key="ResourceHistory_Diff">Diff</String>
-
-  <String Key="Tool_ExpeditionOverview">Expedition Overview</String>
+  <String Key="ResourceHistory_Type">Type</String>
+  <String Key="ResourceHistory_Type_Detail">Detail</String>
+  <String Key="ResourceHistory_Type_Daily">Day</String>
+  <String Key="ResourceHistory_Type_Weekly">Week</String>
+  <String Key="ResourceHistory_Type_Monthly">Month</String>
+  <String Key="ResourceHistory_Week_Format">Week {0}</String>
 
   <String Key="ScreenshotTool_Title">Screenshot Tool</String>
   <String Key="ScreenshotTool_General">General</String>
@@ -527,7 +539,13 @@ The current version can't handle this problem. To mute/unmute, please do it with
   <String Key="SortieStatistic_TimeSpan_Yesterday">Yesterday</String>
   <String Key="SortieStatistic_TimeSpan_LastWeek">Last week</String>
   <String Key="SortieStatistic_TimeSpan_LastMonth">Last month</String>
+  <String Key="SortieStatistic_TimeSpan_Custom">Custom</String>
+  <String Key="SortieStatistic_CustomTimeSpan_Start">Start</String>
+  <String Key="SortieStatistic_CustomTimeSpan_End">End</String>
+  <String Key="SortieStatistic_PastAreas">Past event areas</String>
   <String Key="SortieStatistic_Count">Count</String>
   <String Key="SortieStatistic_RankingPoints">Points</String>
 
+  <String Key="SortieMap_UnderConstruction">The map is under construction</String>
+
 </Strings>
\ No newline at end of file
diff --git a/HeavenlyWind.Base/Resources/Strings/Japanese.xml b/HeavenlyWind.Base/Resources/Strings/Japanese.xml
index 092daba5..8125c5d5 100644
--- a/HeavenlyWind.Base/Resources/Strings/Japanese.xml
+++ b/HeavenlyWind.Base/Resources/Strings/Japanese.xml
@@ -10,7 +10,7 @@
 
   <String Key="Log_Welcome">提督が鎮守府に着任しました。これより艦隊の指揮に入ります！</String>
   <String Key="Log_CheckForUpdate_Exception">更新の確認中にエラーが発生しました: {0}</String>
-  <String Key="Log_Exception_API_Failed">API「{0}」のエラーコードを受信しました: {1}</String>
+  <String Key="Log_Exception_API_Failed">ネコった！ (API: {0}、コード: {1})</String>
   <String Key="Log_Exception_API_ParseException">API の解析中にエラーが発生しました: {0}</String>
   <String Key="Log_Exception_Cache_FailedToSaveFile">ファイルの保存に失敗しました: {0}</String>
   <String Key="Log_ExpeditionResult">/{0}「{1}」が遠征「{2}:{3}」から帰投しました。(結果: [b]{4}[/b])</String>
@@ -70,10 +70,14 @@
   <String Key="InitializationPage_PortIsOccupied">待ち受けポートが他のアプリで使用されています</String>
   <String Key="InitializationPage_PortIsOccupied_Solution_KillProcess">このプロセスを終了します</String>
   <String Key="InitializationPage_PortIsOccupied_Solution_ChangePort">ポートを変更します</String>
+  <String Key="InitializationPage_ConnectionCycle">待ち受けポートがかってに設定されました</String>
+  <String Key="InitializationPage_ConnectionCycle_Content">あなたは警告を無視して、待ち受けポートを上流プロキシのポートと同じことに設定しますか？</String>
+  <String Key="InitializationPage_ConnectionCycle_Solution_DisablePortCustomization">待ち受けポートのカスタマイズを無効にします</String>
   <String Key="InitializationPage_UpstreamProxy">上流プロキシが利用できません</String>
   <String Key="InitializationPage_UpstreamProxy_Solution_NotStarted">アプリを開くのは忘れましたか？</String>
   <String Key="InitializationPage_UpstreamProxy_Solution_WrongPort">ポート番号が間違ってませんか？</String>
   <String Key="InitializationPage_Retry">再試行</String>
+  <String Key="InitializationPage_Skip">スキップ</String>
 
   <String Key="GameInfomation_Waiting">艦これの起動を待っています</String>
 
@@ -90,7 +94,6 @@
   <String Key="Tab_Maps">海域</String>
   <String Key="Tab_Sortie">出撃</String>
   <String Key="Tab_Quests">任務</String>
-  <String Key="Tab_ExpeditionOverview">遠征一覧</String>
   <String Key="Tab_Tools">ツール</String>
 
   <String Key="Overview_Headquarter">司令部</String>
@@ -235,6 +238,9 @@
   <String Key="Sortie_SupportFleet_Ready">支援艦隊待機中</String>
   <String Key="Sortie_LandBaseAerialSupport_Ready">基地航空隊は空襲を準備中</String>
   <String Key="Sortie_EnemyEncounters">遭遇できる敵艦隊</String>
+  <String Key="Sortie_EnemyAerialRaid">敵空襲</String>
+  <String Key="Sortie_EnemyAerialRaid_Message">[icon]fuel[/icon] または [icon]bauxite[/icon] が [binding]Amount[/binding] 喪失しました</String>
+  <String Key="Sortie_EnemyAerialRaid_Message_NoDamage">空襲による基地の損害はありません</String>
 
   <String Key="AbyssalShip_Class_Normal" />
   <String Key="AbyssalShip_Class_Elite">elite</String>
@@ -303,11 +309,6 @@
   <String Key="Quest_Requirement_OperationAGo_BossBattleVictory">ボス勝利</String>
   <String Key="Quest_RewardSelection">下記のいずれか一つ</String>
 
-  <String Key="ExpeditionOverview_Time">時間</String>
-  <String Key="ExpeditionOverview_Consumption">消費</String>
-  <String Key="ExpeditionOverview_Rewards">ボーナス</String>
-  <String Key="ExpeditionOverview_Rewards_GreatSuccessOnly">(大成功のみ)</String>
-
   <String Key="Window_Preferences">設定</String>
   <String Key="Window_ShipOverview">艦娘一覧</String>
   <String Key="Window_EquipmentOverview">装備一覧</String>
@@ -368,6 +369,11 @@
   <String Key="PreferenceWindow_UI_ModernizationMessage_Preview_Text_T1">「天津風改」の近代化改修に成功しました。(雷装 MAX、装甲 MAX。 MAX まで: 火力 1、運 50)</String>
   <String Key="PreferenceWindow_UI_ModernizationMessage_Preview_Icon_T2">「天津風改」の近代化改修に成功しました。([icon]torpedo[/icon] MAX、[icon]armor[/icon] MAX。 [icon]firepower[/icon] +1、[icon]luck[/icon] +1)</String>
   <String Key="PreferenceWindow_UI_ModernizationMessage_Preview_Text_T2">「天津風改」の近代化改修に成功しました。(雷装 MAX、装甲 MAX。 火力 +1、運 +1)</String>
+  <String Key="PreferenceWindow_UI_StatusBarSortieInfo">ステータスバーでの出撃情報</String>
+  <String Key="PreferenceWindow_UI_StatusBarSortieInfo_Hidden">無効</String>
+  <String Key="PreferenceWindow_UI_StatusBarSortieInfo_Left">左側に表示する</String>
+  <String Key="PreferenceWindow_UI_StatusBarSortieInfo_Right">右側に表示する</String>
+  <String Key="PreferenceWindow_UI_SwapPositionOfRepairDocksAndFleetOverview">入渠や艦隊一覧の位置をスワップする</String>
   <String Key="PreferenceWindow_Cache">キャッシュ</String>
   <String Key="PreferenceWindow_Cache_Mode">キャッシュモード</String>
   <String Key="PreferenceWindow_Cache_Mode_Disabled">無効</String>
@@ -378,6 +384,7 @@
   <String Key="PreferenceWindow_Behaviour_FatigueCeiling">疲労度上限</String>
   <String Key="PreferenceWindow_Behaviour_ShowBattleInfo">戦闘情報を表示する</String>
   <String Key="PreferenceWindow_Behaviour_ShowDrop">ドロップを表示する</String>
+  <String Key="PreferenceWindow_Behaviour_DisableHeavyDamageBlinkingWarning">大破点滅警告を無効にする</String>
   <String Key="PreferenceWindow_Notification">通知</String>
   <String Key="PreferenceWindow_Notification_Construction">建造完了を通知する</String>
   <String Key="PreferenceWindow_Notification_Expedition">遠征帰投を通知する</String>
@@ -488,8 +495,12 @@
   <String Key="ScrappingHistory_Reason_ConsumedInBattle">戦闘</String>
 
   <String Key="ResourceHistory_Diff">差異</String>
-
-  <String Key="Tool_ExpeditionOverview">遠征一覧</String>
+  <String Key="ResourceHistory_Type">タイプ</String>
+  <String Key="ResourceHistory_Type_Detail">詳細</String>
+  <String Key="ResourceHistory_Type_Daily">毎日</String>
+  <String Key="ResourceHistory_Type_Weekly">毎週</String>
+  <String Key="ResourceHistory_Type_Monthly">毎月</String>
+  <String Key="ResourceHistory_Week_Format">第 {0} 週</String>
 
   <String Key="ScreenshotTool_Title">スクリーンショットツール</String>
   <String Key="ScreenshotTool_General">通常</String>
@@ -526,7 +537,13 @@
   <String Key="SortieStatistic_TimeSpan_Yesterday">昨日</String>
   <String Key="SortieStatistic_TimeSpan_LastWeek">先週</String>
   <String Key="SortieStatistic_TimeSpan_LastMonth">先月</String>
+  <String Key="SortieStatistic_TimeSpan_Custom">カスタム</String>
+  <String Key="SortieStatistic_CustomTimeSpan_Start">開始</String>
+  <String Key="SortieStatistic_CustomTimeSpan_End">終了</String>
+  <String Key="SortieStatistic_PastAreas">過去のイベント</String>
   <String Key="SortieStatistic_Count">回数</String>
   <String Key="SortieStatistic_RankingPoints">戦果</String>
 
+  <String Key="SortieMap_UnderConstruction">出撃地図未実装</String>
+
 </Strings>
\ No newline at end of file
diff --git a/HeavenlyWind.Base/Resources/Strings/SimplifiedChinese.xml b/HeavenlyWind.Base/Resources/Strings/SimplifiedChinese.xml
index 1b86b912..2f682254 100644
--- a/HeavenlyWind.Base/Resources/Strings/SimplifiedChinese.xml
+++ b/HeavenlyWind.Base/Resources/Strings/SimplifiedChinese.xml
@@ -10,7 +10,7 @@
 
   <String Key="Log_Welcome">提督が鎮守府に着任しました。これより艦隊の指揮に入ります！</String>
   <String Key="Log_CheckForUpdate_Exception">检查更新时发生错误: {0}</String>
-  <String Key="Log_Exception_API_Failed">API「{0}」返回错误代码：{1} </String>
+  <String Key="Log_Exception_API_Failed">猫了！ (API: {0}；代号: {1})</String>
   <String Key="Log_Exception_API_ParseException">解析 API 时发生错误: {0}</String>
   <String Key="Log_Exception_Cache_FailedToSaveFile">保存缓存文件失败: {0}</String>
   <String Key="Log_ExpeditionResult">/{0}「{1}」从远征「{2}:{3}」归来。(结果: [b]{4}[/b])</String>
@@ -72,10 +72,14 @@
   <String Key="InitializationPage_PortIsOccupied">端口被以下的程序占用</String>
   <String Key="InitializationPage_PortIsOccupied_Solution_KillProcess">结束该进程</String>
   <String Key="InitializationPage_PortIsOccupied_Solution_ChangePort">更换端口</String>
+  <String Key="InitializationPage_ConnectionCycle">胡乱设置端口</String>
+  <String Key="InitializationPage_ConnectionCycle_Content">你是不是无视警告，把本地代理端口也设置成上游代理的端口？如果这样强行继续下去，工具是无法接收到任何数据！</String>
+  <String Key="InitializationPage_ConnectionCycle_Solution_DisablePortCustomization">禁用自定义本地代理端口</String>
   <String Key="InitializationPage_UpstreamProxy">上游代理未开启</String>
   <String Key="InitializationPage_UpstreamProxy_Solution_NotStarted">是不是忘记了开启代理？</String>
   <String Key="InitializationPage_UpstreamProxy_Solution_WrongPort">是不是端口错了？</String>
   <String Key="InitializationPage_Retry">重试</String>
+  <String Key="InitializationPage_Skip">跳过</String>
 
   <String Key="GameInfomation_Waiting">等待游戏启动</String>
 
@@ -92,7 +96,6 @@
   <String Key="Tab_Maps">海域</String>
   <String Key="Tab_Sortie">出击</String>
   <String Key="Tab_Quests">任务</String>
-  <String Key="Tab_ExpeditionOverview">远征一览</String>
   <String Key="Tab_Tools">工具</String>
 
   <String Key="Overview_Headquarter">司令部</String>
@@ -116,7 +119,7 @@
   <String Key="Overview_ShipOverview">舰娘一览</String>
   <String Key="Overview_EquipmentOverview">装备一览</String>
   <String Key="Overview_Fleets">舰队一览</String>
-  <String Key="Overview_Fleets_Idle">等待中</String>
+  <String Key="Overview_Fleets_Idle">待机中</String>
   <String Key="Overview_Fleets_Sortie">出击中</String>
   <String Key="Overview_Fleets_Unsupplied">未补给</String>
   <String Key="Overview_Fleets_HeavilyDamaged">有大破船</String>
@@ -237,6 +240,9 @@
   <String Key="Sortie_SupportFleet_Ready">支援舰队等待中</String>
   <String Key="Sortie_LandBaseAerialSupport_Ready">基地航空队准备实施空袭</String>
   <String Key="Sortie_EnemyEncounters">可能遭遇的敌方舰队</String>
+  <String Key="Sortie_EnemyAerialRaid">敵空襲</String>
+  <String Key="Sortie_EnemyAerialRaid_Message">[icon]fuel[/icon] 或 [icon]bauxite[/icon] 损失了 [binding]Amount[/binding]</String>
+  <String Key="Sortie_EnemyAerialRaid_Message_NoDamage">没有受到任何损失</String>
 
   <String Key="AbyssalShip_Class_Normal" />
   <String Key="AbyssalShip_Class_Elite">elite</String>
@@ -305,11 +311,6 @@
   <String Key="Quest_Requirement_OperationAGo_BossBattleVictory">Boss 战胜利</String>
   <String Key="Quest_RewardSelection">单选</String>
 
-  <String Key="ExpeditionOverview_Time">时间</String>
-  <String Key="ExpeditionOverview_Consumption">消费</String>
-  <String Key="ExpeditionOverview_Rewards">奖励</String>
-  <String Key="ExpeditionOverview_Rewards_GreatSuccessOnly">(仅大成功)</String>
-
   <String Key="Window_Preferences">设置</String>
   <String Key="Window_ShipOverview">舰娘一览</String>
   <String Key="Window_EquipmentOverview">装备一览</String>
@@ -327,7 +328,7 @@
 
   <String Key="PreferenceWindow_Network">网络</String>
   <String Key="PreferenceWindow_Network_Port">本地代理端口</String>
-  <String Key="PreferenceWindow_Network_Port_Customization">指定本地代理端口</String>
+  <String Key="PreferenceWindow_Network_Port_Customization">自定义本地代理端口</String>
   <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Instruction">真的要修改吗？</String>
   <String Key="PreferenceWindow_Network_Port_Customization_Dialog_Content">该端口属于用于接收来自浏览器的数据包的本地代理。除非遇到端口被占用等情况，一般不建议修改该端口值。
 
@@ -371,6 +372,11 @@
   <String Key="PreferenceWindow_UI_ModernizationMessage_Preview_Text_T1">「天津風改」的近代化改修成功了。(雷装 MAX、装甲 MAX。 距离 MAX 还有: 火力 1、运 50)</String>
   <String Key="PreferenceWindow_UI_ModernizationMessage_Preview_Icon_T2">「天津風改」的近代化改修成功了。([icon]torpedo[/icon] MAX、[icon]armor[/icon] MAX。 [icon]firepower[/icon] +1、[icon]luck[/icon] +1)</String>
   <String Key="PreferenceWindow_UI_ModernizationMessage_Preview_Text_T2">「天津風改」的近代化改修成功了。(雷装 MAX、装甲 MAX。火力 +1、运 +1)</String>
+  <String Key="PreferenceWindow_UI_StatusBarSortieInfo">状态栏上的出击信息</String>
+  <String Key="PreferenceWindow_UI_StatusBarSortieInfo_Hidden">隐藏</String>
+  <String Key="PreferenceWindow_UI_StatusBarSortieInfo_Left">显示在左侧</String>
+  <String Key="PreferenceWindow_UI_StatusBarSortieInfo_Right">显示在右侧</String>
+  <String Key="PreferenceWindow_UI_SwapPositionOfRepairDocksAndFleetOverview">交换修理渠和舰队一览的位置</String>
   <String Key="PreferenceWindow_Cache">缓存</String>
   <String Key="PreferenceWindow_Cache_Mode">缓存模式</String>
   <String Key="PreferenceWindow_Cache_Mode_Disabled">禁用</String>
@@ -381,6 +387,7 @@
   <String Key="PreferenceWindow_Behaviour_FatigueCeiling">疲劳上限</String>
   <String Key="PreferenceWindow_Behaviour_ShowBattleInfo">显示战斗信息(剧透)</String>
   <String Key="PreferenceWindow_Behaviour_ShowDrop">显示掉落</String>
+  <String Key="PreferenceWindow_Behaviour_DisableHeavyDamageBlinkingWarning">禁用大破闪烁警告</String>
   <String Key="PreferenceWindow_Notification">通知</String>
   <String Key="PreferenceWindow_Notification_Construction">在建造完成时通知</String>
   <String Key="PreferenceWindow_Notification_Expedition">在远征归来时通知</String>
@@ -491,8 +498,12 @@
   <String Key="ScrappingHistory_Reason_ConsumedInBattle">战斗</String>
 
   <String Key="ResourceHistory_Diff">差异</String>
-
-  <String Key="Tool_ExpeditionOverview">远征一览</String>
+  <String Key="ResourceHistory_Type">类型</String>
+  <String Key="ResourceHistory_Type_Detail">详细</String>
+  <String Key="ResourceHistory_Type_Daily">毎日</String>
+  <String Key="ResourceHistory_Type_Weekly">毎周</String>
+  <String Key="ResourceHistory_Type_Monthly">毎月</String>
+  <String Key="ResourceHistory_Week_Format">第 {0} 周</String>
 
   <String Key="ScreenshotTool_Title">截图工具</String>
   <String Key="ScreenshotTool_General">一般</String>
@@ -529,7 +540,13 @@
   <String Key="SortieStatistic_TimeSpan_Yesterday">昨天</String>
   <String Key="SortieStatistic_TimeSpan_LastWeek">上周</String>
   <String Key="SortieStatistic_TimeSpan_LastMonth">上个月</String>
+  <String Key="SortieStatistic_TimeSpan_Custom">自定义</String>
+  <String Key="SortieStatistic_CustomTimeSpan_Start">开始</String>
+  <String Key="SortieStatistic_CustomTimeSpan_End">结束</String>
+  <String Key="SortieStatistic_PastAreas">过往的活动海域</String>
   <String Key="SortieStatistic_Count">次数</String>
   <String Key="SortieStatistic_RankingPoints">战果</String>
 
+  <String Key="SortieMap_UnderConstruction">地图功能仍未实现</String>
+
 </Strings>
\ No newline at end of file
diff --git a/HeavenlyWind.Base/SQLiteDataReaderExtensions.cs b/HeavenlyWind.Base/SQLiteDataReaderExtensions.cs
index a8fa6a3c..0840359e 100644
--- a/HeavenlyWind.Base/SQLiteDataReaderExtensions.cs
+++ b/HeavenlyWind.Base/SQLiteDataReaderExtensions.cs
@@ -41,6 +41,7 @@ public static double GetDouble(this SQLiteDataReader rpReader, string rpColumn)
 
             return (double)rResult;
         }
+
         public static bool? GetBooleanOptional(this SQLiteDataReader rpReader, string rpColumn)
         {
             var rResult = rpReader[rpColumn];
@@ -78,6 +79,43 @@ public static double GetDouble(this SQLiteDataReader rpReader, string rpColumn)
             return (double)rResult;
         }
 
+        public static bool? GetBooleanOptional(this SQLiteDataReader rpReader, int rpOrdinal)
+        {
+            var rResult = rpReader[rpOrdinal];
+
+            if (rResult == DBNull.Value)
+                return null;
+
+            return Convert.ToBoolean(rResult);
+        }
+        public static int? GetInt32Optional(this SQLiteDataReader rpReader, int rpOrdinal)
+        {
+            var rResult = rpReader[rpOrdinal];
+
+            if (rResult == DBNull.Value)
+                return null;
+
+            return Convert.ToInt32(rResult);
+        }
+        public static long? GetInt64Optional(this SQLiteDataReader rpReader, int rpOrdinal)
+        {
+            var rResult = rpReader[rpOrdinal];
+
+            if (rResult == DBNull.Value)
+                return null;
+
+            return (long)rResult;
+        }
+        public static double? GetDoubleOptional(this SQLiteDataReader rpReader, int rpOrdinal)
+        {
+            var rResult = rpReader[rpOrdinal];
+
+            if (rResult == DBNull.Value)
+                return null;
+
+            return (double)rResult;
+        }
+
         public static string GetString(this SQLiteDataReader rpReader, string rpColumn)
         {
             var rResult = rpReader[rpColumn];
diff --git a/HeavenlyWind.Base/StringResources.Items.cs b/HeavenlyWind.Base/StringResources.Items.cs
index 8ec3d74d..4d35f700 100644
--- a/HeavenlyWind.Base/StringResources.Items.cs
+++ b/HeavenlyWind.Base/StringResources.Items.cs
@@ -74,10 +74,14 @@ partial class StringResourcesItems
         public string InitializationPage_PortIsOccupied => GetString(nameof(InitializationPage_PortIsOccupied));
         public string InitializationPage_PortIsOccupied_Solution_KillProcess => GetString(nameof(InitializationPage_PortIsOccupied_Solution_KillProcess));
         public string InitializationPage_PortIsOccupied_Solution_ChangePort => GetString(nameof(InitializationPage_PortIsOccupied_Solution_ChangePort));
+        public string InitializationPage_ConnectionCycle => GetString(nameof(InitializationPage_ConnectionCycle));
+        public string InitializationPage_ConnectionCycle_Content => GetString(nameof(InitializationPage_ConnectionCycle_Content));
+        public string InitializationPage_ConnectionCycle_Solution_DisablePortCustomization => GetString(nameof(InitializationPage_ConnectionCycle_Solution_DisablePortCustomization));
         public string InitializationPage_UpstreamProxy => GetString(nameof(InitializationPage_UpstreamProxy));
         public string InitializationPage_UpstreamProxy_Solution_NotStarted => GetString(nameof(InitializationPage_UpstreamProxy_Solution_NotStarted));
         public string InitializationPage_UpstreamProxy_Solution_WrongPort => GetString(nameof(InitializationPage_UpstreamProxy_Solution_WrongPort));
         public string InitializationPage_Retry => GetString(nameof(InitializationPage_Retry));
+        public string InitializationPage_Skip => GetString(nameof(InitializationPage_Skip));
 
         public string GameInfomation_Waiting => GetString(nameof(GameInfomation_Waiting));
 
@@ -93,7 +97,6 @@ partial class StringResourcesItems
         public string Tab_Overview => GetString(nameof(Tab_Overview));
         public string Tab_Sortie => GetString(nameof(Tab_Sortie));
         public string Tab_Quests => GetString(nameof(Tab_Quests));
-        public string Tab_ExpeditionOverview => GetString(nameof(Tab_ExpeditionOverview));
         public string Tab_Tools => GetString(nameof(Tab_Tools));
 
         public string Overview_Headquarter => GetString(nameof(Overview_Headquarter));
@@ -238,6 +241,9 @@ partial class StringResourcesItems
         public string Sortie_SupportFleet_Ready => GetString(nameof(Sortie_SupportFleet_Ready));
         public string Sortie_LandBaseAerialSupport_Ready => GetString(nameof(Sortie_LandBaseAerialSupport_Ready));
         public string Sortie_EnemyEncounters => GetString(nameof(Sortie_EnemyEncounters));
+        public string Sortie_EnemyAerialRaid => GetString(nameof(Sortie_EnemyAerialRaid));
+        public string Sortie_EnemyAerialRaid_Message => GetString(nameof(Sortie_EnemyAerialRaid_Message));
+        public string Sortie_EnemyAerialRaid_Message_NoDamage => GetString(nameof(Sortie_EnemyAerialRaid_Message_NoDamage));
 
         public string AbyssalShip_Class_Normal => GetString(nameof(AbyssalShip_Class_Normal));
         public string AbyssalShip_Class_Elite => GetString(nameof(AbyssalShip_Class_Elite));
@@ -306,11 +312,6 @@ partial class StringResourcesItems
         public string Quest_Requirement_OperationAGo_BossBattleVictory => GetString(nameof(Quest_Requirement_OperationAGo_BossBattleVictory));
         public string Quest_RewardSelection => GetString(nameof(Quest_RewardSelection));
 
-        public string ExpeditionOverview_Time => GetString(nameof(ExpeditionOverview_Time));
-        public string ExpeditionOverview_Consumption => GetString(nameof(ExpeditionOverview_Consumption));
-        public string ExpeditionOverview_Rewards => GetString(nameof(ExpeditionOverview_Rewards));
-        public string ExpeditionOverview_Rewards_GreatSuccessOnly => GetString(nameof(ExpeditionOverview_Rewards_GreatSuccessOnly));
-
         public string Window_Preferences => GetString(nameof(Window_Preferences));
         public string Window_ShipOverview => GetString(nameof(Window_ShipOverview));
         public string Window_EquipmentOverview => GetString(nameof(Window_EquipmentOverview));
@@ -370,6 +371,11 @@ partial class StringResourcesItems
         public string PreferenceWindow_UI_ModernizationMessage_Preview_Text_T1 => GetString(nameof(PreferenceWindow_UI_ModernizationMessage_Preview_Text_T1));
         public string PreferenceWindow_UI_ModernizationMessage_Preview_Icon_T2 => GetString(nameof(PreferenceWindow_UI_ModernizationMessage_Preview_Icon_T2));
         public string PreferenceWindow_UI_ModernizationMessage_Preview_Text_T2 => GetString(nameof(PreferenceWindow_UI_ModernizationMessage_Preview_Text_T2));
+        public string PreferenceWindow_UI_StatusBarSortieInfo => GetString(nameof(PreferenceWindow_UI_StatusBarSortieInfo));
+        public string PreferenceWindow_UI_StatusBarSortieInfo_Hidden => GetString(nameof(PreferenceWindow_UI_StatusBarSortieInfo_Hidden));
+        public string PreferenceWindow_UI_StatusBarSortieInfo_Left => GetString(nameof(PreferenceWindow_UI_StatusBarSortieInfo_Left));
+        public string PreferenceWindow_UI_StatusBarSortieInfo_Right => GetString(nameof(PreferenceWindow_UI_StatusBarSortieInfo_Right));
+        public string PreferenceWindow_UI_SwapPositionOfRepairDocksAndFleetOverview => GetString(nameof(PreferenceWindow_UI_SwapPositionOfRepairDocksAndFleetOverview));
         public string PreferenceWindow_Cache => GetString(nameof(PreferenceWindow_Cache));
         public string PreferenceWindow_Cache_Mode => GetString(nameof(PreferenceWindow_Cache_Mode));
         public string PreferenceWindow_Cache_Mode_Disabled => GetString(nameof(PreferenceWindow_Cache_Mode_Disabled));
@@ -380,6 +386,7 @@ partial class StringResourcesItems
         public string PreferenceWindow_Behaviour_FatigueCeiling => GetString(nameof(PreferenceWindow_Behaviour_FatigueCeiling));
         public string PreferenceWindow_Behaviour_ShowBattleInfo => GetString(nameof(PreferenceWindow_Behaviour_ShowBattleInfo));
         public string PreferenceWindow_Behaviour_ShowDrop => GetString(nameof(PreferenceWindow_Behaviour_ShowDrop));
+        public string PreferenceWindow_Behaviour_DisableHeavyDamageBlinkingWarning => GetString(nameof(PreferenceWindow_Behaviour_DisableHeavyDamageBlinkingWarning));
         public string PreferenceWindow_Notification => GetString(nameof(PreferenceWindow_Notification));
         public string PreferenceWindow_Notification_Construction => GetString(nameof(PreferenceWindow_Notification_Construction));
         public string PreferenceWindow_Notification_Expedition => GetString(nameof(PreferenceWindow_Notification_Expedition));
@@ -490,8 +497,12 @@ partial class StringResourcesItems
         public string ScrappingHistory_Reason_ConsumedInBattle => GetString(nameof(ScrappingHistory_Reason_ConsumedInBattle));
 
         public string ResourceHistory_Diff => GetString(nameof(ResourceHistory_Diff));
-
-        public string Tool_ExpeditionOverview => GetString(nameof(Tool_ExpeditionOverview));
+        public string ResourceHistory_Type => GetString(nameof(ResourceHistory_Type));
+        public string ResourceHistory_Type_Detail => GetString(nameof(ResourceHistory_Type_Detail));
+        public string ResourceHistory_Type_Day => GetString(nameof(ResourceHistory_Type_Day));
+        public string ResourceHistory_Type_Weekly => GetString(nameof(ResourceHistory_Type_Weekly));
+        public string ResourceHistory_Type_Monthly => GetString(nameof(ResourceHistory_Type_Monthly));
+        public string ResourceHistory_Week_Format => GetString(nameof(ResourceHistory_Week_Format));
 
         public string ScreenshotTool_Title => GetString(nameof(ScreenshotTool_Title));
         public string ScreenshotTool_General => GetString(nameof(ScreenshotTool_General));
@@ -528,8 +539,14 @@ partial class StringResourcesItems
         public string SortieStatistic_TimeSpan_Yesterday => GetString(nameof(SortieStatistic_TimeSpan_Yesterday));
         public string SortieStatistic_TimeSpan_LastWeek => GetString(nameof(SortieStatistic_TimeSpan_LastWeek));
         public string SortieStatistic_TimeSpan_LastMonth => GetString(nameof(SortieStatistic_TimeSpan_LastMonth));
+        public string SortieStatistic_TimeSpan_Custom => GetString(nameof(SortieStatistic_TimeSpan_Custom));
+        public string SortieStatistic_CustomTimeSpan_Start => GetString(nameof(SortieStatistic_CustomTimeSpan_Start));
+        public string SortieStatistic_CustomTimeSpan_End => GetString(nameof(SortieStatistic_CustomTimeSpan_End));
+        public string SortieStatistic_PastAreas => GetString(nameof(SortieStatistic_PastAreas));
         public string SortieStatistic_Count => GetString(nameof(SortieStatistic_Count));
         public string SortieStatistic_RankingPoints => GetString(nameof(SortieStatistic_RankingPoints));
 
+        public string SortieMap_UnderConstruction => GetString(nameof(SortieMap_UnderConstruction));
+
     }
 }
diff --git a/HeavenlyWind.Extensibility/HeavenlyWind.Extensibility.csproj b/HeavenlyWind.Extensibility/HeavenlyWind.Extensibility.csproj
index 04014509..c7c8e01f 100644
--- a/HeavenlyWind.Extensibility/HeavenlyWind.Extensibility.csproj
+++ b/HeavenlyWind.Extensibility/HeavenlyWind.Extensibility.csproj
@@ -32,6 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
@@ -44,6 +45,7 @@
     <Compile Include="IPreference.cs" />
     <Compile Include="IService.cs" />
     <Compile Include="IToolPane.cs" />
+    <Compile Include="IToolPaneScrollBarVisibilities.cs" />
     <Compile Include="PluginExportAttribute.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ServiceManager.cs" />
@@ -51,6 +53,7 @@
     <Compile Include="Services\IMainWindowService.cs" />
     <Compile Include="Services\INetworkAvailabilityService.cs" />
     <Compile Include="Services\INotificationService.cs" />
+    <Compile Include="Services\IRequestFilterService.cs" />
     <Compile Include="Services\IStatusBarService.cs" />
     <Compile Include="ToolViewMode.cs" />
   </ItemGroup>
diff --git a/HeavenlyWind.Extensibility/IToolPaneScrollBarVisibilities.cs b/HeavenlyWind.Extensibility/IToolPaneScrollBarVisibilities.cs
new file mode 100644
index 00000000..b8cf04e9
--- /dev/null
+++ b/HeavenlyWind.Extensibility/IToolPaneScrollBarVisibilities.cs
@@ -0,0 +1,10 @@
+using System.Windows.Controls;
+
+namespace Sakuno.KanColle.Amatsukaze.Extensibility
+{
+    public interface IToolPaneScrollBarVisibilities
+    {
+        ScrollBarVisibility VerticalScrollBarVisibility { get; }
+        ScrollBarVisibility HorizontalScrollBarVisibility { get; }
+    }
+}
diff --git a/HeavenlyWind.Extensibility/Services/IBrowserService.cs b/HeavenlyWind.Extensibility/Services/IBrowserService.cs
index ead106ac..399a438b 100644
--- a/HeavenlyWind.Extensibility/Services/IBrowserService.cs
+++ b/HeavenlyWind.Extensibility/Services/IBrowserService.cs
@@ -10,5 +10,7 @@ public interface IBrowserService
         event Action Attached;
         event EventHandler<Size> Resized;
         event Action ResizedToFitGame;
+
+        IDisposable RegisterMessageObserver(string message, Action<string> observer);
     }
 }
diff --git a/HeavenlyWind.Extensibility/Services/IRequestFilterService.cs b/HeavenlyWind.Extensibility/Services/IRequestFilterService.cs
new file mode 100644
index 00000000..f5078e2f
--- /dev/null
+++ b/HeavenlyWind.Extensibility/Services/IRequestFilterService.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+
+namespace Sakuno.KanColle.Amatsukaze.Extensibility.Services
+{
+    public interface IRequestFilterService
+    {
+        void Register(Func<string, IDictionary<string, string>, bool> filter);
+    }
+}
diff --git a/HeavenlyWind.Game/HeavenlyWind.Game.csproj b/HeavenlyWind.Game/HeavenlyWind.Game.csproj
index 0dfb5540..35847332 100644
--- a/HeavenlyWind.Game/HeavenlyWind.Game.csproj
+++ b/HeavenlyWind.Game/HeavenlyWind.Game.csproj
@@ -32,11 +32,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FiddlerCore4, Version=4.6.2.0, Culture=neutral, PublicKeyToken=67cb91587178ac5a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FiddlerCore.4.6.2.0\lib\net40\FiddlerCore4.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\FiddlerCore.4.6.2.0\lib\net40\FiddlerCore4.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -44,23 +44,23 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.103.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.103\lib\net45\System.Data.SQLite.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\lib\net45\System.Data.SQLite.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="WindowsBase" />
@@ -117,9 +117,11 @@
     <Compile Include="Models\Battle\Stages\CombinedFleetCTFDayNormalStage.cs" />
     <Compile Include="Models\Battle\Stages\CombinedFleetDay.cs" />
     <Compile Include="Models\Battle\Stages\CombinedFleetNight.cs" />
-    <Compile Include="Models\Battle\Stages\CombinedFleetNightNormalStage.cs" />
-    <Compile Include="Models\Battle\Stages\CombinedFleetNightOnlyStage.cs" />
     <Compile Include="Models\Battle\Stages\CombinedFleetSTFDayNormalStage.cs" />
+    <Compile Include="Models\Battle\Stages\FriendCombinedFleetCTFDayNormalStage.cs" />
+    <Compile Include="Models\Battle\Stages\FriendCombinedFleetNightNormalStage.cs" />
+    <Compile Include="Models\Battle\Stages\FriendCombinedFleetNightOnlyStage.cs" />
+    <Compile Include="Models\Battle\Stages\FriendCombinedFleetSTFDayNormalStage.cs" />
     <Compile Include="Models\Battle\Stages\Day.cs" />
     <Compile Include="Models\Battle\Stages\DayNormalStage.cs" />
     <Compile Include="Models\Battle\Stages\EnemyCombinedFleetDay.cs" />
@@ -132,6 +134,7 @@
     <Compile Include="Models\CommonProperty.cs" />
     <Compile Include="Models\CountdownModelBase.cs" />
     <Compile Include="Models\CutInType.cs" />
+    <Compile Include="Models\EnemyAerialRaid.cs" />
     <Compile Include="Models\EnemyFleet.cs" />
     <Compile Include="Models\Equipment.cs" />
     <Compile Include="Models\EquipmentIconType.cs" />
@@ -288,12 +291,14 @@
     <Compile Include="Parsers\Root\Battle\AerialAttackParser.cs" />
     <Compile Include="Parsers\Root\Battle\AerialCombatParser.cs" />
     <Compile Include="Parsers\Root\Battle\BattleResultParser.cs" />
-    <Compile Include="Parsers\Root\Battle\CombinedFleetAerialAttackParser.cs" />
-    <Compile Include="Parsers\Root\Battle\CombinedFleetAerialCombatParser.cs" />
     <Compile Include="Parsers\Root\Battle\CombinedFleetCTFDayBattleParser.cs" />
-    <Compile Include="Parsers\Root\Battle\CombinedFleetNightNormalBattleParser.cs" />
-    <Compile Include="Parsers\Root\Battle\CombinedFleetNightOnlyBattleParser.cs" />
     <Compile Include="Parsers\Root\Battle\CombinedFleetSTFDayBattleParser.cs" />
+    <Compile Include="Parsers\Root\Battle\FriendCombinedFleetAerialAttackParser.cs" />
+    <Compile Include="Parsers\Root\Battle\FriendCombinedFleetAerialCombatParser.cs" />
+    <Compile Include="Parsers\Root\Battle\FriendCombinedFleetCTFDayBattleParser.cs" />
+    <Compile Include="Parsers\Root\Battle\FriendCombinedFleetNightNormalBattleParser.cs" />
+    <Compile Include="Parsers\Root\Battle\FriendCombinedFleetNightOnlyBattleParser.cs" />
+    <Compile Include="Parsers\Root\Battle\FriendCombinedFleetSTFDayBattleParser.cs" />
     <Compile Include="Parsers\Root\Battle\DayNormalBattleParser.cs" />
     <Compile Include="Parsers\Root\Battle\EnemyCombinedFleetDayBattleParser.cs" />
     <Compile Include="Parsers\Root\Battle\EnemyCombinedFleetNightBattleParser.cs" />
@@ -412,12 +417,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" />
+  <Import Project="$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/HeavenlyWind.Game/KanColleGame.cs b/HeavenlyWind.Game/KanColleGame.cs
index 25e2ba30..27234cc2 100644
--- a/HeavenlyWind.Game/KanColleGame.cs
+++ b/HeavenlyWind.Game/KanColleGame.cs
@@ -43,6 +43,19 @@ internal set
                 }
             }
         }
+        PracticeInfo r_Practice;
+        public PracticeInfo Practice
+        {
+            get { return r_Practice; }
+            internal set
+            {
+                if (r_Practice != value)
+                {
+                    r_Practice = value;
+                    OnPropertyChanged(nameof(Practice));
+                }
+            }
+        }
 
         public event Action<SortieInfo> ReturnedFromSortie = delegate { };
 
diff --git a/HeavenlyWind.Game/Models/Battle/BattleInfo.cs b/HeavenlyWind.Game/Models/Battle/BattleInfo.cs
index e358960f..b63ccc0c 100644
--- a/HeavenlyWind.Game/Models/Battle/BattleInfo.cs
+++ b/HeavenlyWind.Game/Models/Battle/BattleInfo.cs
@@ -52,6 +52,8 @@ static BattleInfo()
                 "api_req_combined_battle/sp_midnight",
                 "api_req_combined_battle/ld_airbattle",
                 "api_req_combined_battle/ec_battle",
+                "api_req_combined_battle/each_battle",
+                "api_req_combined_battle/each_battle_water",
 
                 "api_req_practice/battle",
             };
@@ -141,12 +143,15 @@ void ProcessFirstStage(ApiInfo rpInfo)
                     First = new AerialAttackStage(this, rpInfo);
                     break;
 
-                case "api_req_combined_battle/battle": First = new CombinedFleetCTFDayNormalStage(this, rpInfo); break;
-                case "api_req_combined_battle/battle_water": First = new CombinedFleetSTFDayNormalStage(this, rpInfo); break;
+                case "api_req_combined_battle/battle": First = new FriendCombinedFleetCTFDayNormalStage(this, rpInfo); break;
+                case "api_req_combined_battle/battle_water": First = new FriendCombinedFleetSTFDayNormalStage(this, rpInfo); break;
 
-                case "api_req_combined_battle/sp_midnight": First = new CombinedFleetNightOnlyStage(this, rpInfo); break;
+                case "api_req_combined_battle/sp_midnight": First = new FriendCombinedFleetNightOnlyStage(this, rpInfo); break;
 
                 case "api_req_combined_battle/ec_battle": First = new EnemyCombinedFleetDay(this, rpInfo); break;
+
+                case "api_req_combined_battle/each_battle": First = new CombinedFleetCTFDayNormalStage(this, rpInfo); break;
+                case "api_req_combined_battle/each_battle_water": First = new CombinedFleetSTFDayNormalStage(this, rpInfo);break;
             }
 
             First.Process(rpInfo);
@@ -205,12 +210,12 @@ void ProcessSecondStage(ApiInfo rpInfo)
                     Second = new NightNormalStage(this, rpInfo);
                     break;
 
-                case "api_req_combined_battle/midnight_battle": Second = new CombinedFleetNightNormalStage(this, rpInfo); break;
+                case "api_req_combined_battle/midnight_battle": Second = new FriendCombinedFleetNightNormalStage(this, rpInfo); break;
 
                 case "api_req_combined_battle/ec_midnight_battle": Second = new EnemyCombinedFleetNight(this, rpInfo); break;
             }
 
-            Second.Process(rpInfo);
+            Second.Process(rpInfo, First);
             InheritFromPreviousStage(Second);
             Second.ProcessMVP();
             Result.Update(First, Second);
diff --git a/HeavenlyWind.Game/Models/Battle/BattleResult.cs b/HeavenlyWind.Game/Models/Battle/BattleResult.cs
index 5be7c1b1..c94c481b 100644
--- a/HeavenlyWind.Game/Models/Battle/BattleResult.cs
+++ b/HeavenlyWind.Game/Models/Battle/BattleResult.cs
@@ -1,6 +1,5 @@
 using Sakuno.KanColle.Amatsukaze.Game.Models.Battle.Stages;
 using System;
-using System.Linq;
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Models.Battle
 {
@@ -15,26 +14,39 @@ internal void Update(BattleStage rpFirst, BattleStage rpSecond)
         {
             var rCurrentStage = rpSecond ?? rpFirst;
 
-            var rEnemyTotalHPBefore = (double)rpFirst.Enemy.Sum(r => r.Before);
-            var rFriendTotalHPBefore = (double)rpFirst.FriendMain.Sum(r => r.Before);
+            var rFriendInitialTotalHP = 0;
+            var rFriendTotalHP = 0;
+            var rFriendCount = rpFirst.Friend.Count;
+            var rFriendSunkCount = 0;
 
-            if (rpFirst.FriendEscort != null)
-                rFriendTotalHPBefore += rpFirst.FriendEscort.Sum(r => r.Before);
+            for (var i = 0; i < rFriendCount; i++)
+            {
+                if (rpFirst.Friend[i].IsEvacuated)
+                    continue;
 
-            var rEnemyFinalSnapshot = rpSecond == null ? rpFirst.Enemy : rpSecond.Enemy;
-            var rEnemyTotalHPAfter = (double)rEnemyFinalSnapshot.Sum(r => Math.Max(r.Current, 0));
+                if (rCurrentStage.Friend[i].Current <= 0)
+                    rFriendSunkCount++;
 
-            var rFriendTotalHPAfter = (double)(rpSecond == null ? rpFirst.FriendMain : rpSecond.FriendMain ?? rpFirst.FriendMain).Sum(r => Math.Max(r.Current, 0));
+                rFriendInitialTotalHP += rpFirst.Friend[i].Before;
+                rFriendTotalHP += Math.Max(rCurrentStage.Friend[i].Current, 0);
+            }
+            var rEnemyInitialTotalHP = 0;
+            var rEnemyTotalHP = 0;
+            var rEnemyCount = rpFirst.Enemy.Count;
+            var rEnemySunkCount = 0;
+            var rIsEnemyFlagshipSunk = rCurrentStage.Enemy[0].Current <= 0;
 
-            var rFriendEscortFinalSnapshot = rpSecond == null ? rpFirst.FriendEscort : rpSecond.FriendEscort ?? rpFirst.FriendEscort;
-            if (rFriendEscortFinalSnapshot != null)
-                rFriendTotalHPAfter += rFriendEscortFinalSnapshot.Sum(r => Math.Max(r.Current, 0));
+            for (var i = 0; i < rEnemyCount; i++)
+            {
+                if (rCurrentStage.Enemy[i].Current <= 0)
+                    rEnemySunkCount++;
 
-            FriendDamageRate = (rFriendTotalHPBefore - rFriendTotalHPAfter) / rFriendTotalHPBefore * 100;
-            EnemyDamageRate = (rEnemyTotalHPBefore - rEnemyTotalHPAfter) / rEnemyTotalHPBefore * 100;
+                rEnemyInitialTotalHP += rpFirst.Enemy[i].Before;
+                rEnemyTotalHP += Math.Max(rCurrentStage.Enemy[i].Current, 0);
+            }
 
-            var rEnemySunkCount = rEnemyFinalSnapshot.Count(r => r.State == BattleParticipantState.Sunk);
-            var rIsEnemyFlagshipSunk = rEnemyFinalSnapshot[0].State == BattleParticipantState.Sunk;
+            FriendDamageRate = (rFriendInitialTotalHP - rFriendTotalHP) / (double)rFriendInitialTotalHP * 100.0;
+            EnemyDamageRate = (rEnemyInitialTotalHP - rEnemyTotalHP) / (double)rEnemyInitialTotalHP * 100.0;
 
             if (rCurrentStage is AerialAttackStage)
             {
@@ -53,21 +65,23 @@ internal void Update(BattleStage rpFirst, BattleStage rpSecond)
             }
             else
             {
-                if (EnemyDamageRate >= 100)
-                    Rank = FriendDamageRate <= 0 ? BattleRank.SS : BattleRank.S;
-                else if (rEnemySunkCount >= Math.Round(rEnemyFinalSnapshot.Count * 0.6))
+                if (rFriendSunkCount == 0 && rEnemySunkCount == rEnemyCount)
+                    Rank = FriendDamageRate <= .0 ? BattleRank.SS : BattleRank.S;
+                else if (rFriendSunkCount == 0 && rEnemySunkCount >= (int)(rEnemyCount * .7))
                     Rank = BattleRank.A;
-                else if (rIsEnemyFlagshipSunk || EnemyDamageRate > FriendDamageRate * 2.5)
+                else if ((rFriendSunkCount < rEnemySunkCount && rIsEnemyFlagshipSunk) || EnemyDamageRate > FriendDamageRate * 2.5)
                     Rank = BattleRank.B;
-                else if (EnemyDamageRate > FriendDamageRate || EnemyDamageRate >= 50.0)
+                else if (EnemyDamageRate > FriendDamageRate * .9)
                     Rank = BattleRank.C;
+                else if (rFriendCount == 1 && rCurrentStage.Friend[0].State == BattleParticipantState.HeavilyDamaged)
+                    Rank = BattleRank.D;
+                else if (rFriendCount > 1 && rFriendSunkCount == rFriendCount - 1)
+                    Rank = BattleRank.E;
                 else
                     Rank = BattleRank.D;
             }
 
-            OnPropertyChanged(nameof(FriendDamageRate));
-            OnPropertyChanged(nameof(EnemyDamageRate));
-            OnPropertyChanged(nameof(Rank));
+            OnPropertyChanged(string.Empty);
         }
     }
 }
diff --git a/HeavenlyWind.Game/Models/Battle/BattleStage.cs b/HeavenlyWind.Game/Models/Battle/BattleStage.cs
index 57966b39..38c0aa49 100644
--- a/HeavenlyWind.Game/Models/Battle/BattleStage.cs
+++ b/HeavenlyWind.Game/Models/Battle/BattleStage.cs
@@ -29,7 +29,7 @@ internal protected BattleStage(BattleInfo rpOwner)
             Owner = rpOwner;
         }
 
-        internal void Process(ApiInfo rpInfo)
+        internal void Process(ApiInfo rpInfo, BattleStage rpFirstStage = null)
         {
             var rData = rpInfo.Data as RawBattleBase;
             var rCombinedFleetData = rData as IRawCombinedFleet;
@@ -50,12 +50,27 @@ internal void Process(ApiInfo rpInfo)
 
             if (rCombinedFleetData != null)
             {
-                var rFriendAndEnemyEscort = rCombinedFleetData.EscortFleetCurrentHPs.Zip(rCombinedFleetData.EscortFleetMaximumHPs,
-                    (rpCurrent, rpMaximum) => rpMaximum != -1 ? new BattleParticipantSnapshot(rpMaximum, rpCurrent) : null).Skip(1).ToArray();
+                BattleParticipantSnapshot[] rFriendAndEnemyEscort;
+
+                if (rpFirstStage == null)
+                    rFriendAndEnemyEscort = rCombinedFleetData.EscortFleetCurrentHPs.Zip(rCombinedFleetData.EscortFleetMaximumHPs,
+                        (rpCurrent, rpMaximum) => rpMaximum != -1 ? new BattleParticipantSnapshot(rpMaximum, rpCurrent) : null).Skip(1).ToArray();
+                else
+                {
+                    IEnumerable<BattleParticipantSnapshot> rFriendEscort = rpFirstStage.FriendEscort;
+                    if (rFriendEscort == null)
+                        rFriendEscort = Enumerable.Repeat<BattleParticipantSnapshot>(null, 6);
+
+                    IEnumerable<BattleParticipantSnapshot> rEnemyEscort = rpFirstStage.EnemyEscort;
+                    if (rEnemyEscort == null)
+                        rEnemyEscort = Enumerable.Repeat<BattleParticipantSnapshot>(null, 6);
+
+                    rFriendAndEnemyEscort = rFriendEscort.Concat(rEnemyEscort).Select(r => r != null ? new BattleParticipantSnapshot(r.Maximum, r.Current) : null).ToArray();
+                }
 
                 if (rFriendAndEnemyEscort[0] != null)
                 {
-                    FriendEscort = rFriendAndEnemyEscort.Take(6).ToArray();
+                    FriendEscort = rFriendAndEnemyEscort.Take(6).TakeWhile(r => r != null).ToArray();
 
                     for (var i = 0; i < FriendEscort.Count; i++)
                     {
@@ -64,7 +79,7 @@ internal void Process(ApiInfo rpInfo)
                     }
                 }
 
-                if (rFriendAndEnemyEscort.Length > 6)
+                if ((rpFirstStage == null && rFriendAndEnemyEscort.Length > 6) || (rpFirstStage != null && rpFirstStage.EnemyEscort != null))
                 {
                     EnemyEscort = rFriendAndEnemyEscort.Skip(6).ToArray();
 
diff --git a/HeavenlyWind.Game/Models/Battle/EnemyShip.cs b/HeavenlyWind.Game/Models/Battle/EnemyShip.cs
index 10941a98..bbedc240 100644
--- a/HeavenlyWind.Game/Models/Battle/EnemyShip.cs
+++ b/HeavenlyWind.Game/Models/Battle/EnemyShip.cs
@@ -1,10 +1,17 @@
-using System.Collections.Generic;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Models.Battle
 {
     class EnemyShip : ModelBase, IParticipant, ICombatAbility
     {
+        static Dictionary<int, int[]> r_PlaneCount;
+
+        internal static IDictionary<int, int> FighterPowers { get; }
+
         public ShipInfo Info { get; }
         public bool IsAbyssalShip => Info.IsAbyssalShip;
 
@@ -19,6 +26,18 @@ class EnemyShip : ModelBase, IParticipant, ICombatAbility
         public bool IsDamageControlVisible => false;
         public bool IsDamageControlConsumed => false;
 
+        static EnemyShip()
+        {
+            var rFile = new FileInfo(@"Data\AbyssalShipPlane.json");
+            if (rFile.Exists)
+                using (var rStream = rFile.OpenRead())
+                {
+                    var rJson = JArray.Load(new JsonTextReader(new StreamReader(rStream)));
+
+                    r_PlaneCount = rJson.ToDictionary(r => (int)r["id"], r => r["plane_count"].ToObject<int[]>());
+                    FighterPowers = rJson.ToDictionary(r => (int)r["id"], r => (int)r["fighter_power"]);
+                }
+        }
         public EnemyShip(int rpID, int rpLevel, int[] rpEquipment = null)
         {
             Info = KanColleGame.Current.MasterInfo.Ships[rpID];
@@ -27,7 +46,17 @@ public EnemyShip(int rpID, int rpLevel, int[] rpEquipment = null)
             if (rpEquipment != null)
                 Slots = rpEquipment.TakeWhile(r => r != -1).Select((r, i) =>
                 {
-                    var rMaxPlaneCount = i < Info.SlotCount ? Info.PlaneCountInSlot?[i] ?? 0 : 0;
+                    var rMaxPlaneCount = -1;
+
+                    if (i < Info.SlotCount && Info.PlaneCountInSlot != null)
+                        rMaxPlaneCount = Info.PlaneCountInSlot[i];
+                    else
+                    {
+                        int[] rPlaneCount;
+                        if (r_PlaneCount != null && r_PlaneCount.TryGetValue(Info.ID, out rPlaneCount) && i < rPlaneCount.Length)
+                            rMaxPlaneCount = rPlaneCount[i];
+                    }
+
                     return new ShipSlot(Equipment.GetDummy(r), rMaxPlaneCount, rMaxPlaneCount);
                 }).ToArray();
         }
diff --git a/HeavenlyWind.Game/Models/Battle/Phases/AerialCombatPhase.cs b/HeavenlyWind.Game/Models/Battle/Phases/AerialCombatPhase.cs
index 18c593fc..3010ca36 100644
--- a/HeavenlyWind.Game/Models/Battle/Phases/AerialCombatPhase.cs
+++ b/HeavenlyWind.Game/Models/Battle/Phases/AerialCombatPhase.cs
@@ -121,7 +121,8 @@ void ProcessStage3()
             {
                 var rFirepowers = rFriendAttackers.Select(r =>
                 {
-                    var rShip = ((FriendShip)rParticipants[r - 1].Participant).Ship;
+                    var rShip = ((FriendShip)Stage.Friend[r - 1].Participant).Ship;
+
                     return rShip.Slots.Where(rpSlot => rpSlot.HasEquipment).Sum(rpSlot =>
                     {
                         var rEquipmentInfo = rpSlot.Equipment.Info;
diff --git a/HeavenlyWind.Game/Models/Battle/Phases/ShellingPhase.cs b/HeavenlyWind.Game/Models/Battle/Phases/ShellingPhase.cs
index 529cfdc1..81a93560 100644
--- a/HeavenlyWind.Game/Models/Battle/Phases/ShellingPhase.cs
+++ b/HeavenlyWind.Game/Models/Battle/Phases/ShellingPhase.cs
@@ -8,6 +8,8 @@ class ShellingPhase : BattlePhase<RawShellingPhase>
         bool r_IsFriendEscortFleet;
         bool r_IsEnemyEscortFleet;
 
+        public int[] ParticipantingFleet { get; set; }
+
         internal ShellingPhase(BattleStage rpStage, RawShellingPhase rpRawData, bool rpIsFriendEscortFleet = false, bool rpIsEnemyEscortFleet = false) : base(rpStage, rpRawData)
         {
             r_IsFriendEscortFleet = rpIsFriendEscortFleet;
@@ -19,6 +21,9 @@ int GetIndex(int rpPosition)
             if ((r_IsFriendEscortFleet && rpPosition <= 6) || (r_IsEnemyEscortFleet && rpPosition > 6))
                 return rpPosition + 12 - 1;
 
+            if (ParticipantingFleet != null && ((ParticipantingFleet[0] == 2 && rpPosition <= 6) || (ParticipantingFleet[1] == 2 && rpPosition > 6)))
+                return rpPosition + 12 - 1;
+
             return rpPosition - 1;
         }
 
diff --git a/HeavenlyWind.Game/Models/Battle/Phases/TorpedoSalvoPhase.cs b/HeavenlyWind.Game/Models/Battle/Phases/TorpedoSalvoPhase.cs
index d856fed5..62de4c1d 100644
--- a/HeavenlyWind.Game/Models/Battle/Phases/TorpedoSalvoPhase.cs
+++ b/HeavenlyWind.Game/Models/Battle/Phases/TorpedoSalvoPhase.cs
@@ -1,21 +1,22 @@
 using Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle;
-using System;
 using System.Linq;
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Models.Battle.Phases
 {
     class TorpedoSalvoPhase : BattlePhase<RawTorpedoSalvoPhase>
     {
-        bool r_IsEscortFleet;
+        bool r_IsFriendEscortFleet;
+        bool r_IsEnemyEscortFleet;
 
-        internal TorpedoSalvoPhase(BattleStage rpStage, RawTorpedoSalvoPhase rpRawData, bool rpIsEscortFleet = false) : base(rpStage, rpRawData)
+        internal TorpedoSalvoPhase(BattleStage rpStage, RawTorpedoSalvoPhase rpRawData, bool rpIsFriendEscortFleet = false, bool rpIsEnemyEscortFleet = false) : base(rpStage, rpRawData)
         {
-            r_IsEscortFleet = rpIsEscortFleet;
+            r_IsFriendEscortFleet = rpIsFriendEscortFleet;
+            r_IsEnemyEscortFleet = rpIsEnemyEscortFleet;
         }
 
         int GetIndex(int rpPosition)
         {
-            if (r_IsEscortFleet && rpPosition < 6)
+            if (r_IsFriendEscortFleet && !r_IsEnemyEscortFleet && rpPosition < 6)
                 return rpPosition + 12;
 
             return rpPosition;
diff --git a/HeavenlyWind.Game/Models/Battle/Stages/CombinedFleetCTFDayNormalStage.cs b/HeavenlyWind.Game/Models/Battle/Stages/CombinedFleetCTFDayNormalStage.cs
index 7a879eec..272dd68b 100644
--- a/HeavenlyWind.Game/Models/Battle/Stages/CombinedFleetCTFDayNormalStage.cs
+++ b/HeavenlyWind.Game/Models/Battle/Stages/CombinedFleetCTFDayNormalStage.cs
@@ -26,16 +26,16 @@ class CombinedFleetCTFDayNormalStage : CombinedFleetDay
 
         internal protected CombinedFleetCTFDayNormalStage(BattleInfo rpOwner, ApiInfo rpInfo) : base(rpOwner)
         {
-            var rRawData = rpInfo.Data as RawCombinedFleetDay;
+            var rRawData = rpInfo.Data as RawEnemyCombinedFleetDay;
 
             LandBaseAerialSupport = new LandBaseAerialSupportPhase(this, rRawData.LandBaseAerialSupport);
             AerialCombat = new AerialCombatPhase(this, rRawData.AerialCombat);
             SupportingFire = new SupportingFirePhase(this, rRawData.SupportingFire);
             OpeningASW = new OpeningASWPhase(this, rRawData.OpeningASW, true);
-            OpeningTorpedo = new TorpedoSalvoPhase(this, rRawData.OpeningTorpedoSalvo, true);
+            OpeningTorpedo = new TorpedoSalvoPhase(this, rRawData.OpeningTorpedoSalvo, true, true);
 
-            ShellingFirstRound = new ShellingPhase(this, rRawData.ShellingFirstRound, true);
-            ClosingTorpedo = new TorpedoSalvoPhase(this, rRawData.ClosingTorpedoSalvo, true);
+            ShellingFirstRound = new ShellingPhase(this, rRawData.ShellingFirstRound, true, true);
+            ClosingTorpedo = new TorpedoSalvoPhase(this, rRawData.ClosingTorpedoSalvo, true, true);
 
             ShellingSecondRound = new ShellingPhase(this, rRawData.ShellingSecondRound);
             ShellingThirdRound = new ShellingPhase(this, rRawData.ShellingThirdRound);
diff --git a/HeavenlyWind.Game/Models/Battle/Stages/CombinedFleetSTFDayNormalStage.cs b/HeavenlyWind.Game/Models/Battle/Stages/CombinedFleetSTFDayNormalStage.cs
index 8ef50da5..40d969e0 100644
--- a/HeavenlyWind.Game/Models/Battle/Stages/CombinedFleetSTFDayNormalStage.cs
+++ b/HeavenlyWind.Game/Models/Battle/Stages/CombinedFleetSTFDayNormalStage.cs
@@ -27,20 +27,20 @@ class CombinedFleetSTFDayNormalStage : CombinedFleetDay
 
         internal protected CombinedFleetSTFDayNormalStage(BattleInfo rpOwner, ApiInfo rpInfo) : base(rpOwner)
         {
-            var rRawData = rpInfo.Data as RawCombinedFleetDay;
+            var rRawData = rpInfo.Data as RawEnemyCombinedFleetDay;
 
             LandBaseAerialSupport = new LandBaseAerialSupportPhase(this, rRawData.LandBaseAerialSupport);
             AerialCombat = new AerialCombatPhase(this, rRawData.AerialCombat);
             SupportingFire = new SupportingFirePhase(this, rRawData.SupportingFire);
             OpeningASW = new OpeningASWPhase(this, rRawData.OpeningASW, true);
-            OpeningTorpedo = new TorpedoSalvoPhase(this, rRawData.OpeningTorpedoSalvo, true);
+            OpeningTorpedo = new TorpedoSalvoPhase(this, rRawData.OpeningTorpedoSalvo, true, true);
 
             ShellingFirstRound = new ShellingPhase(this, rRawData.ShellingFirstRound);
             ShellingSecondRound = new ShellingPhase(this, rRawData.ShellingSecondRound);
 
-            ShellingThirdRound = new ShellingPhase(this, rRawData.ShellingThirdRound, true);
+            ShellingThirdRound = new ShellingPhase(this, rRawData.ShellingThirdRound, true, true);
 
-            ClosingTorpedo = new TorpedoSalvoPhase(this, rRawData.ClosingTorpedoSalvo, true);
+            ClosingTorpedo = new TorpedoSalvoPhase(this, rRawData.ClosingTorpedoSalvo, true, true);
         }
     }
 }
diff --git a/HeavenlyWind.Game/Models/Battle/Stages/EnemyCombinedFleetNight.cs b/HeavenlyWind.Game/Models/Battle/Stages/EnemyCombinedFleetNight.cs
index eeba73c8..dca7ac16 100644
--- a/HeavenlyWind.Game/Models/Battle/Stages/EnemyCombinedFleetNight.cs
+++ b/HeavenlyWind.Game/Models/Battle/Stages/EnemyCombinedFleetNight.cs
@@ -10,7 +10,7 @@ internal protected EnemyCombinedFleetNight(BattleInfo rpOwner, ApiInfo rpInfo) :
         {
             var rRawData = rpInfo.Data as RawEnemyCombinedFleetNight;
 
-            Shelling = new ShellingPhase(this, rRawData.Shelling);
+            Shelling = new ShellingPhase(this, rRawData.Shelling) { ParticipantingFleet = rRawData.ParticipatingFleet };
         }
     }
 }
diff --git a/HeavenlyWind.Game/Models/Battle/Stages/FriendCombinedFleetCTFDayNormalStage.cs b/HeavenlyWind.Game/Models/Battle/Stages/FriendCombinedFleetCTFDayNormalStage.cs
new file mode 100644
index 00000000..a04d9573
--- /dev/null
+++ b/HeavenlyWind.Game/Models/Battle/Stages/FriendCombinedFleetCTFDayNormalStage.cs
@@ -0,0 +1,44 @@
+using Sakuno.KanColle.Amatsukaze.Game.Models.Battle.Phases;
+using Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle;
+using Sakuno.KanColle.Amatsukaze.Game.Parsers;
+using System.Collections.Generic;
+
+namespace Sakuno.KanColle.Amatsukaze.Game.Models.Battle.Stages
+{
+    class FriendCombinedFleetCTFDayNormalStage : CombinedFleetDay
+    {
+        public override BattleStageType Type => BattleStageType.Day;
+
+        public override IList<BattlePhase> Phases => new BattlePhase[]
+        {
+            LandBaseAerialSupport,
+            AerialCombat,
+            SupportingFire,
+            OpeningASW,
+            OpeningTorpedo,
+
+            ShellingFirstRound,
+            ClosingTorpedo,
+
+            ShellingSecondRound,
+            ShellingThirdRound,
+        };
+
+        internal protected FriendCombinedFleetCTFDayNormalStage(BattleInfo rpOwner, ApiInfo rpInfo) : base(rpOwner)
+        {
+            var rRawData = rpInfo.Data as RawCombinedFleetDay;
+
+            LandBaseAerialSupport = new LandBaseAerialSupportPhase(this, rRawData.LandBaseAerialSupport);
+            AerialCombat = new AerialCombatPhase(this, rRawData.AerialCombat);
+            SupportingFire = new SupportingFirePhase(this, rRawData.SupportingFire);
+            OpeningASW = new OpeningASWPhase(this, rRawData.OpeningASW, true);
+            OpeningTorpedo = new TorpedoSalvoPhase(this, rRawData.OpeningTorpedoSalvo, true);
+
+            ShellingFirstRound = new ShellingPhase(this, rRawData.ShellingFirstRound, true);
+            ClosingTorpedo = new TorpedoSalvoPhase(this, rRawData.ClosingTorpedoSalvo, true);
+
+            ShellingSecondRound = new ShellingPhase(this, rRawData.ShellingSecondRound);
+            ShellingThirdRound = new ShellingPhase(this, rRawData.ShellingThirdRound);
+        }
+    }
+}
diff --git a/HeavenlyWind.Game/Models/Battle/Stages/FriendCombinedFleetNightNormalStage.cs b/HeavenlyWind.Game/Models/Battle/Stages/FriendCombinedFleetNightNormalStage.cs
new file mode 100644
index 00000000..dc601505
--- /dev/null
+++ b/HeavenlyWind.Game/Models/Battle/Stages/FriendCombinedFleetNightNormalStage.cs
@@ -0,0 +1,16 @@
+using Sakuno.KanColle.Amatsukaze.Game.Models.Battle.Phases;
+using Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle;
+using Sakuno.KanColle.Amatsukaze.Game.Parsers;
+
+namespace Sakuno.KanColle.Amatsukaze.Game.Models.Battle.Stages
+{
+    class FriendCombinedFleetNightNormalStage : CombinedFleetNight
+    {
+        internal protected FriendCombinedFleetNightNormalStage(BattleInfo rpOwner, ApiInfo rpInfo) : base(rpOwner)
+        {
+            var rRawData = rpInfo.Data as RawCombinedFleetNight;
+
+            Shelling = new ShellingPhase(this, rRawData.Shelling, true);
+        }
+    }
+}
diff --git a/HeavenlyWind.Game/Models/Battle/Stages/CombinedFleetNightOnlyStage.cs b/HeavenlyWind.Game/Models/Battle/Stages/FriendCombinedFleetNightOnlyStage.cs
similarity index 69%
rename from HeavenlyWind.Game/Models/Battle/Stages/CombinedFleetNightOnlyStage.cs
rename to HeavenlyWind.Game/Models/Battle/Stages/FriendCombinedFleetNightOnlyStage.cs
index e4ee86b8..5b980f8e 100644
--- a/HeavenlyWind.Game/Models/Battle/Stages/CombinedFleetNightOnlyStage.cs
+++ b/HeavenlyWind.Game/Models/Battle/Stages/FriendCombinedFleetNightOnlyStage.cs
@@ -4,9 +4,9 @@
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Models.Battle.Stages
 {
-    class CombinedFleetNightOnlyStage : CombinedFleetNight
+    class FriendCombinedFleetNightOnlyStage : CombinedFleetNight
     {
-        internal protected CombinedFleetNightOnlyStage(BattleInfo rpOwner, ApiInfo rpInfo) : base(rpOwner)
+        internal protected FriendCombinedFleetNightOnlyStage(BattleInfo rpOwner, ApiInfo rpInfo) : base(rpOwner)
         {
             var rRawData = rpInfo.Data as RawCombinedFleetNightOnly;
 
diff --git a/HeavenlyWind.Game/Models/Battle/Stages/FriendCombinedFleetSTFDayNormalStage.cs b/HeavenlyWind.Game/Models/Battle/Stages/FriendCombinedFleetSTFDayNormalStage.cs
new file mode 100644
index 00000000..cd498934
--- /dev/null
+++ b/HeavenlyWind.Game/Models/Battle/Stages/FriendCombinedFleetSTFDayNormalStage.cs
@@ -0,0 +1,46 @@
+using Sakuno.KanColle.Amatsukaze.Game.Models.Battle.Phases;
+using Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle;
+using Sakuno.KanColle.Amatsukaze.Game.Parsers;
+using System.Collections.Generic;
+
+namespace Sakuno.KanColle.Amatsukaze.Game.Models.Battle.Stages
+{
+    class FriendCombinedFleetSTFDayNormalStage : CombinedFleetDay
+    {
+        public override BattleStageType Type => BattleStageType.Day;
+
+        public override IList<BattlePhase> Phases => new BattlePhase[]
+        {
+            LandBaseAerialSupport,
+            AerialCombat,
+            SupportingFire,
+            OpeningASW,
+            OpeningTorpedo,
+
+            ShellingFirstRound,
+            ShellingSecondRound,
+
+            ShellingThirdRound,
+
+            ClosingTorpedo,
+        };
+
+        internal protected FriendCombinedFleetSTFDayNormalStage(BattleInfo rpOwner, ApiInfo rpInfo) : base(rpOwner)
+        {
+            var rRawData = rpInfo.Data as RawCombinedFleetDay;
+
+            LandBaseAerialSupport = new LandBaseAerialSupportPhase(this, rRawData.LandBaseAerialSupport);
+            AerialCombat = new AerialCombatPhase(this, rRawData.AerialCombat);
+            SupportingFire = new SupportingFirePhase(this, rRawData.SupportingFire);
+            OpeningASW = new OpeningASWPhase(this, rRawData.OpeningASW, true);
+            OpeningTorpedo = new TorpedoSalvoPhase(this, rRawData.OpeningTorpedoSalvo, true);
+
+            ShellingFirstRound = new ShellingPhase(this, rRawData.ShellingFirstRound);
+            ShellingSecondRound = new ShellingPhase(this, rRawData.ShellingSecondRound);
+
+            ShellingThirdRound = new ShellingPhase(this, rRawData.ShellingThirdRound, true);
+
+            ClosingTorpedo = new TorpedoSalvoPhase(this, rRawData.ClosingTorpedoSalvo, true);
+        }
+    }
+}
diff --git a/HeavenlyWind.Game/Models/EnemyAerialRaid.cs b/HeavenlyWind.Game/Models/EnemyAerialRaid.cs
new file mode 100644
index 00000000..5494e93f
--- /dev/null
+++ b/HeavenlyWind.Game/Models/EnemyAerialRaid.cs
@@ -0,0 +1,22 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Linq;
+
+namespace Sakuno.KanColle.Amatsukaze.Game.Models
+{
+    public class EnemyAerialRaid : ModelBase
+    {
+        public int Amount { get; }
+
+        public EnemyAerialRaid(JToken rpData)
+        {
+            var rStage3 = rpData["api_air_base_attack"]["api_stage3"];
+            if (rStage3 == null || rStage3.Type == JTokenType.Null)
+                return;
+
+            var rDamages = rStage3["api_fdam"].ToObject<int[]>().Skip(1).Sum();
+
+            Amount = (int)Math.Round(rDamages * .9 + .1);
+        }
+    }
+}
diff --git a/HeavenlyWind.Game/Models/EnemyFleet.cs b/HeavenlyWind.Game/Models/EnemyFleet.cs
index b6e52dac..80a19228 100644
--- a/HeavenlyWind.Game/Models/EnemyFleet.cs
+++ b/HeavenlyWind.Game/Models/EnemyFleet.cs
@@ -11,6 +11,8 @@ public class EnemyFleet : ModelBase
 
         public List<Formation> Formations { get; } = new List<Formation>();
 
+        public int FighterPower { get; }
+
         internal EnemyFleet(string[] rpShips)
         {
             var rShips = rpShips.Select(int.Parse);
@@ -20,8 +22,16 @@ internal EnemyFleet(string[] rpShips)
             else
             {
                 MainShips = rShips.Take(6).Where(r => r != -1).Select(r => KanColleGame.Current.MasterInfo.Ships[r]).ToArray();
-                EscortShips = rShips.Skip(6).Select(r => KanColleGame.Current.MasterInfo.Ships[r]).ToArray(); ;
+                EscortShips = rShips.Skip(6).Select(r => KanColleGame.Current.MasterInfo.Ships[r]).ToArray();
             }
+
+            if (EnemyShip.FighterPowers != null)
+                foreach (var rShip in rShips)
+                {
+                    int rFighterPower;
+                    if (EnemyShip.FighterPowers.TryGetValue(rShip, out rFighterPower))
+                        FighterPower += rFighterPower;
+                }
         }
     }
 }
diff --git a/HeavenlyWind.Game/Models/Events/BattleEvent.cs b/HeavenlyWind.Game/Models/Events/BattleEvent.cs
index 15104d52..b208c9db 100644
--- a/HeavenlyWind.Game/Models/Events/BattleEvent.cs
+++ b/HeavenlyWind.Game/Models/Events/BattleEvent.cs
@@ -11,6 +11,8 @@ public class BattleEvent : SortieEvent, IExtraInfo
 
         public IList<EnemyFleet> EnemyEncounters { get; }
 
+        public EnemyAerialRaid EnemyAerialRaid { get; internal set; }
+
         internal BattleEvent(long rpTimestamp, MapInfo rpMap, RawMapExploration rpData, string rpNodeWikiID) : base(rpData)
         {
             Battle = new BattleInfo(rpTimestamp, rpData);
diff --git a/HeavenlyWind.Game/Models/Fleet.cs b/HeavenlyWind.Game/Models/Fleet.cs
index 9308e448..f08456f2 100644
--- a/HeavenlyWind.Game/Models/Fleet.cs
+++ b/HeavenlyWind.Game/Models/Fleet.cs
@@ -118,7 +118,7 @@ internal void Update()
                 if (r_Ships.Any(r => Port.RepairDocks.Values.Any(rpDock => rpDock.Ship == r)))
                     rState |= FleetState.Repairing;
 
-                if (r_Ships.Any(r => (r.State & ShipState.HeavilyDamaged) != 0))
+                if ((rState & FleetState.Repairing) == 0 && r_Ships.Any(r => (r.State & ShipState.HeavilyDamaged) != 0))
                     rState |= FleetState.HeavilyDamaged;
 
                 if (r_Ships.Count > 0 && (ShipType)r_Ships[0].Info.Type.ID == ShipType.RepairShip)
diff --git a/HeavenlyWind.Game/Models/PracticeInfo.cs b/HeavenlyWind.Game/Models/PracticeInfo.cs
index b0f79ee0..02fcdd7a 100644
--- a/HeavenlyWind.Game/Models/PracticeInfo.cs
+++ b/HeavenlyWind.Game/Models/PracticeInfo.cs
@@ -4,7 +4,7 @@
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Models
 {
-    public class PracticeInfo : SortieInfo
+    public class PracticeInfo : ModelBase
     {
         static PracticeInfo r_Current;
 
diff --git a/HeavenlyWind.Game/Models/Raw/Battle/RawEnemyCombinedFleetNight.cs b/HeavenlyWind.Game/Models/Raw/Battle/RawEnemyCombinedFleetNight.cs
index 949e3d65..e3798d03 100644
--- a/HeavenlyWind.Game/Models/Raw/Battle/RawEnemyCombinedFleetNight.cs
+++ b/HeavenlyWind.Game/Models/Raw/Battle/RawEnemyCombinedFleetNight.cs
@@ -1,6 +1,10 @@
-namespace Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle
+using Newtonsoft.Json;
+
+namespace Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle
 {
     public class RawEnemyCombinedFleetNight : RawCombinedFleetNightBase
     {
+        [JsonProperty("api_active_deck")]
+        public int[] ParticipatingFleet { get; set; }
     }
 }
diff --git a/HeavenlyWind.Game/Models/Raw/RawAirForceGroupOrganization.cs b/HeavenlyWind.Game/Models/Raw/RawAirForceGroupOrganization.cs
index 44695435..adc6498a 100644
--- a/HeavenlyWind.Game/Models/Raw/RawAirForceGroupOrganization.cs
+++ b/HeavenlyWind.Game/Models/Raw/RawAirForceGroupOrganization.cs
@@ -11,6 +11,6 @@ public class RawAirForceGroupOrganization
         public RawAirForceSquadron[] Squadrons { get; set; }
 
         [JsonProperty("api_after_bauxite")]
-        public int Bauxite { get; set; }
+        public int? Bauxite { get; set; }
     }
 }
diff --git a/HeavenlyWind.Game/Models/Raw/RawBattleResult.cs b/HeavenlyWind.Game/Models/Raw/RawBattleResult.cs
index 6ecc6ce0..c8d87fa9 100644
--- a/HeavenlyWind.Game/Models/Raw/RawBattleResult.cs
+++ b/HeavenlyWind.Game/Models/Raw/RawBattleResult.cs
@@ -52,8 +52,10 @@ public class RawBattleResult
         [JsonProperty("api_enemy_info")]
         public RawEnemyInfo EnemyInfo { get; set; }
 
-        [JsonProperty("api_first_clear")]
-        public bool IsFirstClear { get; set; }
+        //[JsonProperty("api_first_clear")]
+
+        [JsonProperty("api_mapcell_incentive")]
+        public bool IsAviationReconnaissanceRewardConfirmed { get; set; }
 
         [JsonProperty("api_get_flag")]
         public bool[] IsDropped { get; set; }
diff --git a/HeavenlyWind.Game/Models/Raw/RawMapExploration.cs b/HeavenlyWind.Game/Models/Raw/RawMapExploration.cs
index e723c65d..7568fdb7 100644
--- a/HeavenlyWind.Game/Models/Raw/RawMapExploration.cs
+++ b/HeavenlyWind.Game/Models/Raw/RawMapExploration.cs
@@ -58,6 +58,9 @@ public class RawMapExploration
         [JsonProperty("api_airsearch")]
         public RawAviationReconnaissance AviationReconnaissance { get; set; }
 
+        [JsonProperty("api_destruction_battle")]
+        public JToken EnemyAerialRaid { get; set; }
+
         public class RawEventMap
         {
             [JsonProperty("api_now_maphp")]
diff --git a/HeavenlyWind.Game/Models/SortieNodeInfo.cs b/HeavenlyWind.Game/Models/SortieNodeInfo.cs
index be9f9804..6e5d7997 100644
--- a/HeavenlyWind.Game/Models/SortieNodeInfo.cs
+++ b/HeavenlyWind.Game/Models/SortieNodeInfo.cs
@@ -1,6 +1,7 @@
 using Sakuno.KanColle.Amatsukaze.Game.Models.Events;
 using Sakuno.KanColle.Amatsukaze.Game.Models.Raw;
 using Sakuno.KanColle.Amatsukaze.Game.Services;
+using System;
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Models
 {
@@ -19,6 +20,8 @@ public class SortieNodeInfo : ModelBase
 
         public bool IsDeadEnd { get; }
 
+        public EnemyAerialRaid EnemyAerialRaid { get; }
+
         internal SortieNodeInfo(SortieInfo rpOwner, long rpTimestamp, RawMapExploration rpData)
         {
             r_Owner = rpOwner;
@@ -66,6 +69,23 @@ internal SortieNodeInfo(SortieInfo rpOwner, long rpTimestamp, RawMapExploration
             }
 
             IsDeadEnd = rpData.NextRouteCount == 0;
+
+            if (rpData.EnemyAerialRaid != null)
+                try
+                {
+                    EnemyAerialRaid = new EnemyAerialRaid(rpData.EnemyAerialRaid);
+
+                    var rBattleEvent = Event as BattleEvent;
+                    if (rBattleEvent != null)
+                    {
+                        rBattleEvent.EnemyAerialRaid = EnemyAerialRaid;
+                        EnemyAerialRaid = null;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Logger.Write(LoggingLevel.Error, string.Format(StringResources.Instance.Main.Log_Exception_API_ParseException, e.Message));
+                }
         }
     }
 }
diff --git a/HeavenlyWind.Game/Parsers/ApiParserManager.cs b/HeavenlyWind.Game/Parsers/ApiParserManager.cs
index d928efff..9aa60375 100644
--- a/HeavenlyWind.Game/Parsers/ApiParserManager.cs
+++ b/HeavenlyWind.Game/Parsers/ApiParserManager.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json.Linq;
-using Sakuno.Collections;
 using Sakuno.KanColle.Amatsukaze.Game.Proxy;
 using System;
 using System.Collections.Generic;
@@ -49,7 +48,6 @@ internal static ApiParserBase GetParser(string rpApi)
         static void ProcessCore(ApiSession rpSession)
         {
             var rApi = rpSession.DisplayUrl;
-            var rRequest = Uri.UnescapeDataString(rpSession.RequestBodyString);
             var rResponse = rpSession.ResponseBodyString;
 
             try
@@ -59,14 +57,6 @@ static void ProcessCore(ApiSession rpSession)
                 ApiParserBase rParser;
                 if (!rContent.IsNullOrEmpty() && rContent.StartsWith("{") && r_Parsers.TryGetValue(rApi, out rParser))
                 {
-                    ListDictionary<string, string> rParameters = null;
-                    if (!rRequest.IsNullOrEmpty() && rRequest.Contains('&'))
-                    {
-                        rParameters = new ListDictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-                        foreach (var rParameter in rRequest.Split('&').Where(r => r.Length > 0).Select(r => r.Split('=')))
-                            rParameters.Add(rParameter[0], rParameter[1]);
-                    }
-
                     var rJson = JObject.Parse(rContent);
 
                     var rResultCode = (int)rJson["api_result"];
@@ -76,7 +66,7 @@ static void ProcessCore(ApiSession rpSession)
                         return;
                     }
 
-                    var rData = new ApiInfo(rpSession, rApi, rParameters, rJson);
+                    var rData = new ApiInfo(rpSession, rApi, rpSession.Parameters, rJson);
 
                     rParser.Process(rData);
                 }
diff --git a/HeavenlyWind.Game/Parsers/Root/Battle/CombinedFleetCTFDayBattleParser.cs b/HeavenlyWind.Game/Parsers/Root/Battle/CombinedFleetCTFDayBattleParser.cs
index 9071d6c4..08fb5f5d 100644
--- a/HeavenlyWind.Game/Parsers/Root/Battle/CombinedFleetCTFDayBattleParser.cs
+++ b/HeavenlyWind.Game/Parsers/Root/Battle/CombinedFleetCTFDayBattleParser.cs
@@ -2,10 +2,10 @@
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Parsers.Root.Battle
 {
-    [Api("api_req_combined_battle/battle")]
-    class CombinedFleetCTFDayBattleParser : ApiParser<RawCombinedFleetDay>
+    [Api("api_req_combined_battle/each_battle")]
+    class CombinedFleetCTFDayBattleParser : ApiParser<RawEnemyCombinedFleetDay>
     {
-        public override void ProcessCore(ApiInfo rpInfo, RawCombinedFleetDay rpData)
+        public override void ProcessCore(ApiInfo rpInfo, RawEnemyCombinedFleetDay rpData)
         {
         }
     }
diff --git a/HeavenlyWind.Game/Parsers/Root/Battle/CombinedFleetSTFDayBattleParser.cs b/HeavenlyWind.Game/Parsers/Root/Battle/CombinedFleetSTFDayBattleParser.cs
index 530cb46c..3e66ab15 100644
--- a/HeavenlyWind.Game/Parsers/Root/Battle/CombinedFleetSTFDayBattleParser.cs
+++ b/HeavenlyWind.Game/Parsers/Root/Battle/CombinedFleetSTFDayBattleParser.cs
@@ -2,10 +2,10 @@
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Parsers.Root.Battle
 {
-    [Api("api_req_combined_battle/battle_water")]
-    class CombinedFleetSTFDayBattleParser : ApiParser<RawCombinedFleetDay>
+    [Api("api_req_combined_battle/each_battle_water")]
+    class CombinedFleetSTFDayBattleParser : ApiParser<RawEnemyCombinedFleetDay>
     {
-        public override void ProcessCore(ApiInfo rpInfo, RawCombinedFleetDay rpData)
+        public override void ProcessCore(ApiInfo rpInfo, RawEnemyCombinedFleetDay rpData)
         {
         }
     }
diff --git a/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetAerialAttackParser.cs b/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetAerialAttackParser.cs
new file mode 100644
index 00000000..43e5a570
--- /dev/null
+++ b/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetAerialAttackParser.cs
@@ -0,0 +1,12 @@
+using Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle;
+
+namespace Sakuno.KanColle.Amatsukaze.Game.Parsers.Root.Battle
+{
+    [Api("api_req_combined_battle/ld_airbattle")]
+    class FriendCombinedFleetAerialAttackParser : ApiParser<RawCombinedFleetAerialAttack>
+    {
+        public override void ProcessCore(ApiInfo rpInfo, RawCombinedFleetAerialAttack rpData)
+        {
+        }
+    }
+}
diff --git a/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetAerialCombatParser.cs b/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetAerialCombatParser.cs
new file mode 100644
index 00000000..8a87862e
--- /dev/null
+++ b/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetAerialCombatParser.cs
@@ -0,0 +1,12 @@
+using Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle;
+
+namespace Sakuno.KanColle.Amatsukaze.Game.Parsers.Root.Battle
+{
+    [Api("api_req_combined_battle/airbattle")]
+    class FriendCombinedFleetAerialCombatParser : ApiParser<RawCombinedFleetAerialCombat>
+    {
+        public override void ProcessCore(ApiInfo rpInfo, RawCombinedFleetAerialCombat rpData)
+        {
+        }
+    }
+}
diff --git a/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetCTFDayBattleParser.cs b/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetCTFDayBattleParser.cs
new file mode 100644
index 00000000..1e888429
--- /dev/null
+++ b/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetCTFDayBattleParser.cs
@@ -0,0 +1,12 @@
+using Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle;
+
+namespace Sakuno.KanColle.Amatsukaze.Game.Parsers.Root.Battle
+{
+    [Api("api_req_combined_battle/battle")]
+    class FriendCombinedFleetCTFDayBattleParser : ApiParser<RawCombinedFleetDay>
+    {
+        public override void ProcessCore(ApiInfo rpInfo, RawCombinedFleetDay rpData)
+        {
+        }
+    }
+}
diff --git a/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetNightNormalBattleParser.cs b/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetNightNormalBattleParser.cs
new file mode 100644
index 00000000..a40849f3
--- /dev/null
+++ b/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetNightNormalBattleParser.cs
@@ -0,0 +1,12 @@
+using Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle;
+
+namespace Sakuno.KanColle.Amatsukaze.Game.Parsers.Root.Battle
+{
+    [Api("api_req_combined_battle/midnight_battle")]
+    class FriendCombinedFleetNightNormalBattleParser : ApiParser<RawCombinedFleetNight>
+    {
+        public override void ProcessCore(ApiInfo rpInfo, RawCombinedFleetNight rpData)
+        {
+        }
+    }
+}
diff --git a/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetNightOnlyBattleParser.cs b/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetNightOnlyBattleParser.cs
new file mode 100644
index 00000000..f20136eb
--- /dev/null
+++ b/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetNightOnlyBattleParser.cs
@@ -0,0 +1,12 @@
+using Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle;
+
+namespace Sakuno.KanColle.Amatsukaze.Game.Parsers.Root.Battle
+{
+    [Api("api_req_combined_battle/sp_midnight")]
+    class FriendCombinedFleetNightOnlyBattleParser : ApiParser<RawCombinedFleetNightOnly>
+    {
+        public override void ProcessCore(ApiInfo rpInfo, RawCombinedFleetNightOnly rpData)
+        {
+        }
+    }
+}
diff --git a/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetSTFDayBattleParser.cs b/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetSTFDayBattleParser.cs
new file mode 100644
index 00000000..28aea9c0
--- /dev/null
+++ b/HeavenlyWind.Game/Parsers/Root/Battle/FriendCombinedFleetSTFDayBattleParser.cs
@@ -0,0 +1,12 @@
+using Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle;
+
+namespace Sakuno.KanColle.Amatsukaze.Game.Parsers.Root.Battle
+{
+    [Api("api_req_combined_battle/battle_water")]
+    class FriendCombinedFleetSTFDayBattleParser : ApiParser<RawCombinedFleetDay>
+    {
+        public override void ProcessCore(ApiInfo rpInfo, RawCombinedFleetDay rpData)
+        {
+        }
+    }
+}
diff --git a/HeavenlyWind.Game/Parsers/Root/Battle/PracticeDayBattleParser.cs b/HeavenlyWind.Game/Parsers/Root/Battle/PracticeDayBattleParser.cs
index 51556f7c..f44268dc 100644
--- a/HeavenlyWind.Game/Parsers/Root/Battle/PracticeDayBattleParser.cs
+++ b/HeavenlyWind.Game/Parsers/Root/Battle/PracticeDayBattleParser.cs
@@ -1,5 +1,4 @@
-using Sakuno.KanColle.Amatsukaze.Game.Models;
-using Sakuno.KanColle.Amatsukaze.Game.Models.Battle;
+using Sakuno.KanColle.Amatsukaze.Game.Models.Battle;
 using Sakuno.KanColle.Amatsukaze.Game.Models.Raw.Battle;
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Parsers.Root.Battle
@@ -10,13 +9,12 @@ class PracticeDayBattleParser : DayNormalBattleParser
     {
         public override void ProcessCore(ApiInfo rpInfo, RawDay rpData)
         {
-            var rPracticeInfo = Game.Sortie as PracticeInfo;
-            if (rPracticeInfo != null)
-            {
-                var rParticipantFleet = Game.Port.Fleets[int.Parse(rpInfo.Parameters["api_deck_id"])];
+            if (Game.Practice == null)
+                return;
 
-                rPracticeInfo.Battle = new BattleInfo(rpInfo.Timestamp, rParticipantFleet);
-            }
+            var rParticipantFleet = Game.Port.Fleets[int.Parse(rpInfo.Parameters["api_deck_id"])];
+
+            Game.Practice.Battle = new BattleInfo(rpInfo.Timestamp, rParticipantFleet);
         }
     }
 }
diff --git a/HeavenlyWind.Game/Parsers/Root/Member/PracticeOpponentsParser.cs b/HeavenlyWind.Game/Parsers/Root/Member/PracticeOpponentsParser.cs
index 1c508a52..224dd3c4 100644
--- a/HeavenlyWind.Game/Parsers/Root/Member/PracticeOpponentsParser.cs
+++ b/HeavenlyWind.Game/Parsers/Root/Member/PracticeOpponentsParser.cs
@@ -8,11 +8,10 @@ class PracticeOpponentsParser : ApiParser<RawPracticeOpponentInfo>
     {
         public override void ProcessCore(ApiInfo rpInfo, RawPracticeOpponentInfo rpData)
         {
-            var rPracticeInfo = Game.Sortie as PracticeInfo;
-            if (rPracticeInfo != null)
-                rPracticeInfo.Opponent.Update(rpData);
+            if (Game.Practice == null)
+                Game.Practice = new PracticeInfo(rpData);
             else
-                Game.Sortie = new PracticeInfo(rpData);
+                Game.Practice.Opponent.Update(rpData);
         }
     }
 }
diff --git a/HeavenlyWind.Game/Parsers/Root/PortParser.cs b/HeavenlyWind.Game/Parsers/Root/PortParser.cs
index 5fca9058..d9e1ca08 100644
--- a/HeavenlyWind.Game/Parsers/Root/PortParser.cs
+++ b/HeavenlyWind.Game/Parsers/Root/PortParser.cs
@@ -11,12 +11,14 @@ public override void ProcessCore(ApiInfo rpInfo, RawPort rpData)
             Game.MasterInfo.WaitForInitialization();
 
             var rSortie = Game.Sortie;
-            if (rSortie != null && !(rSortie is PracticeInfo))
+            if (rSortie != null)
             {
                 rSortie.ReturnTime = rpInfo.Timestamp;
                 Game.RaiseReturnedFromSortie(rSortie);
+                Game.Sortie = null;
             }
-            Game.Sortie = null;
+
+            Game.Practice = null;
 
             Game.Port.UpdateAdmiral(rpData.Basic);
             Game.Port.UpdatePort(rpData);
diff --git a/HeavenlyWind.Game/Port.cs b/HeavenlyWind.Game/Port.cs
index a6ee1666..1ec00d97 100644
--- a/HeavenlyWind.Game/Port.cs
+++ b/HeavenlyWind.Game/Port.cs
@@ -387,8 +387,8 @@ internal Port()
                 rShip.Repair(rIsInstantRepair);
                 rShip.OwnerFleet?.Update();
 
-                var rDock = RepairDocks[int.Parse(r.Parameters["api_ndock_id"])];
-                rDock.PendingToUpdateMaterials = true;
+                Materials.Fuel -= rShip.RepairFuelConsumption;
+                Materials.Steel -= rShip.RepairSteelConsumption;
                 if (rIsInstantRepair)
                     Materials.Bucket--;
             });
@@ -445,7 +445,14 @@ internal Port()
                 Materials.Bullet -= rAirForceGroups.Sum(r => r.LBASBulletConsumption);
             });
 
-            ApiService.Subscribe("api_req_air_corps/set_plane", r => Materials.Bauxite = r.GetData<RawAirForceGroupOrganization>().Bauxite);
+            ApiService.Subscribe("api_req_air_corps/set_plane", r =>
+            {
+                var rData = r.GetData<RawAirForceGroupOrganization>();
+                if (!rData.Bauxite.HasValue)
+                    return;
+
+                Materials.Bauxite = rData.Bauxite.Value;
+            });
 
             ApiService.Subscribe("api_req_hensei/lock", r => Ships[int.Parse(r.Parameters["api_ship_id"])].IsLocked = (bool)r.Json["api_data"]["api_locked"]);
             ApiService.Subscribe("api_req_kaisou/lock", r => Equipment[int.Parse(r.Parameters["api_slotitem_id"])].IsLocked = (bool)r.Json["api_data"]["api_locked"]);
diff --git a/HeavenlyWind.Game/Proxy/ApiSession.cs b/HeavenlyWind.Game/Proxy/ApiSession.cs
index 9ef633a1..9a711b86 100644
--- a/HeavenlyWind.Game/Proxy/ApiSession.cs
+++ b/HeavenlyWind.Game/Proxy/ApiSession.cs
@@ -1,14 +1,43 @@
-using System;
+using Sakuno.Collections;
+using System;
+using System.Collections.Generic;
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Proxy
 {
     public class ApiSession : NetworkSession
     {
+        static char[] r_RequestSeparator = new[] { '&' };
+
         public override NetworkSessionType Type => NetworkSessionType.API;
 
         string r_API;
         public override string DisplayUrl => r_API;
 
+        public override string RequestBodyString
+        {
+            get { return base.RequestBodyString; }
+
+            internal set
+            {
+                base.RequestBodyString = value;
+
+                if (!value.IsNullOrEmpty())
+                {
+                    Parameters = new ListDictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                    foreach (var rParameter in value.Split(r_RequestSeparator, StringSplitOptions.RemoveEmptyEntries))
+                    {
+                        var rPosition = rParameter.IndexOf('=');
+                        if (rPosition == -1)
+                            continue;
+
+                        Parameters.Add(rParameter.Remove(rPosition), rParameter.Substring(rPosition + 1));
+                    }
+                }
+            }
+        }
+
+        public IDictionary<string, string> Parameters { get; private set; }
+
         internal ApiSession(string rpFullUrl) : base(rpFullUrl)
         {
             var rPosition = rpFullUrl.IndexOf("/kcsapi/");
diff --git a/HeavenlyWind.Game/Proxy/KanColleProxy.cs b/HeavenlyWind.Game/Proxy/KanColleProxy.cs
index bf9c3c21..30ecf534 100644
--- a/HeavenlyWind.Game/Proxy/KanColleProxy.cs
+++ b/HeavenlyWind.Game/Proxy/KanColleProxy.cs
@@ -12,6 +12,7 @@
 using System.Reactive.Subjects;
 using System.Text.RegularExpressions;
 using System.Threading;
+using System.Collections.Generic;
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Proxy
 {
@@ -64,7 +65,10 @@ public static void Start()
             if (Preference.Instance.Network.AllowRequestsFromOtherDevices)
                 rStartupFlags |= FiddlerCoreStartupFlags.AllowRemoteClients;
 
-            FiddlerApplication.Startup(Preference.Instance.Network.Port, rStartupFlags);
+            var rPort = Preference.Instance.Network.Port.Default;
+            if (Preference.Instance.Network.PortCustomization)
+                rPort = Preference.Instance.Network.Port.Value;
+            FiddlerApplication.Startup(rPort, rStartupFlags);
         }
 
         static void FiddlerApplication_BeforeRequest(Session rpSession)
@@ -84,13 +88,22 @@ static void FiddlerApplication_BeforeRequest(Session rpSession)
             var rPath = rpSession.PathAndQuery;
 
             NetworkSession rSession;
+            ApiSession rApiSession = null;
+
             if (rPath.StartsWith("/kcsapi/"))
-                rSession = new ApiSession(rFullUrl);
+                rSession = rApiSession = new ApiSession(rFullUrl);
             else if (rPath.StartsWith("/kcs/") || rPath.StartsWith("/gadget/"))
                 rSession = new ResourceSession(rFullUrl, rPath);
             else
                 rSession = new NetworkSession(rFullUrl);
 
+            if (rApiSession != null && RequestFilterService.Instance.IsBlocked(rApiSession))
+            {
+                rSession.State = NetworkSessionState.Blocked;
+                rpSession.utilCreateResponseAndBypassServer();
+                return;
+            }
+
             rSession.RequestBodyString = Uri.UnescapeDataString(rpSession.GetRequestBodyAsString());
             rSession.Method = rpSession.RequestMethod;
 
@@ -159,6 +172,9 @@ static void FiddlerApplication_BeforeResponse(Session rpSession)
                 if (rResourceSession != null)
                     CacheService.Instance.ProcessResponse(rResourceSession, rpSession);
 
+                if (rResourceSession == null && rApiSession == null)
+                    rSession.ResponseBodyString = rpSession.GetResponseBodyAsString();
+
                 if (rpSession.PathAndQuery.OICEquals("/gadget/js/kcs_flash.js"))
                 {
                     var rScript = rpSession.GetResponseBodyAsString();
@@ -283,10 +299,9 @@ static void InitializeAntiBlankScreenDataCollector()
             using (var rConnection = new SQLiteConnection(@"Data Source=Data\AntiBlankScreen.db; Page Size=8192").OpenAndReturn())
             using (var rCommand = rConnection.CreateCommand())
             {
-                rCommand.CommandText = "CREATE TABLE IF NOT EXISTS history(" +
-                    "time INTEGER PRIMARY KEY NOT NULL, " +
-                    "url TEXT NULL, " +
-                    "body TEXT NULL);";
+                rCommand.CommandText =
+                    "CREATE TABLE IF NOT EXISTS history(time INTEGER PRIMARY KEY NOT NULL, url TEXT NULL, body TEXT NULL); " +
+                    "DELETE FROM history WHERE (time / 10000000 - 62135596800) < strftime('%s', 'now', '-3 day');";
 
                 rCommand.ExecuteNonQuery();
             }
@@ -305,5 +320,21 @@ class NetworkAvailabilityService : INetworkAvailabilityService
         {
             public void EnsureNetwork() => r_TrafficBarrier?.Wait();
         }
+
+        class RequestFilterService : IRequestFilterService
+        {
+            public static RequestFilterService Instance { get; } = new RequestFilterService();
+
+            event Func<string, IDictionary<string, string>, bool> Filter;
+
+            RequestFilterService()
+            {
+                ServiceManager.Register<IRequestFilterService>(this);
+            }
+
+            public void Register(Func<string, IDictionary<string, string>, bool> filter) => Filter += filter;
+
+            public bool IsBlocked(ApiSession rpSession) => Filter == null ? false : Filter(rpSession.DisplayUrl, rpSession.Parameters);
+        }
     }
 }
diff --git a/HeavenlyWind.Game/Proxy/NetworkSession.cs b/HeavenlyWind.Game/Proxy/NetworkSession.cs
index dbf3f119..77775f1e 100644
--- a/HeavenlyWind.Game/Proxy/NetworkSession.cs
+++ b/HeavenlyWind.Game/Proxy/NetworkSession.cs
@@ -3,7 +3,7 @@
 namespace Sakuno.KanColle.Amatsukaze.Game.Proxy
 {
     public enum NetworkSessionType { Normal, Resource, API }
-    public enum NetworkSessionState { Requested, Responsed, Cached, LoadedFromCache, Error }
+    public enum NetworkSessionState { Requested, Responsed, Cached, LoadedFromCache, Error, Blocked }
 
     public class NetworkSession : ModelBase
     {
@@ -27,7 +27,7 @@ internal set
 
         public string Method { get; internal set; }
 
-        public string RequestBodyString { get; internal set; }
+        public virtual string RequestBodyString { get; internal set; }
 
         int? r_ContentLength;
         public int? ContentLength
diff --git a/HeavenlyWind.Game/Services/CacheService.cs b/HeavenlyWind.Game/Services/CacheService.cs
index 73363909..4d25d30e 100644
--- a/HeavenlyWind.Game/Services/CacheService.cs
+++ b/HeavenlyWind.Game/Services/CacheService.cs
@@ -29,7 +29,7 @@ public void Initialize()
             using (var rCommand = rConnection.CreateCommand())
             {
                 rCommand.CommandText =
-                    "PRAGMA journal_mode = WAL; " +
+                    "PRAGMA journal_mode = DELETE; " +
 
                     "CREATE TABLE IF NOT EXISTS file(" +
                         "name TEXT PRIMARY KEY NOT NULL, " +
diff --git a/HeavenlyWind.Game/Services/EnemyEncounterService.cs b/HeavenlyWind.Game/Services/EnemyEncounterService.cs
index 9266d25f..7a5325ad 100644
--- a/HeavenlyWind.Game/Services/EnemyEncounterService.cs
+++ b/HeavenlyWind.Game/Services/EnemyEncounterService.cs
@@ -68,6 +68,8 @@ public void Initialize()
                 "api_req_combined_battle/sp_midnight",
                 "api_req_combined_battle/ld_airbattle",
                 "api_req_combined_battle/ec_battle",
+                "api_req_combined_battle/each_battle",
+                "api_req_combined_battle/each_battle_water",
             };
             ApiService.Subscribe(rBattleApis, ProcessAbyssalFleet);
         }
diff --git a/HeavenlyWind.Game/Services/RecordService.cs b/HeavenlyWind.Game/Services/RecordService.cs
index 3dfaddd5..416c12fe 100644
--- a/HeavenlyWind.Game/Services/RecordService.cs
+++ b/HeavenlyWind.Game/Services/RecordService.cs
@@ -120,7 +120,7 @@ void Connect(int rpUserID)
             using (var rCommand = r_Connection.CreateCommand())
             {
                 rCommand.CommandText =
-                    "PRAGMA journal_mode = WAL; " +
+                    "PRAGMA journal_mode = DELETE; " +
                     "PRAGMA foreign_keys = ON;";
 
                 rCommand.ExecuteNonQuery();
diff --git a/HeavenlyWind.Game/Services/Records/BattleDetailRecords.cs b/HeavenlyWind.Game/Services/Records/BattleDetailRecords.cs
index 027e9496..ce2d6f82 100644
--- a/HeavenlyWind.Game/Services/Records/BattleDetailRecords.cs
+++ b/HeavenlyWind.Game/Services/Records/BattleDetailRecords.cs
@@ -36,7 +36,7 @@ internal BattleDetailRecords(SQLiteConnection rpConnection, int rpUserID) : base
             using (var rCommand = r_Connection.CreateCommand())
             {
                 rCommand.CommandText =
-                    "PRAGMA journal_mode = WAL; " +
+                    "PRAGMA journal_mode = DELETE; " +
                     "PRAGMA foreign_keys = ON;";
 
                 rCommand.ExecuteNonQuery();
@@ -54,6 +54,8 @@ internal BattleDetailRecords(SQLiteConnection rpConnection, int rpUserID) : base
                 "api_req_combined_battle/sp_midnight",
                 "api_req_combined_battle/ld_airbattle",
                 "api_req_combined_battle/ec_battle",
+                "api_req_combined_battle/each_battle",
+                "api_req_combined_battle/each_battle_water",
             };
             DisposableObjects.Add(ApiService.Subscribe(rSortieFirstStageApis, ProcessSortieFirstStage));
             DisposableObjects.Add(ApiService.Subscribe("api_req_practice/battle", ProcessPracticeFirstStage));
@@ -247,7 +249,7 @@ void ProcessSortieFirstStage(ApiInfo rpInfo)
         void ProcessPracticeFirstStage(ApiInfo rpInfo)
         {
             var rParticipantFleet = KanColleGame.Current.Port.Fleets[int.Parse(rpInfo.Parameters["api_deck_id"])];
-            var rPractice = (PracticeInfo)KanColleGame.Current.Sortie;
+            var rPractice = KanColleGame.Current.Practice;
             var rOpponent = rPractice.Opponent;
             r_CurrentBattleID = rPractice.Battle.ID;
 
diff --git a/HeavenlyWind.Game/Services/Records/BattleRecords.cs b/HeavenlyWind.Game/Services/Records/BattleRecords.cs
index fabc4cdc..bb2cf263 100644
--- a/HeavenlyWind.Game/Services/Records/BattleRecords.cs
+++ b/HeavenlyWind.Game/Services/Records/BattleRecords.cs
@@ -1,7 +1,6 @@
 using Sakuno.KanColle.Amatsukaze.Game.Models.Battle;
 using Sakuno.KanColle.Amatsukaze.Game.Models.Raw;
 using System.Data.SQLite;
-using System.Threading.Tasks;
 
 namespace Sakuno.KanColle.Amatsukaze.Game.Services.Records
 {
@@ -38,7 +37,11 @@ protected override void UpgradeFromOldVersionPreprocessStep(int rpOldVersion)
                         "ALTER TABLE battle ADD COLUMN mvp INTEGER; " +
                         "ALTER TABLE battle ADD COLUMN mvp_escort INTEGER;";
 
-                    rCommand.ExecuteNonQuery();
+                    try
+                    {
+                        rCommand.ExecuteNonQuery();
+                    }
+                    catch { }
                 }
         }
         protected override void CreateTable()
diff --git a/HeavenlyWind.Game/Services/Records/FateRecords.cs b/HeavenlyWind.Game/Services/Records/FateRecords.cs
index 91af29a3..721b54d8 100644
--- a/HeavenlyWind.Game/Services/Records/FateRecords.cs
+++ b/HeavenlyWind.Game/Services/Records/FateRecords.cs
@@ -60,6 +60,8 @@ internal FateRecords(SQLiteConnection rpConnection) : base(rpConnection)
                 "api_req_combined_battle/sp_midnight",
                 "api_req_combined_battle/ld_airbattle",
                 "api_req_combined_battle/ec_battle",
+                "api_req_combined_battle/each_battle",
+                "api_req_combined_battle/each_battle_water",
             };
             DisposableObjects.Add(ApiService.Subscribe(rFirstStages, ProcessBattle));
 
diff --git a/HeavenlyWind.Game/Services/Records/RecordsGroup.cs b/HeavenlyWind.Game/Services/Records/RecordsGroup.cs
index dc96aaff..b665212a 100644
--- a/HeavenlyWind.Game/Services/Records/RecordsGroup.cs
+++ b/HeavenlyWind.Game/Services/Records/RecordsGroup.cs
@@ -74,7 +74,9 @@ void UpdateVersion(int rpVersion)
         {
             using (var rCommand = Connection.CreateCommand())
             {
-                rCommand.CommandText = "INSERT OR REPLACE INTO versions(key, value) VALUES(@group, @version);";
+                rCommand.CommandText =
+                    "INSERT OR IGNORE INTO versions(key, value) VALUES(@group, @version); " +
+                    "UPDATE versions SET value = @version WHERE key = @group AND cast(value AS INT) < @version;";
                 rCommand.Parameters.AddWithValue("@group", GroupName);
                 rCommand.Parameters.AddWithValue("@version", Version.ToString());
 
diff --git a/HeavenlyWind.Game/Services/Records/SortieConsumptionRecords.cs b/HeavenlyWind.Game/Services/Records/SortieConsumptionRecords.cs
index 7e5b2266..622dbe5c 100644
--- a/HeavenlyWind.Game/Services/Records/SortieConsumptionRecords.cs
+++ b/HeavenlyWind.Game/Services/Records/SortieConsumptionRecords.cs
@@ -48,6 +48,10 @@ public SortieConsumptionRecords(SQLiteConnection rpConnection) : base(rpConnecti
 
             DisposableObjects.Add(ApiService.Subscribe(new[] { "api_req_map/start", "api_req_map/next" }, Exploration));
 
+            DisposableObjects.Add(ApiService.Subscribe(new[] { "api_req_sortie/battleresult", "api_req_combined_battle/battleresult" }, ProcessBattleResult));
+            DisposableObjects.Add(ApiService.Subscribe("api_port/port", CommitReward));
+            DisposableObjects.Add(ApiService.Subscribe("api_start2", ForfeitReward));
+
             DisposableObjects.Add(ApiService.Subscribe("api_req_practice/battle", StartPractice));
 
             DisposableObjects.Add(ApiService.Subscribe("api_req_mission/result", ExpeditionResult));
@@ -105,6 +109,14 @@ protected override void CreateTable()
                         "bullet INTEGER, " +
                         "steel INTEGER, " +
                         "bauxite INTEGER, " +
+                        "bucket INTEGER); " +
+
+                    "CREATE TEMPORARY TABLE IF NOT EXISTS sortie_reward_pending(" +
+                        "type INTEGER PRIMARY KEY NOT NULL, " +
+                        "fuel INTEGER, " +
+                        "bullet INTEGER, " +
+                        "steel INTEGER, " +
+                        "bauxite INTEGER, " +
                         "bucket INTEGER); ";
 
                 rCommand.ExecuteNonQuery();
@@ -139,6 +151,7 @@ protected override void Load()
         void StartSortie(ApiInfo rpData)
         {
             var rBuilder = new StringBuilder(512);
+            rBuilder.AppendLine("DELETE FROM sortie_reward_pending;");
             rBuilder.AppendLine("INSERT INTO sortie_consumption(id) VALUES (@id);");
             rBuilder.Append("INSERT INTO sortie_participant_ship(id, ship_id, ship, type) VALUES");
 
@@ -332,8 +345,8 @@ void UseBucket(ApiInfo rpInfo)
         void ResetAnchorageRepairSnapshots(ApiInfo rpInfo)
         {
             var rBuilder = new StringBuilder(128);
-            rBuilder.Append("DELETE FROM anchorage_repair; ");
-            rBuilder.Append("DELETE FROM common WHERE key = 'anchorage_repair_start_time'; ");
+            rBuilder.AppendLine("DELETE FROM anchorage_repair; ");
+            rBuilder.AppendLine("DELETE FROM common WHERE key = 'anchorage_repair_start_time'; ");
 
             r_AnchorageRepairSnapshots.Clear();
 
@@ -358,9 +371,9 @@ void ResetAnchorageRepairSnapshots(ApiInfo rpInfo)
 
                     rBuilder.Append($"({rShip.ID}, {rShip.HP.Current}, {rShip.RepairTime.Value.TotalMinutes}, {rShip.RepairFuelConsumption}, {rShip.RepairSteelConsumption})");
                 }
-                rBuilder.Append(';');
+                rBuilder.AppendLine(";");
 
-                rBuilder.Append($"INSERT OR REPLACE INTO common(key, value) VALUES('anchorage_repair_start_time', {r_AnchorageRepairStartTime});");
+                rBuilder.AppendLine($"INSERT OR REPLACE INTO common(key, value) VALUES('anchorage_repair_start_time', {r_AnchorageRepairStartTime});");
             }
 
             var rCommand = Connection.CreateCommand();
@@ -389,7 +402,7 @@ void ProcessAnchorageRepair(ApiInfo rpInfo)
 
                 rBuilder.Append($"((SELECT max(id) FROM sortie_participant_ship WHERE ship_id = {rSnapshot.ShipID}), 4)");
             }
-            rBuilder.Append("; ");
+            rBuilder.AppendLine(";");
 
             var rRemovedIDs = new List<int>();
 
@@ -402,7 +415,7 @@ void ProcessAnchorageRepair(ApiInfo rpInfo)
                 var rFuelConsumption = Math.Ceiling(rSnapshot.FuelConsumption * rRate);
                 var rSteelConsumption = Math.Ceiling(rSnapshot.SteelConsumption * rRate);
 
-                rBuilder.Append($"UPDATE sortie_consumption_detail SET fuel = ifnull(fuel, 0) + {rFuelConsumption}, steel = ifnull(steel, 0) + {rSteelConsumption} WHERE id = (SELECT max(id) FROM sortie_participant_ship WHERE ship_id = {rSnapshot.ShipID}) AND type = 4; ");
+                rBuilder.AppendLine($"UPDATE sortie_consumption_detail SET fuel = ifnull(fuel, 0) + {rFuelConsumption}, steel = ifnull(steel, 0) + {rSteelConsumption} WHERE id = (SELECT max(id) FROM sortie_participant_ship WHERE ship_id = {rSnapshot.ShipID}) AND type = 4; ");
 
                 var rShip = rSnapshot.Ship;
                 if (rShip.HP.Current < rShip.HP.Maximum)
@@ -415,19 +428,19 @@ void ProcessAnchorageRepair(ApiInfo rpInfo)
             }
 
             if (rRemovedIDs.Count > 0)
-                rBuilder.Append("DELETE FROM anchorage_repair WHERE ship IN (" + string.Join(", ", rRemovedIDs) + "); ");
+                rBuilder.AppendLine("DELETE FROM anchorage_repair WHERE ship IN (" + string.Join(", ", rRemovedIDs) + "); ");
 
             if (r_AnchorageRepairSnapshots.Count == 0)
             {
                 r_AnchorageRepairStartTime = 0;
-                rBuilder.Append("DELETE FROM common WHERE key = 'anchorage_repair_start_time';");
+                rBuilder.AppendLine("DELETE FROM common WHERE key = 'anchorage_repair_start_time';");
             }
             else
             {
                 r_AnchorageRepairStartTime = rpInfo.Timestamp;
-                rBuilder.Append($"INSERT OR REPLACE INTO common(key, value) VALUES('anchorage_repair_start_time', {r_AnchorageRepairStartTime});");
+                rBuilder.AppendLine($"INSERT OR REPLACE INTO common(key, value) VALUES('anchorage_repair_start_time', {r_AnchorageRepairStartTime});");
 
-                rBuilder.Append("INSERT OR REPLACE INTO anchorage_repair(ship, hp, repair_time, fuel_consumption, steel_consumption) VALUES");
+                rBuilder.AppendLine("INSERT OR REPLACE INTO anchorage_repair(ship, hp, repair_time, fuel_consumption, steel_consumption) VALUES");
 
                 rFirst = true;
                 foreach (var rSnapshot in r_AnchorageRepairSnapshots.Values)
@@ -439,7 +452,7 @@ void ProcessAnchorageRepair(ApiInfo rpInfo)
 
                     rBuilder.Append($"({rSnapshot.ShipID}, {rSnapshot.HP}, {rSnapshot.RepairTime}, {rSnapshot.FuelConsumption}, {rSnapshot.SteelConsumption})");
                 }
-                rBuilder.Append(';');
+                rBuilder.AppendLine(";");
             }
 
             var rCommand = Connection.CreateCommand();
@@ -503,75 +516,158 @@ void Remodel(ApiInfo rpInfo)
 
         void Exploration(ApiInfo rpInfo)
         {
+            var rCommand = Connection.CreateCommand();
+            rCommand.CommandText = "INSERT OR REPLACE INTO common(key, value) VALUES('is_reward_forfeited', @forfeited);";
+            rCommand.Parameters.AddWithValue("@id", SortieInfo.Current.ID);
+
             var rNode = SortieInfo.Current.Node;
+            rCommand.Parameters.AddWithValue("@forfeited", !rNode.IsDeadEnd);
+
             var rEvent = rNode.Event as RewardEventBase;
-            if (rEvent == null)
-                return;
+            if (rEvent != null)
+                ProcessReward(rCommand, rNode, rEvent);
 
-            IList<string> rSetters = null;
+            rCommand.PostToTransactionQueue();
+        }
+        void ProcessReward(SQLiteCommand rpCommand, SortieNodeInfo rpNode, RewardEventBase rpEvent)
+        {
+            StringBuilder rBuilder = null;
 
-            switch (rNode.EventType)
+            switch (rpNode.EventType)
             {
                 case SortieEventType.Reward:
-                case SortieEventType.AviationReconnaissance:
-                    var rRewards = ((RewardEvent)rEvent).Rewards;
+                    var rRewards = ((RewardEvent)rpEvent).Rewards;
                     if (rRewards == null || rRewards.Count == 0)
                         return;
 
                     foreach (var rReward in rRewards)
                     {
-                        var rSetter = GetRewardSetter(rReward.ID, rReward.Quantity);
-                        if (rSetter == null)
+                        if (!IsRewardValid(rReward.ID))
                             continue;
 
-                        if (rSetters == null)
-                            rSetters = new List<string>();
+                        if (rBuilder == null)
+                        {
+                            rBuilder = new StringBuilder(256);
+                            rBuilder.AppendLine("INSERT OR IGNORE INTO sortie_reward_pending(type) VALUES(0);");
+                        }
 
-                        rSetters.Add(rSetter);
+                        var rSetter = GetRewardSetter(rReward.ID, rReward.Quantity);
+
+                        rBuilder.Append("UPDATE sortie_reward_pending SET ");
+                        rBuilder.Append(rSetter);
+                        rBuilder.AppendLine(" WHERE type = 0;");
                     }
                     break;
 
+                case SortieEventType.AviationReconnaissance:
+                    if (((AviationReconnaissanceEvent)rpEvent).Result == AviationReconnaissanceResult.Failure || !IsRewardValid(rpEvent.ID))
+                        return;
+
+                    rBuilder = new StringBuilder(256);
+                    rBuilder.AppendLine("INSERT OR IGNORE INTO sortie_reward_pending(type) VALUES(1);");
+                    rBuilder.Append("UPDATE sortie_reward_pending SET ");
+                    rBuilder.Append(GetRewardSetter(rpEvent.ID, rpEvent.Quantity));
+                    rBuilder.AppendLine(" WHERE type = 1;");
+                    break;
+
                 case SortieEventType.EscortSuccess:
-                    rSetters = new[] { GetRewardSetter(rEvent.ID, rEvent.Quantity) };
+                    if (!IsRewardValid(rpEvent.ID))
+                        return;
+
+                    rBuilder = new StringBuilder(256);
+                    rBuilder.AppendLine("INSERT OR IGNORE INTO sortie_reward(id) VALUES(@id);");
+                    rBuilder.Append("UPDATE sortie_reward SET ");
+                    rBuilder.Append(GetRewardSetter(rpEvent.ID, rpEvent.Quantity));
+                    rBuilder.AppendLine(" WHERE id = @id;");
                     break;
 
-                default:
-                    return;
+                default: return;
             }
 
-            if (rSetters == null || rSetters.Count == 0)
+            if (rBuilder == null)
                 return;
 
-            var rCommand = Connection.CreateCommand();
-            rCommand.CommandText =
-                "INSERT OR IGNORE INTO sortie_reward(id) VALUES(@id); " +
-                "UPDATE sortie_reward SET " + rSetters.Join(", ") + " WHERE id = @id;";
-            rCommand.Parameters.AddWithValue("@id", SortieInfo.Current.ID);
-
-            rCommand.PostToTransactionQueue();
+            rpCommand.CommandText += rBuilder.ToString();
         }
+        bool IsRewardValid(MaterialType rpType) =>
+            rpType == MaterialType.Fuel ||
+            rpType == MaterialType.Bullet ||
+            rpType == MaterialType.Steel ||
+            rpType == MaterialType.Bauxite ||
+            rpType == MaterialType.Bucket;
         string GetRewardSetter(MaterialType rpType, int rpQuantity)
         {
             switch (rpType)
             {
                 case MaterialType.Fuel:
-                    return "fuel = coalesce(fuel, 0) + " + rpQuantity;
+                    return "fuel = ifnull(fuel, 0) + " + rpQuantity;
 
                 case MaterialType.Bullet:
-                    return "bullet = coalesce(bullet, 0) + " + rpQuantity;
+                    return "bullet = ifnull(bullet, 0) + " + rpQuantity;
 
                 case MaterialType.Steel:
-                    return "steel = coalesce(steel, 0) + " + rpQuantity;
+                    return "steel = ifnull(steel, 0) + " + rpQuantity;
 
                 case MaterialType.Bauxite:
-                    return "bauxite = coalesce(bauxite, 0) + " + rpQuantity;
+                    return "bauxite = ifnull(bauxite, 0) + " + rpQuantity;
 
                 case MaterialType.Bucket:
-                    return "bucket = coalesce(bucket, 0) + " + rpQuantity;
+                    return "bucket = ifnull(bucket, 0) + " + rpQuantity;
+            }
 
-                default:
-                    return null;
+            throw new ArgumentException(nameof(rpType));
+        }
+
+        void ProcessBattleResult(ApiInfo rpInfo)
+        {
+            var rData = rpInfo.GetData<RawBattleResult>();
+
+            var rCommand = RecordService.Instance.CreateCommand();
+            rCommand.CommandText = "INSERT OR REPLACE INTO common(key, value) VALUES('is_reward_forfeited', (SELECT ifnull((SELECT fuel IS NULL AND bullet IS NULL AND steel IS NULL AND bauxite IS NULL AND bucket IS NULL FROM sortie_reward_pending WHERE type = 0), 1)));";
+
+            if (rData.IsAviationReconnaissanceRewardConfirmed)
+            {
+                rCommand.CommandText +=
+                    "INSERT OR IGNORE INTO sortie_reward(id) VALUES(@id); " +
+                    "UPDATE sortie_reward SET fuel = nullif(ifnull(fuel, 0) + ifnull((SELECT fuel FROM sortie_reward_pending WHERE type = 1), 0), 0), " +
+                        "bullet = nullif(ifnull(bullet, 0) + ifnull((SELECT bullet FROM sortie_reward_pending WHERE type = 1), 0), 0), " +
+                        "steel = nullif(ifnull(steel, 0) + ifnull((SELECT steel FROM sortie_reward_pending WHERE type = 1), 0), 0), " +
+                        "bauxite = nullif(ifnull(bauxite, 0) + ifnull((SELECT bauxite FROM sortie_reward_pending WHERE type = 1), 0), 0), " +
+                        "bucket = nullif(ifnull(bucket, 0) + ifnull((SELECT bucket FROM sortie_reward_pending WHERE type = 1), 0), 0) WHERE id = @id; " +
+                    "DELETE FROM sortie_reward_pending WHERE type = 1;";
+                rCommand.Parameters.AddWithValue("@id", SortieInfo.Current.ID);
             }
+
+            rCommand.PostToTransactionQueue();
+        }
+        void CommitReward(ApiInfo rpInfo)
+        {
+            var rCommand = RecordService.Instance.CreateCommand();
+            rCommand.CommandText = "SELECT value FROM common WHERE key = 'is_reward_forfeited';";
+
+            var rIsForfeited = rCommand.ExecuteScalar();
+            if (rIsForfeited == DBNull.Value || Convert.ToBoolean(rIsForfeited))
+                return;
+
+            rCommand.CommandText = "INSERT OR REPLACE INTO common(key, value) VALUES('is_reward_forfeited', 1);";
+
+            if (rIsForfeited != null)
+                rCommand.CommandText =
+                    "INSERT OR IGNORE INTO sortie_reward(id) VALUES((SELECT max(id) FROM sortie)); " +
+                    "UPDATE sortie_reward SET fuel = nullif(ifnull(fuel, 0) + ifnull((SELECT fuel FROM sortie_reward_pending WHERE type = 0), 0), 0), " +
+                        "bullet = nullif(ifnull(bullet, 0) + ifnull((SELECT bullet FROM sortie_reward_pending WHERE type = 0), 0), 0), " +
+                        "steel = nullif(ifnull(steel, 0) + ifnull((SELECT steel FROM sortie_reward_pending WHERE type = 0), 0), 0), " +
+                        "bauxite = nullif(ifnull(bauxite, 0) + ifnull((SELECT bauxite FROM sortie_reward_pending WHERE type = 0), 0), 0), " +
+                        "bucket = nullif(ifnull(bucket, 0) + ifnull((SELECT bucket FROM sortie_reward_pending WHERE type = 0), 0), 0) WHERE id = (SELECT max(id) FROM sortie); " +
+                    "DELETE FROM sortie_reward_pending WHERE type = 0; " + rCommand.CommandText;
+
+            rCommand.PostToTransactionQueue();
+        }
+        void ForfeitReward(ApiInfo rpInfo)
+        {
+            var rCommand = RecordService.Instance.CreateCommand();
+            rCommand.CommandText = "INSERT OR REPLACE INTO common(key, value) VALUES('is_reward_forfeited', 1);";
+            rCommand.ExecuteNonQuery();
         }
 
         void StartPractice(ApiInfo rpInfo)
@@ -621,7 +717,7 @@ void AirBasePlaneDeployment(ApiInfo rpInfo)
                 return;
 
             var rData = rpInfo.GetData<RawAirForceGroupOrganization>();
-            if (rData.Squadrons.Length > 1)
+            if (!rData.Bauxite.HasValue)
                 return;
 
             var rPlane = Port.Equipment[rPlaneID].Info;
diff --git a/HeavenlyWind.Game/Services/Records/SortieRecords.cs b/HeavenlyWind.Game/Services/Records/SortieRecords.cs
index 4f16547d..fe482306 100644
--- a/HeavenlyWind.Game/Services/Records/SortieRecords.cs
+++ b/HeavenlyWind.Game/Services/Records/SortieRecords.cs
@@ -120,7 +120,11 @@ protected override void UpgradeFromOldVersionPreprocessStep(int rpOldVersion)
                 {
                     rCommand.CommandText = "ALTER TABLE sortie ADD COLUMN map_hp INTEGER;";
 
-                    rCommand.ExecuteNonQuery();
+                    try
+                    {
+                        rCommand.ExecuteNonQuery();
+                    }
+                    catch { }
                 }
         }
 
diff --git a/HeavenlyWind/App.xaml.cs b/HeavenlyWind/App.xaml.cs
index bfba3683..2766bd6d 100644
--- a/HeavenlyWind/App.xaml.cs
+++ b/HeavenlyWind/App.xaml.cs
@@ -27,6 +27,8 @@ public partial class App : Application
     {
         public static MainWindowViewModel Root { get; private set; }
 
+        IntPtr r_MainWindowHandle;
+
         protected override void OnStartup(StartupEventArgs e)
         {
             DispatcherUtil.UIDispatcher = Dispatcher;
@@ -37,6 +39,7 @@ protected override void OnStartup(StartupEventArgs e)
             {
                 DispatcherUnhandledException += App_DispatcherUnhandledException;
                 AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
+                TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
             }
 
             base.OnStartup(e);
@@ -82,8 +85,7 @@ protected override void OnStartup(StartupEventArgs e)
             ServiceManager.Register<IBrowserService>(BrowserService.Instance);
 
             PluginService.Instance.Initialize();
-
-            KanColleProxy.Start();
+            Preference.Instance.Reload();
 
             ShutdownMode = ShutdownMode.OnMainWindowClose;
 
@@ -92,7 +94,10 @@ protected override void OnStartup(StartupEventArgs e)
             if (e.Args.Any(r => r.OICEquals("--background")))
                 return;
 
-            MainWindow = new MainWindow();
+            var rMainWindow = new MainWindow();
+            r_MainWindowHandle = rMainWindow.Handle;
+
+            MainWindow = rMainWindow;
             MainWindow.DataContext = Root = new MainWindowViewModel();
             MainWindow.Show();
         }
@@ -114,6 +119,12 @@ void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs
         {
             ShowUnhandledExceptionDialog((Exception)e.ExceptionObject);
         }
+        void TaskScheduler_UnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e)
+        {
+            e.SetObserved();
+
+            ShowUnhandledExceptionDialog(e.Exception);
+        }
 
         void ShowUnhandledExceptionDialog(Exception rpException)
         {
@@ -143,7 +154,7 @@ void ShowUnhandledExceptionDialog(Exception rpException)
                 Detail = rpException.ToString(),
                 ShowDetailAtTheBottom = true,
 
-                OwnerWindow = MainWindow,
+                OwnerWindowHandle = r_MainWindowHandle,
                 ShowAtTheCenterOfOwner = true,
             };
 
@@ -153,11 +164,20 @@ void ShowUnhandledExceptionDialog(Exception rpException)
                 rDialog.FooterIcon = TaskDialogIcon.Information;
                 rDialog.Footer = string.Format(UnhandledExceptionDialogStringResources.Footer, $"<a href=\"{rLogFilename}\">{rLogFilename}</a>");
 
-                rDialog.HyperlinkClicked += delegate
+                EventHandler<string> rHyperlinkClicked = null;
+                rHyperlinkClicked = delegate
                 {
                     if (File.Exists(rLogFilename))
                         Process.Start(rLogFilename);
-                }; ;
+                };
+                EventHandler rClosed = null;
+                rClosed = delegate
+                {
+                    rDialog.HyperlinkClicked -= rHyperlinkClicked;
+                    rDialog.Closed -= rClosed;
+                };
+                rDialog.HyperlinkClicked += rHyperlinkClicked;
+                rDialog.Closed += rClosed;
             }
 
             rDialog.ShowAndDispose();
diff --git a/HeavenlyWind/Controls/Indicator.cs b/HeavenlyWind/Controls/Indicator.cs
index 1cf2bbc8..175c06bc 100644
--- a/HeavenlyWind/Controls/Indicator.cs
+++ b/HeavenlyWind/Controls/Indicator.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using System;
+using System.Windows;
 using System.Windows.Controls;
 
 namespace Sakuno.KanColle.Amatsukaze.Controls
@@ -65,13 +66,13 @@ void Track_SizeChanged(object sender, SizeChangedEventArgs e)
         void SetMedianIndicatorLength(int rpValue)
         {
             if (r_MedianIndicator != null && Maximum != 0)
-                r_MedianIndicator.Width = rpValue / (double)Maximum * r_Track.ActualWidth;
+                r_MedianIndicator.Width = Math.Max(rpValue, 0) / (double)Maximum * r_Track.ActualWidth;
         }
 
         void SetIndicatorLength(int rpValue)
         {
             if (r_Track != null && r_Indicator != null && Maximum != 0)
-                r_Indicator.Width = rpValue / (double)Maximum * r_Track.ActualWidth;
+                r_Indicator.Width = Math.Max(rpValue, 0) / (double)Maximum * r_Track.ActualWidth;
         }
     }
 }
diff --git a/HeavenlyWind/HeavenlyWind.csproj b/HeavenlyWind/HeavenlyWind.csproj
index fa32df82..4b7a6871 100644
--- a/HeavenlyWind/HeavenlyWind.csproj
+++ b/HeavenlyWind/HeavenlyWind.csproj
@@ -45,48 +45,48 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Expression.Interaction.3.0.40218.0\lib\net45\Microsoft.Expression.Interactions.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Expression.Interaction.3.0.40218.0\lib\net45\Microsoft.Expression.Interactions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Sakuno.Toast, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sakuno.Toast.1.0.0.0\lib\net45\Sakuno.Toast.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Sakuno.Toast.1.0.0.0\lib\net45\Sakuno.Toast.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.103.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.103\lib\net45\System.Data.SQLite.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\lib\net45\System.Data.SQLite.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Windows.Threading, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-XAML.2.2.5\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Rx-XAML.2.2.5\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Expression.Interaction.3.0.40218.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Expression.Interaction.3.0.40218.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
@@ -150,6 +150,7 @@
     <Compile Include="Models\Records\DevelopmentRecord.cs" />
     <Compile Include="Models\Records\ExpeditionRecord.cs" />
     <Compile Include="Models\Records\FateRecord.cs" />
+    <Compile Include="Models\Records\IRecordID.cs" />
     <Compile Include="Models\Records\ResourceRecord.cs" />
     <Compile Include="Models\Records\SortieConsumptionRecord.cs" />
     <Compile Include="Models\Records\SortieRecord.cs" />
@@ -194,9 +195,6 @@
     <Compile Include="ViewModels\Game\AirForceGroupViewModel.cs" />
     <Compile Include="ViewModels\Game\ConstructionDockViewModel.cs" />
     <Compile Include="ViewModels\Game\EventMapOverviewViewModel.cs" />
-    <Compile Include="ViewModels\Game\ExpeditionGroupByMapArea.cs" />
-    <Compile Include="ViewModels\Game\ExpeditionOverviewViewModel.cs" />
-    <Compile Include="ViewModels\Game\ExpeditionViewModel.cs" />
     <Compile Include="ViewModels\Game\FleetAnchorageRepairViewModel.cs" />
     <Compile Include="ViewModels\Game\FleetConditionRegenerationViewModel.cs" />
     <Compile Include="ViewModels\Game\FleetExpeditionStatusViewModel.cs" />
@@ -216,6 +214,8 @@
     <Compile Include="ViewModels\History\ExpeditionHistoryViewModel.cs" />
     <Compile Include="ViewModels\History\HistoryRecordsView.cs" />
     <Compile Include="ViewModels\History\HistoryViewModelBase.cs" />
+    <Compile Include="ViewModels\History\ResourceHistoryType.cs" />
+    <Compile Include="ViewModels\History\ResourceHistoryTypeKey.cs" />
     <Compile Include="ViewModels\History\ResourceHistoryViewModel.cs" />
     <Compile Include="ViewModels\History\ScrappingHistoryViewModel.cs" />
     <Compile Include="ViewModels\History\SortieConsumptionHistoryViewModel.cs" />
@@ -239,6 +239,9 @@
     <Compile Include="ViewModels\Overviews\ShipViewModel.cs" />
     <Compile Include="ViewModels\Plugins\PluginViewModel.cs" />
     <Compile Include="ViewModels\Preferences\PreferencesWindowViewModel.cs" />
+    <Compile Include="ViewModels\Statistics\SortieStatisticAreaViewModel.cs" />
+    <Compile Include="ViewModels\Statistics\SortieStatisticCustomTimeSpanGroupViewModel.cs" />
+    <Compile Include="ViewModels\Statistics\SortieStatisticDefaultTimeSpanGroupViewModel.cs" />
     <Compile Include="ViewModels\Statistics\SortieStatisticTimeSpanGroupViewModel.cs" />
     <Compile Include="ViewModels\Statistics\SortieStatisticViewModel.cs" />
     <Compile Include="ViewModels\TabItemViewModel.cs" />
@@ -271,6 +274,9 @@
     <Compile Include="Views\Game\AirBaseOverview.xaml.cs">
       <DependentUpon>AirBaseOverview.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Game\Events\EnemyAerialRaid.xaml.cs">
+      <DependentUpon>EnemyAerialRaid.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Game\Battle\EnemyEncounters.xaml.cs">
       <DependentUpon>EnemyEncounters.xaml</DependentUpon>
     </Compile>
@@ -310,9 +316,6 @@
     <Compile Include="Views\Game\Events\Whirlpool.xaml.cs">
       <DependentUpon>Whirlpool.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Game\ExpeditionOverview.xaml.cs">
-      <DependentUpon>ExpeditionOverview.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\Game\FleetDetail.xaml.cs">
       <DependentUpon>FleetDetail.xaml</DependentUpon>
     </Compile>
@@ -507,6 +510,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Styles\Common\TabItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Styles\Common\UnsuppliedToolTip.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -815,6 +822,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Game\Events\EnemyAerialRaid.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Game\Battle\EnemyEncounters.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -867,10 +878,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\Game\ExpeditionOverview.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Views\Game\FleetDetail.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1052,12 +1059,12 @@
     <PreBuildEvent>IF NOT EXIST "$(SolutionDir)Resources" exit 
 xcopy /D /Y /E /I "$(SolutionDir)Resources" "$(TargetDir)Resources"</PreBuildEvent>
   </PropertyGroup>
-  <Import Project="..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" />
+  <Import Project="$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\System.Data.SQLite.Core.1.0.103\build\net45\System.Data.SQLite.Core.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/HeavenlyWind/Internal/ItemsView.cs b/HeavenlyWind/Internal/ItemsView.cs
index 5e9a5218..04d241f5 100644
--- a/HeavenlyWind/Internal/ItemsView.cs
+++ b/HeavenlyWind/Internal/ItemsView.cs
@@ -19,6 +19,9 @@ abstract class ItemsView<T> : DisposableObject, IList, IList<T>, INotifyCollecti
 
         public void Refresh()
         {
+            if (Source == null)
+                return;
+
             BeforeRefresh();
 
             var rItems = Source.Where(Filter);
diff --git a/HeavenlyWind/Internal/TabContentTemplateSelector.cs b/HeavenlyWind/Internal/TabContentTemplateSelector.cs
index 1c0a1906..2dfb18de 100644
--- a/HeavenlyWind/Internal/TabContentTemplateSelector.cs
+++ b/HeavenlyWind/Internal/TabContentTemplateSelector.cs
@@ -26,8 +26,15 @@ static TabContentTemplateSelector()
             }
 
             var rContentPresenter = new FrameworkElementFactory(typeof(ContentPresenter));
-            rContentPresenter.SetBinding(ContentPresenter.ContentProperty, new Binding(nameof(ToolViewModel.View)));
-            r_ViewTypeMap.Add(typeof(ToolViewModel), new DataTemplate(typeof(ToolViewModel)) { VisualTree = rContentPresenter });
+            rContentPresenter.SetBinding(ContentControl.ContentProperty, new Binding(nameof(ToolViewModel.View)));
+            r_ViewTypeMap.Add(typeof(ToolWithoutScrollBarViewModel), new DataTemplate(typeof(ToolWithoutScrollBarViewModel)) { VisualTree = rContentPresenter });
+
+            var rScrollViewer = new FrameworkElementFactory(typeof(ScrollViewer));
+            rScrollViewer.SetBinding(ContentControl.ContentProperty, new Binding(nameof(ToolViewModel.View)));
+            rScrollViewer.SetBinding(ScrollViewer.VerticalScrollBarVisibilityProperty, new Binding("ScrollBarVisibilities.VerticalScrollBarVisibility") { TargetNullValue = ScrollBarVisibility.Auto, FallbackValue = ScrollBarVisibility.Auto });
+            rScrollViewer.SetBinding(ScrollViewer.HorizontalScrollBarVisibilityProperty, new Binding("ScrollBarVisibilities.HorizontalScrollBarVisibility") { TargetNullValue = ScrollBarVisibility.Disabled, FallbackValue = ScrollBarVisibility.Disabled });
+
+            r_ViewTypeMap.Add(typeof(ToolWithScrollBarViewModel), new DataTemplate(typeof(ToolWithScrollBarViewModel)) { VisualTree = rScrollViewer });
         }
 
         public override DataTemplate SelectTemplate(object rpItem, DependencyObject rpContainer)
diff --git a/HeavenlyWind/Models/Power.cs b/HeavenlyWind/Models/Power.cs
index 86908af9..f8b6763d 100644
--- a/HeavenlyWind/Models/Power.cs
+++ b/HeavenlyWind/Models/Power.cs
@@ -4,7 +4,7 @@ namespace Sakuno.KanColle.Amatsukaze.Models
 {
     public class Power : ModelBase
     {
-        public bool IsBatteryPresent => PowerManager.IsBatteryPresent;
+        public bool IsBatteryPresent { get; }
 
         PowerSource r_Source;
         public PowerSource Source
@@ -17,11 +17,13 @@ private set
                     r_Source = value;
                     OnPropertyChanged(nameof(Source));
                 }
+
+                IsOnExternalPower = value == PowerSource.AC;
             }
         }
 
-        int r_BatteryRemainingPercentage;
-        public int BatteryRemainingPercentage
+        double r_BatteryRemainingPercentage;
+        public double BatteryRemainingPercentage
         {
             get { return r_BatteryRemainingPercentage; }
             private set
@@ -34,13 +36,44 @@ private set
             }
         }
 
-        internal Power()
+        bool r_IsOnExternalPower;
+        public bool IsOnExternalPower
         {
-            if (OS.IsWin7OrLater)
+            get { return r_IsOnExternalPower; }
+            private set
             {
-                PowerManager.PowerSourceChanged += r => Source = r;
-                PowerManager.BatteryRemainingPercentageChanged += r => BatteryRemainingPercentage = r;
+                if (r_IsOnExternalPower != value)
+                {
+                    r_IsOnExternalPower = value;
+                    OnPropertyChanged(nameof(IsOnExternalPower));
+                }
             }
         }
+
+        bool r_IsCharging;
+        public bool IsCharging
+        {
+            get { return r_IsCharging; }
+            private set
+            {
+                if (r_IsCharging != value)
+                {
+                    r_IsCharging = value;
+                    OnPropertyChanged(nameof(IsCharging));
+                }
+            }
+        }
+
+        internal Power()
+        {
+            var rState = PowerManager.GetSystemBatteryState();
+
+            IsBatteryPresent = rState.BatteryPresent;
+            IsCharging = rState.Charging;
+
+            PowerManager.PowerSourceChanged += r => Source = r;
+            PowerManager.BatteryRemainingPercentageChanged += r => BatteryRemainingPercentage = r / 100.0;
+            PowerManager.BatteryChargeStatusChanged += r => IsCharging = r;
+        }
     }
 }
diff --git a/HeavenlyWind/Models/Records/ConstructionRecord.cs b/HeavenlyWind/Models/Records/ConstructionRecord.cs
index 2835163d..aade3a23 100644
--- a/HeavenlyWind/Models/Records/ConstructionRecord.cs
+++ b/HeavenlyWind/Models/Records/ConstructionRecord.cs
@@ -4,9 +4,10 @@
 
 namespace Sakuno.KanColle.Amatsukaze.Models.Records
 {
-    class ConstructionRecord : ModelBase
+    class ConstructionRecord : ModelBase, IRecordID
     {
-        public string Time { get; }
+        public long ID { get; set; }
+        public string Time => DateTimeUtil.FromUnixTime(ID).LocalDateTime.ToString();
 
         public ShipInfo Ship { get; }
 
@@ -24,7 +25,8 @@ class ConstructionRecord : ModelBase
 
         internal ConstructionRecord(SQLiteDataReader rpReader)
         {
-            Time = DateTimeUtil.FromUnixTime(rpReader.GetInt64("time")).LocalDateTime.ToString();
+            ID = rpReader.GetInt64("time");
+
             Ship = KanColleGame.Current.MasterInfo.Ships[rpReader.GetInt32("ship")];
 
             FuelConsumption = rpReader.GetInt32("fuel");
diff --git a/HeavenlyWind/Models/Records/DevelopmentRecord.cs b/HeavenlyWind/Models/Records/DevelopmentRecord.cs
index ada26e2c..a580ad02 100644
--- a/HeavenlyWind/Models/Records/DevelopmentRecord.cs
+++ b/HeavenlyWind/Models/Records/DevelopmentRecord.cs
@@ -1,13 +1,13 @@
 using Sakuno.KanColle.Amatsukaze.Game;
 using Sakuno.KanColle.Amatsukaze.Game.Models;
-using System;
 using System.Data.SQLite;
 
 namespace Sakuno.KanColle.Amatsukaze.Models.Records
 {
-    class DevelopmentRecord : ModelBase
+    class DevelopmentRecord : ModelBase, IRecordID
     {
-        public string Time { get; }
+        public long ID { get; set; }
+        public string Time => DateTimeUtil.FromUnixTime(ID).LocalDateTime.ToString();
 
         public EquipmentInfo Equipment { get; }
 
@@ -21,7 +21,8 @@ class DevelopmentRecord : ModelBase
 
         internal DevelopmentRecord(SQLiteDataReader rpReader)
         {
-            Time = DateTimeUtil.FromUnixTime(rpReader.GetInt64("time")).LocalDateTime.ToString();
+            ID = rpReader.GetInt64("time");
+
             var rEquipmentID = rpReader.GetInt32Optional("equipment");
             if (rEquipmentID.HasValue)
                 Equipment = KanColleGame.Current.MasterInfo.Equipment[rEquipmentID.Value];
diff --git a/HeavenlyWind/Models/Records/ExpeditionRecord.cs b/HeavenlyWind/Models/Records/ExpeditionRecord.cs
index d00bc180..0097dda9 100644
--- a/HeavenlyWind/Models/Records/ExpeditionRecord.cs
+++ b/HeavenlyWind/Models/Records/ExpeditionRecord.cs
@@ -1,13 +1,13 @@
 using Sakuno.KanColle.Amatsukaze.Game;
 using Sakuno.KanColle.Amatsukaze.Game.Models;
-using System;
 using System.Data.SQLite;
 
 namespace Sakuno.KanColle.Amatsukaze.Models.Records
 {
-    class ExpeditionRecord : ModelBase
+    class ExpeditionRecord : ModelBase, IRecordID
     {
-        public string Time { get; }
+        public long ID { get; set; }
+        public string Time => DateTimeUtil.FromUnixTime(ID).LocalDateTime.ToString();
 
         public ExpeditionInfo Expedition { get; }
 
@@ -25,7 +25,7 @@ class ExpeditionRecord : ModelBase
 
         internal ExpeditionRecord(SQLiteDataReader rpReader)
         {
-            Time = DateTimeUtil.FromUnixTime(rpReader.GetInt64("time")).LocalDateTime.ToString();
+            ID = rpReader.GetInt64("time");
 
             ExpeditionInfo rExpedition;
             if (KanColleGame.Current.MasterInfo.Expeditions.TryGetValue(rpReader.GetInt32("expedition"), out rExpedition))
diff --git a/HeavenlyWind/Models/Records/FateRecord.cs b/HeavenlyWind/Models/Records/FateRecord.cs
index e4224b2d..a999f27f 100644
--- a/HeavenlyWind/Models/Records/FateRecord.cs
+++ b/HeavenlyWind/Models/Records/FateRecord.cs
@@ -1,15 +1,13 @@
 using Sakuno.KanColle.Amatsukaze.Game;
 using Sakuno.KanColle.Amatsukaze.Game.Models;
-using System;
 using System.Data.SQLite;
 
 namespace Sakuno.KanColle.Amatsukaze.Models.Records
 {
-    class FateRecord : ModelBase
+    class FateRecord : ModelBase, IRecordID
     {
-        public string Time { get; }
-
-        public int ID { get; }
+        public long ID { get; set; }
+        public string Time => DateTimeUtil.FromUnixTime(ID).LocalDateTime.ToString();
 
         public bool IsEquipment { get; }
         public ShipInfo Ship { get; }
@@ -22,7 +20,7 @@ class FateRecord : ModelBase
 
         internal FateRecord(SQLiteDataReader rpReader)
         {
-            Time = DateTimeUtil.FromUnixTime(rpReader.GetInt64("time")).LocalDateTime.ToString();
+            ID = rpReader.GetInt64("time");
 
             var rMasterInfo = KanColleGame.Current.MasterInfo;
             var rMasterID = rpReader.GetInt32("master_id");
diff --git a/HeavenlyWind/Models/Records/IRecordID.cs b/HeavenlyWind/Models/Records/IRecordID.cs
new file mode 100644
index 00000000..fc543f6b
--- /dev/null
+++ b/HeavenlyWind/Models/Records/IRecordID.cs
@@ -0,0 +1,7 @@
+namespace Sakuno.KanColle.Amatsukaze.Models.Records
+{
+    interface IRecordID
+    {
+        long ID { get; }
+    }
+}
diff --git a/HeavenlyWind/Models/Records/ResourceRecord.cs b/HeavenlyWind/Models/Records/ResourceRecord.cs
index f88a9ec7..c32da622 100644
--- a/HeavenlyWind/Models/Records/ResourceRecord.cs
+++ b/HeavenlyWind/Models/Records/ResourceRecord.cs
@@ -1,63 +1,52 @@
-using System;
-using System.Data.SQLite;
+using System.Data.SQLite;
 
 namespace Sakuno.KanColle.Amatsukaze.Models.Records
 {
-    class ResourceRecord : ModelBase
+    class ResourceRecord : ModelBase, IRecordID
     {
-        public string Time { get; }
+        public long ID { get; set; }
+        public virtual string Time => DateTimeUtil.FromUnixTime(ID).LocalDateTime.ToString();
 
-        public int Fuel { get; }
-        public int FuelDifference { get; }
+        public ResourceRecord Previous { get; set; }
 
-        public int Bullet { get; }
-        public int BulletDifference { get; }
+        public int Fuel { get; set; }
+        public int FuelDifference => Previous != null ? Fuel - Previous.Fuel : 0;
 
-        public int Steel { get; }
-        public int SteelDifference { get; }
+        public int Bullet { get; set; }
+        public int BulletDifference => Previous != null ? Bullet - Previous.Bullet : 0;
 
-        public int Bauxite { get; }
-        public int BauxiteDifference { get; }
+        public int Steel { get; set; }
+        public int SteelDifference => Previous != null ? Steel - Previous.Steel : 0;
 
-        public int InstantConstruction { get; }
-        public int InstantConstructionDifference { get; }
+        public int Bauxite { get; set; }
+        public int BauxiteDifference => Previous != null ? Bauxite - Previous.Bauxite : 0;
 
-        public int Bucket { get; }
-        public int BucketDifference { get; }
+        public int InstantConstruction { get; set; }
+        public int InstantConstructionDifference => Previous != null ? InstantConstruction - Previous.InstantConstruction : 0;
 
-        public int DevelopmentMaterial { get; }
-        public int DevelopmentMaterialDifference { get; }
+        public int Bucket { get; set; }
+        public int BucketDifference => Previous != null ? Bucket - Previous.Bucket : 0;
 
-        public int ImprovementMaterial { get; }
-        public int ImprovementMaterialDifference { get; }
+        public int DevelopmentMaterial { get; set; }
+        public int DevelopmentMaterialDifference => Previous != null ? DevelopmentMaterial - Previous.DevelopmentMaterial : 0;
+
+        public int ImprovementMaterial { get; set; }
+        public int ImprovementMaterialDifference => Previous != null ? ImprovementMaterial - Previous.ImprovementMaterial : 0;
 
         public ResourceRecord(SQLiteDataReader rpReader)
         {
-            Time = DateTimeUtil.FromUnixTime(rpReader.GetInt64("time")).LocalDateTime.ToString();
+            ID = rpReader.GetInt64("time");
 
             Fuel = rpReader.GetInt32("fuel");
-            FuelDifference = rpReader.GetInt32("fuel_diff");
-
             Bullet = rpReader.GetInt32("bullet");
-            BulletDifference = rpReader.GetInt32("bullet_diff");
-
             Steel = rpReader.GetInt32("steel");
-            SteelDifference = rpReader.GetInt32("steel_diff");
-
             Bauxite = rpReader.GetInt32("bauxite");
-            BauxiteDifference = rpReader.GetInt32("bauxite_diff");
-
             InstantConstruction = rpReader.GetInt32("instant_construction");
-            InstantConstructionDifference = rpReader.GetInt32("instant_construction_diff");
-
             Bucket = rpReader.GetInt32("bucket");
-            BucketDifference = rpReader.GetInt32("bucket_diff");
-
             DevelopmentMaterial = rpReader.GetInt32("development_material");
-            DevelopmentMaterialDifference = rpReader.GetInt32("development_material_diff");
-
             ImprovementMaterial = rpReader.GetInt32("improvement_material");
-            ImprovementMaterialDifference = rpReader.GetInt32("improvement_material_diff");
         }
+
+        public void Update() => OnPropertyChanged(string.Empty);
     }
 }
diff --git a/HeavenlyWind/Models/Records/SortieConsumptionRecord.cs b/HeavenlyWind/Models/Records/SortieConsumptionRecord.cs
index d223a6ed..c78b8c20 100644
--- a/HeavenlyWind/Models/Records/SortieConsumptionRecord.cs
+++ b/HeavenlyWind/Models/Records/SortieConsumptionRecord.cs
@@ -1,12 +1,12 @@
 using Sakuno.KanColle.Amatsukaze.Game;
-using System;
 using System.Data.SQLite;
 
 namespace Sakuno.KanColle.Amatsukaze.Models.Records
 {
-    class SortieConsumptionRecord : SortieRecordBase
+    class SortieConsumptionRecord : SortieRecordBase, IRecordID
     {
-        public string Time { get; }
+        public long ID { get; set; }
+        public string Time => DateTimeUtil.FromUnixTime(ID).LocalDateTime.ToString();
 
         public ClampedValue MapHP { get; }
 
@@ -20,7 +20,7 @@ class SortieConsumptionRecord : SortieRecordBase
 
         internal SortieConsumptionRecord(SQLiteDataReader rpReader) : base(rpReader)
         {
-            Time = DateTimeUtil.FromUnixTime(rpReader.GetInt64("id")).LocalDateTime.ToString();
+            ID = rpReader.GetInt64("id");
 
             var rMapMaxHP = rpReader.GetInt32Optional("map_max_hp");
             if (rMapMaxHP.HasValue)
diff --git a/HeavenlyWind/Models/Records/SortieRecord.cs b/HeavenlyWind/Models/Records/SortieRecord.cs
index c34f6243..66139ddc 100644
--- a/HeavenlyWind/Models/Records/SortieRecord.cs
+++ b/HeavenlyWind/Models/Records/SortieRecord.cs
@@ -2,16 +2,15 @@
 using Sakuno.KanColle.Amatsukaze.Game.Models;
 using Sakuno.KanColle.Amatsukaze.Game.Models.Battle;
 using Sakuno.KanColle.Amatsukaze.Game.Services;
-using System;
 using System.Collections.Generic;
 using System.Data.SQLite;
 using System.Linq;
 
 namespace Sakuno.KanColle.Amatsukaze.Models.Records
 {
-    class SortieRecord : SortieRecordBase
+    class SortieRecord : SortieRecordBase, IRecordID
     {
-        internal long ID { get; }
+        public long ID { get; }
         public long SortieID { get; }
 
         public int Step { get; }
diff --git a/HeavenlyWind/Models/Records/SortieRecordBase.cs b/HeavenlyWind/Models/Records/SortieRecordBase.cs
index bcb58c03..a539bebc 100644
--- a/HeavenlyWind/Models/Records/SortieRecordBase.cs
+++ b/HeavenlyWind/Models/Records/SortieRecordBase.cs
@@ -1,6 +1,5 @@
 using Sakuno.KanColle.Amatsukaze.Game.Models;
 using Sakuno.KanColle.Amatsukaze.Game.Services;
-using System;
 using System.Data.SQLite;
 
 namespace Sakuno.KanColle.Amatsukaze.Models.Records
diff --git a/HeavenlyWind/Models/Statistics/SortieStatisticData.cs b/HeavenlyWind/Models/Statistics/SortieStatisticData.cs
index 127e004b..ee04c2e6 100644
--- a/HeavenlyWind/Models/Statistics/SortieStatisticData.cs
+++ b/HeavenlyWind/Models/Statistics/SortieStatisticData.cs
@@ -5,8 +5,6 @@ namespace Sakuno.KanColle.Amatsukaze.Models.Statistics
 {
     class SortieStatisticData : SortieRecordBase
     {
-        public SortieStatisticTimeSpanType Type { get; }
-
         public int Count { get; }
 
         public int FuelConsumption { get; }
@@ -24,8 +22,6 @@ class SortieStatisticData : SortieRecordBase
 
         public SortieStatisticData(SQLiteDataReader rpReader) : base(rpReader)
         {
-            Type = (SortieStatisticTimeSpanType)rpReader.GetInt32("type");
-
             Count = rpReader.GetInt32("count");
 
             FuelConsumption = rpReader.GetInt32("fuel_consumption");
diff --git a/HeavenlyWind/Models/Statistics/SortieStatisticTimeSpanType.cs b/HeavenlyWind/Models/Statistics/SortieStatisticTimeSpanType.cs
index df3ca3f5..a56b8ee6 100644
--- a/HeavenlyWind/Models/Statistics/SortieStatisticTimeSpanType.cs
+++ b/HeavenlyWind/Models/Statistics/SortieStatisticTimeSpanType.cs
@@ -8,5 +8,6 @@ public enum SortieStatisticTimeSpanType
         Yesterday,
         LastWeek,
         LastMonth,
+        Custom,
     }
 }
diff --git a/HeavenlyWind/Services/Browser/BrowserHost.cs b/HeavenlyWind/Services/Browser/BrowserHost.cs
index efaec8b6..cf87151f 100644
--- a/HeavenlyWind/Services/Browser/BrowserHost.cs
+++ b/HeavenlyWind/Services/Browser/BrowserHost.cs
@@ -23,10 +23,10 @@ public BrowserHost(IntPtr rpHandle)
 
             BrowserService.Instance.Messages.SubscribeOnDispatcher(CommunicatorMessages.InvalidateArrange, _ => InvalidateArrange());
 
-            LayoutTransform = r_ScaleTransform = new ScaleTransform(1.0 / StatusBarService.Instance.UIZoom, 1.0 / StatusBarService.Instance.UIZoom);
+            var rUIZoom = Preference.Instance.UI.Zoom.Value;
+            LayoutTransform = r_ScaleTransform = new ScaleTransform(1.0 / rUIZoom, 1.0 / rUIZoom);
 
-            var rPCEL = PropertyChangedEventListener.FromSource(StatusBarService.Instance);
-            rPCEL.Add(nameof(StatusBarService.Instance.UIZoom), (s, e) => r_ScaleTransform.ScaleX = r_ScaleTransform.ScaleY = 1.0 / StatusBarService.Instance.UIZoom);
+            Preference.Instance.UI.Zoom.Subscribe(r => r_ScaleTransform.ScaleX = r_ScaleTransform.ScaleY = 1.0 / r);
         }
 
         protected override HandleRef BuildWindowCore(HandleRef rpParentHandle)
diff --git a/HeavenlyWind/Services/Browser/BrowserNavigator.cs b/HeavenlyWind/Services/Browser/BrowserNavigator.cs
index deea8d6a..c2f8e71e 100644
--- a/HeavenlyWind/Services/Browser/BrowserNavigator.cs
+++ b/HeavenlyWind/Services/Browser/BrowserNavigator.cs
@@ -74,7 +74,6 @@ private set
 
         public ICommand ResizeBrowserToFitGameCommand { get; }
         public ICommand SetCookieCommand { get; }
-        public ICommand ShowSessionToolCommand => App.Root.GameInformation.Tools.ShowSessionToolCommand;
 
         public BrowserNavigator(BrowserService rpOwner)
         {
diff --git a/HeavenlyWind/Services/Browser/GameController.cs b/HeavenlyWind/Services/Browser/GameController.cs
index 0ec76d2a..8e290c85 100644
--- a/HeavenlyWind/Services/Browser/GameController.cs
+++ b/HeavenlyWind/Services/Browser/GameController.cs
@@ -44,15 +44,6 @@ private set
         public ICommand ZoomInCommand { get; private set; }
         public ICommand ZoomOutCommand { get; private set; }
         public IList<BrowserZoomInfo> ZoomFactors { get; }
-        public double Zoom
-        {
-            get { return Preference.Instance.Browser.Zoom; }
-            set
-            {
-                if (Zoom != value)
-                    SetZoom(value);
-            }
-        }
 
         public ICommand RestartGameCommand { get; }
 
@@ -112,9 +103,10 @@ public GameController(BrowserService rpOwner)
             }, () => OS.IsWin7OrLater && !r_IsAudioDeviceNotAvailable);
 
             SetZoomCommand = new DelegatedCommand<double>(SetZoom);
-            ZoomInCommand = new DelegatedCommand(() => SetZoom(Zoom + .05));
-            ZoomOutCommand = new DelegatedCommand(() => SetZoom(Zoom - .05));
-            ZoomFactors = new[] { .25, .5, .75, 1.0, 1.25, 1.5, 1.75, 2.0 }.Select(r => new BrowserZoomInfo(r, SetZoomCommand)).ToList().AsReadOnly();
+            ZoomInCommand = new DelegatedCommand(() => SetZoom(Preference.Instance.Browser.Zoom.Value + .05));
+            ZoomOutCommand = new DelegatedCommand(() => SetZoom(Preference.Instance.Browser.Zoom.Value - .05));
+
+            ZoomFactors = new[] { .25, .5, .75, 1.0, 1.25, 1.5, 1.75, 2.0 }.Select(r => new BrowserZoomInfo(r, SetZoomCommand)).ToArray();
 
             RestartGameCommand = new DelegatedCommand(RestartGame);
         }
@@ -165,12 +157,16 @@ bool IsDescendantOfHost(int rpProcessID)
 
         void SetZoom(double rpZoom)
         {
-            Preference.Instance.Browser.Zoom.Value = rpZoom;
-            OnPropertyChanged(nameof(Zoom));
+            rpZoom = Math.Round(rpZoom, 2);
+
+            if (rpZoom < .25)
+                return;
 
             foreach (var rInfo in ZoomFactors)
                 rInfo.IsSelected = rInfo.Zoom == rpZoom;
 
+            Preference.Instance.Browser.Zoom.Value = rpZoom;
+
             r_Owner.Communicator.Write(CommunicatorMessages.SetZoom + ":" + rpZoom);
             r_Owner.Communicator.Write(CommunicatorMessages.ResizeBrowserToFitGame);
             r_Owner.BrowserControl.Dispatcher.InvokeAsync(r_Owner.BrowserControl.ResizeBrowserToFitGame);
@@ -179,7 +175,7 @@ void SetZoom(double rpZoom)
         void RestartGame()
         {
             var rMode = Preference.Instance.Browser.RefreshConfirmationMode.Value;
-            if (rMode == ConfirmationMode.Always || (rMode == ConfirmationMode.DuringSortie && KanColleGame.Current.Sortie is SortieInfo && !(KanColleGame.Current.Sortie is PracticeInfo)))
+            if (rMode == ConfirmationMode.Always || (rMode == ConfirmationMode.DuringSortie && KanColleGame.Current.Sortie is SortieInfo))
             {
                 var rDialog = new TaskDialog()
                 {
diff --git a/HeavenlyWind/Services/BrowserService.cs b/HeavenlyWind/Services/BrowserService.cs
index 87710a0f..8018bb1e 100644
--- a/HeavenlyWind/Services/BrowserService.cs
+++ b/HeavenlyWind/Services/BrowserService.cs
@@ -6,7 +6,6 @@
 using Sakuno.UserInterface;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -197,5 +196,8 @@ internal async void ResizeBrowserToFitGame()
 
             ResizedToFitGame?.Invoke();
         }
+
+        public IDisposable RegisterMessageObserver(string rpMessage, Action<string> rpObserver) =>
+            Messages.Where(r => r.Key == rpMessage).Subscribe(r => rpObserver(r.Value));
     }
 }
diff --git a/HeavenlyWind/Services/NotificationService.cs b/HeavenlyWind/Services/NotificationService.cs
index ee6e00b9..09459674 100644
--- a/HeavenlyWind/Services/NotificationService.cs
+++ b/HeavenlyWind/Services/NotificationService.cs
@@ -6,6 +6,7 @@
 using Sakuno.KanColle.Amatsukaze.Game.Services;
 using Sakuno.KanColle.Amatsukaze.Models;
 using Sakuno.SystemInterop;
+using Sakuno.UserInterface;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -163,13 +164,16 @@ void InitializeHeavyDamageWarning(PropertyChangedEventListener rpGamePCEL)
             {
                 var rBattle = BattleInfo.Current.CurrentStage;
 
-                var rHeavilyDamagedShips = rBattle.Friend.Where(r => r.State == BattleParticipantState.HeavilyDamaged).Select(r => ((FriendShip)r.Participant).Ship).ToArray();
-                if (Preference.Instance.Notification.HeavyDamageWarning && rHeavilyDamagedShips.Length > 0)
+                var rHeavilyDamagedShips = rBattle.Friend.Where(r => !r.IsEvacuated && r.State == BattleParticipantState.HeavilyDamaged).Select(r => ((FriendShip)r.Participant).Ship).ToArray();
+                if (rHeavilyDamagedShips.Length > 0)
                 {
-                    ShowHeavyDamageWarning(StringResources.Instance.Main.Notification_HeavyDamageWarning, StringResources.Instance.Main.Notification_HeavyDamageWarning_Content, rHeavilyDamagedShips);
+                    if (Preference.Instance.Notification.HeavyDamageWarning)
+                        ShowHeavyDamageWarning(StringResources.Instance.Main.Notification_HeavyDamageWarning, StringResources.Instance.Main.Notification_HeavyDamageWarning_Content, rHeavilyDamagedShips);
+
                     FlashWindow();
 
-                    IsBlinking = !SortieInfo.Current.Node.IsDeadEnd;
+                    if (!Preference.Instance.Game.DisableHeavyDamageBlinkingWarning)
+                        IsBlinking = !SortieInfo.Current.Node.IsDeadEnd;
                 }
             });
 
@@ -181,13 +185,19 @@ void InitializeHeavyDamageWarning(PropertyChangedEventListener rpGamePCEL)
                 if (rSortie.EscortFleet != null)
                     rParticipants = rParticipants.Concat(rSortie.EscortFleet.Ships.Skip(1));
 
-                var rHeavilyDamagedShips = rParticipants.Where(r => r.State == ShipState.HeavilyDamaged && !r.EquipedEquipment.Any(rpEquipment => rpEquipment.Info.Type == EquipmentType.DamageControl)).ToArray();
-                if (Preference.Instance.Notification.HeavyDamageWarning && rHeavilyDamagedShips.Length > 0)
+                var rHeavilyDamagedShips = rParticipants.Where(r => (r.State & ShipState.HeavilyDamaged) != 0 && (r.State & ShipState.Evacuated) == 0 &&
+                    !r.EquipedEquipment.Any(rpEquipment => rpEquipment.Info.Type == EquipmentType.DamageControl)).ToArray();
+                if (rHeavilyDamagedShips.Length == 0)
+                    ThemeManager.Instance.ChangeAccent(Accent.Brown);
+                else
                 {
-                    ShowHeavyDamageWarning(StringResources.Instance.Main.Notification_AdvanceWarning, StringResources.Instance.Main.Notification_AdvanceWarning_Content, rHeavilyDamagedShips);
+                    if (Preference.Instance.Notification.HeavyDamageWarning)
+                        ShowHeavyDamageWarning(StringResources.Instance.Main.Notification_AdvanceWarning, StringResources.Instance.Main.Notification_AdvanceWarning_Content, rHeavilyDamagedShips);
+
                     FlashWindow();
 
-                    IsBlinking = true;
+                    if (!Preference.Instance.Game.DisableHeavyDamageBlinkingWarning)
+                        IsBlinking = true;
                 }
             });
         }
diff --git a/HeavenlyWind/Services/ScreenshotService.cs b/HeavenlyWind/Services/ScreenshotService.cs
index 1662b8b3..3d8baa18 100644
--- a/HeavenlyWind/Services/ScreenshotService.cs
+++ b/HeavenlyWind/Services/ScreenshotService.cs
@@ -1,14 +1,11 @@
-using Sakuno.Collections;
+using Sakuno.KanColle.Amatsukaze.Extensibility;
+using Sakuno.KanColle.Amatsukaze.Extensibility.Services;
 using Sakuno.KanColle.Amatsukaze.Models;
-using Sakuno.KanColle.Amatsukaze.Services.Browser;
 using Sakuno.SystemInterop;
 using System;
 using System.ComponentModel;
 using System.IO;
-using System.IO.MemoryMappedFiles;
-using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media.Imaging;
@@ -19,57 +16,59 @@ public class ScreenshotService
     {
         public static ScreenshotService Instance { get; } = new ScreenshotService();
 
-        ListDictionary<long, TaskCompletionSource<BitmapSource>> r_TaskScreenshotTasks = new ListDictionary<long, TaskCompletionSource<BitmapSource>>();
-
-        ScreenshotService()
+        public BitmapSource TakeScreenshot(Func<BitmapSource, BitmapSource> rpProcessAction = null)
         {
-            var rMessages = BrowserService.Instance.Communicator.GetMessageObservable();
-            rMessages.Subscribe(CommunicatorMessages.ScreenshotFail, ScreenshotFailed);
-            rMessages.Subscribe(CommunicatorMessages.StartScreenshotTransmission, rpParameter =>
-            {
-                var rParameters = rpParameter.Split(';');
-                if (rParameters.Length < 4)
-                    return;
+            var rBrowserWindow = ServiceManager.GetService<IBrowserService>().Handle;
 
-                var rMapName = rParameters[0];
-                var rWidth = int.Parse(rParameters[1]);
-                var rHeight = int.Parse(rParameters[2]);
-                var rBitCount = int.Parse(rParameters[3]);
-                GetScreenshot(rMapName, rWidth, rHeight, rBitCount);
-            });
-        }
+            NativeStructs.RECT rRect;
+            NativeMethods.User32.GetWindowRect(rBrowserWindow, out rRect);
 
-        public async Task<BitmapSource> TakeScreenshot(Func<BitmapSource, BitmapSource> rpProcessAction = null)
-        {
-            var rTimestamp = DateTimeOffset.Now.Ticks;
-            var rTaskScreenshotTask = new TaskCompletionSource<BitmapSource>();
-            r_TaskScreenshotTasks.Add(rTimestamp, rTaskScreenshotTask);
-            BrowserService.Instance.Communicator.Write(CommunicatorMessages.TakeScreenshot + ":" + rTimestamp.ToString());
+            var rScreen = NativeMethods.User32.GetDC(rBrowserWindow);
+            var rDC = NativeMethods.Gdi32.CreateCompatibleDC(rScreen);
+            var rBitmap = NativeMethods.Gdi32.CreateCompatibleBitmap(rScreen, rRect.Width, rRect.Height);
+            var rOldObject = NativeMethods.Gdi32.SelectObject(rDC, rBitmap);
 
-            var rImage = await rTaskScreenshotTask.Task;
+            NativeMethods.Gdi32.BitBlt(rDC, 0, 0, rRect.Width, rRect.Height, rScreen, 0, 0, NativeConstants.RasterOperation.SRCCOPY);
+
+            var rImage = Imaging.CreateBitmapSourceFromHBitmap(rBitmap, IntPtr.Zero, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions());
+
+            NativeMethods.Gdi32.SelectObject(rDC, rOldObject);
+            NativeMethods.Gdi32.DeleteObject(rBitmap);
+            NativeMethods.Gdi32.DeleteDC(rDC);
+            NativeMethods.User32.ReleaseDC(IntPtr.Zero, rScreen);
 
             if (rpProcessAction != null)
                 rImage = rpProcessAction(rImage);
 
-            rTaskScreenshotTask = null;
-
             return rImage;
         }
-        public Task<BitmapSource> TakePartialScreenshot(Int32Rect rpRect)
+        public BitmapSource TakePartialScreenshot(Int32Rect rpRect)
         {
             return TakeScreenshot(r =>
             {
+                var rBrowserWindowHandle = ServiceManager.GetService<IBrowserService>().Handle;
+
+                NativeStructs.RECT rBrowserWindowRect;
+                NativeMethods.User32.GetWindowRect(rBrowserWindowHandle, out rBrowserWindowRect);
+
+                var rHorizontalRatio = rBrowserWindowRect.Width / GameConstants.GameWidth;
+                var rVerticalRatio = rBrowserWindowRect.Height / GameConstants.GameHeight;
+                rpRect.X = (int)(rpRect.X * rHorizontalRatio);
+                rpRect.Y = (int)(rpRect.Y * rVerticalRatio);
+                rpRect.Width = (int)(rpRect.Width * rHorizontalRatio);
+                rpRect.Height = (int)(rpRect.Height * rVerticalRatio);
+
                 var rResult = new CroppedBitmap(r, rpRect);
                 rResult.Freeze();
 
                 return rResult;
             });
         }
-        public async void TakeScreenshotAndOutput(Func<BitmapSource, BitmapSource> rpProcessAction = null, bool rpOutputToClipboard = true)
+        public void TakeScreenshotAndOutput(Func<BitmapSource, BitmapSource> rpProcessAction = null, bool rpOutputToClipboard = true)
         {
             try
             {
-                var rImage = await TakeScreenshot(rpProcessAction);
+                var rImage = TakeScreenshot(rpProcessAction);
                 if (rImage == null)
                     return;
 
@@ -83,11 +82,11 @@ public async void TakeScreenshotAndOutput(Func<BitmapSource, BitmapSource> rpPro
                 OutputException(e);
             }
         }
-        public async void TakePartialScreenshotAndOutput(Int32Rect rpRect, bool rpOutputToClipboard)
+        public void TakePartialScreenshotAndOutput(Int32Rect rpRect, bool rpOutputToClipboard)
         {
             try
             {
-                var rImage = await TakePartialScreenshot(rpRect);
+                var rImage = TakePartialScreenshot(rpRect);
                 if (rImage == null)
                     return;
 
@@ -102,16 +101,6 @@ public async void TakePartialScreenshotAndOutput(Int32Rect rpRect, bool rpOutput
             }
         }
 
-        void ScreenshotFailed(string rpParameter)
-        {
-            var rParameters = rpParameter.Split(';');
-            var rTimestamp = long.Parse(rParameters[0]);
-            var rMessage = rParameters[1];
-
-            r_TaskScreenshotTasks[rTimestamp].TrySetException(new InvalidOperationException(rMessage));
-            r_TaskScreenshotTasks.Remove(rTimestamp);
-        }
-
         public void OutputToClipboard(BitmapSource rpImage)
         {
             Clipboard.SetImage(rpImage);
@@ -158,35 +147,6 @@ public void OutputAsFile(BitmapSource rpImage)
             StatusBarService.Instance.Message = string.Format(StringResources.Instance.Main.Log_Screenshot_Succeeded_File, Path.GetFileName(rPath));
         }
 
-        void GetScreenshot(string rpMapName, int rpWidth, int rpHeight, int rpBitCount)
-        {
-            var rTimestamp = long.Parse(rpMapName.Substring(rpMapName.LastIndexOf('/') + 1));
-            var rHeight = Math.Abs(rpHeight);
-
-            using (var rMap = MemoryMappedFile.CreateOrOpen(rpMapName, rpWidth * rHeight * 3, MemoryMappedFileAccess.ReadWrite))
-            {
-                var rInfo = new NativeStructs.BITMAPINFO();
-                rInfo.bmiHeader.biSize = Marshal.SizeOf(typeof(NativeStructs.BITMAPINFOHEADER));
-                rInfo.bmiHeader.biWidth = rpWidth;
-                rInfo.bmiHeader.biHeight = rpHeight;
-                rInfo.bmiHeader.biBitCount = (ushort)rpBitCount;
-                rInfo.bmiHeader.biPlanes = 1;
-
-                IntPtr rBits;
-                var rHBitmap = NativeMethods.Gdi32.CreateDIBSection(IntPtr.Zero, ref rInfo, 0, out rBits, rMap.SafeMemoryMappedFileHandle.DangerousGetHandle(), 0);
-                if (rHBitmap == IntPtr.Zero)
-                    throw new InvalidOperationException();
-
-                var rImage = Imaging.CreateBitmapSourceFromHBitmap(rHBitmap, IntPtr.Zero, new Int32Rect(0, 0, rpWidth, rHeight), BitmapSizeOptions.FromEmptyOptions());
-                rImage.Freeze();
-                r_TaskScreenshotTasks[rTimestamp].SetResult(rImage);
-
-                NativeMethods.Gdi32.DeleteObject(rHBitmap);
-            }
-
-            BrowserService.Instance.Communicator.Write(CommunicatorMessages.FinishScreenshotTransmission);
-        }
-
         static void OutputException(Exception rpException)
         {
             StatusBarService.Instance.Message = string.Format(StringResources.Instance.Main.Log_Screenshot_Failed, rpException.Message);
diff --git a/HeavenlyWind/Services/StatusBarService.cs b/HeavenlyWind/Services/StatusBarService.cs
index fd6dc93b..370e485b 100644
--- a/HeavenlyWind/Services/StatusBarService.cs
+++ b/HeavenlyWind/Services/StatusBarService.cs
@@ -2,6 +2,7 @@
 using Sakuno.KanColle.Amatsukaze.Extensibility;
 using Sakuno.KanColle.Amatsukaze.Extensibility.Services;
 using Sakuno.KanColle.Amatsukaze.Game.Models;
+using Sakuno.KanColle.Amatsukaze.Game.Services;
 using Sakuno.KanColle.Amatsukaze.Models;
 using Sakuno.UserInterface;
 using Sakuno.UserInterface.Controls;
@@ -16,7 +17,6 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Documents;
-using System.Windows.Input;
 
 namespace Sakuno.KanColle.Amatsukaze.Services
 {
@@ -57,25 +57,7 @@ private set
         long r_InitialTick;
         public DateTimeOffset? CurrentTime { get; private set; }
 
-        public IList<UIZoomInfo> UIZoomFactors { get; private set; }
-
-        double r_UIZoom;
-        public double UIZoom
-        {
-            get { return r_UIZoom; }
-            set
-            {
-                if (r_UIZoom != value)
-                {
-                    r_UIZoom = value;
-                    OnPropertyChanged(nameof(UIZoom));
-                }
-            }
-        }
-
-        public ICommand UISetZoomCommand { get; private set; }
-        public ICommand UIZoomInCommand { get; private set; }
-        public ICommand UIZoomOutCommand { get; private set; }
+        public SortieInfo Sortie => SortieInfo.Current;
 
         StatusBarService()
         {
@@ -85,6 +67,9 @@ public double UIZoom
                 .Throttle(TimeSpan.FromSeconds(30.0)).Subscribe(_ => IsMessageObsolete = true);
 
             ServiceManager.Register<IStatusBarService>(this);
+
+            ApiService.Subscribe("api_port/port", _ => OnPropertyChanged(nameof(Sortie)));
+            ApiService.Subscribe("api_req_map/start", _ => OnPropertyChanged(nameof(Sortie)));
         }
 
         public void Initialize()
@@ -95,21 +80,21 @@ public void Initialize()
             {
                 var rServers = new[] { "jp.pool.ntp.org", "pool.ntp.org", "us.pool.ntp.org", "cn.pool.ntp.org", "jp.ntp.org.cn", "us.ntp.org.cn", "cn.ntp.org.cn" };
 
+                var rRetryCount = 0;
+
                 foreach (var rSuccess in rServers.Select(QueryCurrentTime))
+                {
+                    await Task.Delay(rRetryCount * 2000);
+                    rRetryCount++;
+
                     if (await rSuccess)
                     {
                         StartTimer();
                         return;
                     }
+                }
             }));
 
-            UIZoom = Preference.Instance.UI.Zoom;
-
-            UISetZoomCommand = new DelegatedCommand<double>(SetZoom);
-            UIZoomFactors = new[] { .25, .5, .75, 1.0, 1.25, 1.5, 1.75, 2.0, 3.0, 4.0 }.Select(r => new UIZoomInfo(r, UISetZoomCommand)).ToArray();
-            UIZoomInCommand = new DelegatedCommand(() => SetZoom(UIZoom + .05));
-            UIZoomOutCommand = new DelegatedCommand(() => SetZoom(UIZoom - .05));
-
             RegisterCustomBBCodeTag();
         }
 
@@ -124,11 +109,14 @@ async Task<bool> QueryCurrentTime(string rpHostname)
 
                     await rClient.SendAsync(rData, rData.Length);
 
-                    var rResult = await Task.WhenAny(rClient.ReceiveAsync(), Task.Delay(5000)) as Task<UdpReceiveResult>;
-                    if (rResult == null)
+                    var rReceiveTask = rClient.ReceiveAsync();
+
+                    rReceiveTask.ContinueWith(r => r.Exception?.Handle(_ => true), TaskContinuationOptions.OnlyOnFaulted).Forget();
+
+                    if (await Task.WhenAny(rReceiveTask, Task.Delay(5000)) != rReceiveTask)
                         return false;
 
-                    rData = (await rResult).Buffer;
+                    rData = (await rReceiveTask).Buffer;
 
                     var rIntegerPart = (ulong)rData[40] << 24 | (ulong)rData[41] << 16 | (ulong)rData[42] << 8 | rData[43];
                     var rFractionPart = (ulong)rData[44] << 24 | (ulong)rData[45] << 16 | (ulong)rData[46] << 8 | rData[47];
@@ -162,22 +150,6 @@ void StartTimer()
             }, TaskCreationOptions.LongRunning);
         }
 
-        void SetZoom(double rpZoom)
-        {
-            if (rpZoom < .25)
-                return;
-
-            UpdateZoomSelection(rpZoom);
-
-            UIZoom = rpZoom;
-            Preference.Instance.UI.Zoom.Value = rpZoom;
-        }
-        void UpdateZoomSelection(double rpZoom)
-        {
-            foreach (var rInfo in UIZoomFactors)
-                rInfo.IsSelected = rInfo.Zoom == rpZoom;
-        }
-
         void RegisterCustomBBCodeTag()
         {
             BBCodeBlock.AddCustomTag("icon", rpInline =>
diff --git a/HeavenlyWind/Services/UpdateService.cs b/HeavenlyWind/Services/UpdateService.cs
index dd1a05e4..71169ce7 100644
--- a/HeavenlyWind/Services/UpdateService.cs
+++ b/HeavenlyWind/Services/UpdateService.cs
@@ -82,9 +82,9 @@ internal async void CheckForUpdate()
                         await Task.Delay(i * 4000);
                     }
             }
-            catch (Exception e)
+            catch
             {
-                Logger.Write(LoggingLevel.Error, string.Format(StringResources.Instance.Main.Log_CheckForUpdate_Exception, e.Message));
+                //Logger.Write(LoggingLevel.Error, string.Format(StringResources.Instance.Main.Log_CheckForUpdate_Exception, e.Message));
             }
         }
         async Task CheckForUpdateCore()
@@ -131,6 +131,7 @@ HttpWebRequest CreateRequest()
                 client = new
                 {
                     version = Assembly.GetExecutingAssembly().GetName().Version.ToString(),
+                    beta = true,
                 },
                 files = r_FilesToBeChecked.Select(r =>
                 {
diff --git a/HeavenlyWind/Styles/Common.xaml b/HeavenlyWind/Styles/Common.xaml
index c0cb218b..c9764f4e 100644
--- a/HeavenlyWind/Styles/Common.xaml
+++ b/HeavenlyWind/Styles/Common.xaml
@@ -6,6 +6,7 @@
         <ResourceDictionary Source="pack://application:,,,/HeavenlyWind;component/Styles/Common/AbyssalShipClass.xaml" />
         <ResourceDictionary Source="pack://application:,,,/HeavenlyWind;component/Styles/Common/SlotsToolTip.xaml" />
         <ResourceDictionary Source="pack://application:,,,/HeavenlyWind;component/Styles/Common/TabContent.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/HeavenlyWind;component/Styles/Common/TabItem.xaml" />
 
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/HeavenlyWind/Styles/Common/SlotsToolTip.xaml b/HeavenlyWind/Styles/Common/SlotsToolTip.xaml
index 33fa603d..2257bbcc 100644
--- a/HeavenlyWind/Styles/Common/SlotsToolTip.xaml
+++ b/HeavenlyWind/Styles/Common/SlotsToolTip.xaml
@@ -24,7 +24,7 @@
             </StackPanel>
 
             <TextBlock Name="PlaneCount" HorizontalAlignment="Right" Grid.Column="4">
-                <Run Name="CurrentPlaneCount" Text="{Binding PlaneCount, Mode=OneWay}" />/<Run Text="{Binding MaxPlaneCount, Mode=OneWay}" />
+                [<Run Name="CurrentPlaneCount" Text="{Binding PlaneCount, Mode=OneWay}" /><Run Name="Sepearator" Text="/" /><Run Name="MaxPlaneCount" Text="{Binding MaxPlaneCount, Mode=OneWay}" />]
             </TextBlock>
         </Grid>
 
@@ -32,12 +32,25 @@
             <DataTrigger Binding="{Binding Equipment.Info.IsPlane}" Value="False">
                 <Setter TargetName="PlaneCount" Property="Visibility" Value="Collapsed" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding MaxPlaneCount}" Value="0">
-                <Setter TargetName="PlaneCount" Property="Visibility" Value="Collapsed" />
+            <DataTrigger Binding="{Binding MaxPlaneCount}" Value="-1">
+                <Setter TargetName="Sepearator" Property="Text" Value="" />
+                <Setter TargetName="CurrentPlaneCount" Property="Text" Value="" />
+                <Setter TargetName="MaxPlaneCount" Property="Text" Value="?" />
             </DataTrigger>
             <DataTrigger Binding="{Binding HasLostPlane}" Value="True">
                 <Setter TargetName="CurrentPlaneCount" Property="Foreground" Value="Orange" />
             </DataTrigger>
+            <DataTrigger Value="True">
+                <DataTrigger.Binding>
+                    <MultiBinding Converter="{StaticResource AreEqualConverter}">
+                        <Binding Path="PlaneCount" />
+                        <Binding Path="MaxPlaneCount" />
+                    </MultiBinding>
+                </DataTrigger.Binding>
+
+                <Setter TargetName="Sepearator" Property="Text" Value="" />
+                <Setter TargetName="CurrentPlaneCount" Property="Text" Value="" />
+            </DataTrigger>
         </DataTemplate.Triggers>
     </DataTemplate>
 
diff --git a/HeavenlyWind/Styles/Common/TabItem.xaml b/HeavenlyWind/Styles/Common/TabItem.xaml
new file mode 100644
index 00000000..02a499f8
--- /dev/null
+++ b/HeavenlyWind/Styles/Common/TabItem.xaml
@@ -0,0 +1,55 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ruic="clr-namespace:Sakuno.UserInterface.Controls;assembly=Sakuno.UserInterface"
+                    xmlns:rvm="clr-namespace:Sakuno.KanColle.Amatsukaze.ViewModels">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/HeavenlyWind;component/Styles/Converters.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+
+    <Style x:Key="TransparentThumbStyle" TargetType="{x:Type Thumb}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Rectangle Fill="Transparent" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="CloseBoxButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="Width" Value="20" />
+        <Setter Property="Height" Value="20" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid Background="Transparent" Grid.Column="1">
+                        <Ellipse Name="CloseBox" Fill="{DynamicResource HighlightBackgroundBrushKey}" Visibility="Collapsed" />
+                        <Path Name="CloseIcon" Fill="{DynamicResource ForegroundBrushKey}" Stretch="Uniform" Margin="5" Data="F1 M 26.9166,22.1667L 37.9999,33.25L 49.0832,22.1668L 53.8332,26.9168L 42.7499,38L 53.8332,49.0834L 49.0833,53.8334L 37.9999,42.75L 26.9166,53.8334L 22.1666,49.0833L 33.25,38L 22.1667,26.9167L 26.9166,22.1667 Z" />
+                    </Grid>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="CloseBox" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="CloseIcon" Property="Fill" Value="{DynamicResource ThemeBrushKey}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <DataTemplate DataType="{x:Type rvm:TabItemViewModel}">
+        <StackPanel Orientation="Horizontal">
+            <Grid>
+                <TextBlock Text="{Binding Name}" FontSize="14" />
+                <Thumb Style="{StaticResource TransparentThumbStyle}" />
+            </Grid>
+
+            <Button Style="{StaticResource CloseBoxButtonStyle}" Command="{x:Static ruic:AdvancedTabItem.CloseTabCommand}" Margin="4, 0, 0, 0" Visibility="{Binding IsClosable, Converter={StaticResource BooleanToVisibilityConverter}}" />
+        </StackPanel>
+    </DataTemplate>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HeavenlyWind/Styles/Controls/ListBox.xaml b/HeavenlyWind/Styles/Controls/ListBox.xaml
index d5920c74..dac9ebdf 100644
--- a/HeavenlyWind/Styles/Controls/ListBox.xaml
+++ b/HeavenlyWind/Styles/Controls/ListBox.xaml
@@ -31,6 +31,7 @@
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Foreground" Value="White" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBox}">
@@ -40,27 +41,29 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MenuListBoxStyle" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-        <Style.Resources>
-            <Style TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-                <Setter Property="Background" Value="Transparent" />
+    <Style x:Key="MenuListBoxButtonStyle" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Background" Value="Transparent" />
 
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type Button}">
-                            <Border Background="{TemplateBinding Background}" Padding="16, 8">
-                                <ContentPresenter />
-                            </Border>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border Background="{TemplateBinding Background}" Padding="16, 8">
+                        <ContentPresenter />
+                    </Border>
 
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Background" Value="{DynamicResource ActiveBackgroundBrushKey}" />
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource ActiveBackgroundBrushKey}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="MenuListBoxStyle" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+        <Style.Resources>
+            <Style TargetType="{x:Type Button}" BasedOn="{StaticResource MenuListBoxButtonStyle}" />
         </Style.Resources>
 
         <Setter Property="ItemContainerStyle">
diff --git a/HeavenlyWind/ViewModels/Game/AirBaseViewModel.cs b/HeavenlyWind/ViewModels/Game/AirBaseViewModel.cs
index b78d794c..999d4435 100644
--- a/HeavenlyWind/ViewModels/Game/AirBaseViewModel.cs
+++ b/HeavenlyWind/ViewModels/Game/AirBaseViewModel.cs
@@ -11,7 +11,7 @@ public class AirBaseViewModel : TabItemViewModel
     {
         public override string Name
         {
-            get { return "A"; }
+            get { return "A.B."; }
             protected set { throw new NotImplementedException(); }
         }
 
diff --git a/HeavenlyWind/ViewModels/Game/ExpeditionGroupByMapArea.cs b/HeavenlyWind/ViewModels/Game/ExpeditionGroupByMapArea.cs
deleted file mode 100644
index 4597744b..00000000
--- a/HeavenlyWind/ViewModels/Game/ExpeditionGroupByMapArea.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Sakuno.KanColle.Amatsukaze.Game.Models;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Sakuno.KanColle.Amatsukaze.ViewModels.Game
-{
-    public class ExpeditionGroupByMapArea : ModelBase
-    {
-        public MapAreaInfo MapArea { get; }
-        public IList<ExpeditionViewModel> Expeditions { get; }
-
-        internal ExpeditionGroupByMapArea(IGrouping<MapAreaInfo, ExpeditionInfo> rpGroup)
-        {
-            MapArea = rpGroup.Key;
-            Expeditions = rpGroup.Select(r => new ExpeditionViewModel(r)).ToList();
-        }
-    }
-}
diff --git a/HeavenlyWind/ViewModels/Game/ExpeditionOverviewViewModel.cs b/HeavenlyWind/ViewModels/Game/ExpeditionOverviewViewModel.cs
deleted file mode 100644
index f2756f55..00000000
--- a/HeavenlyWind/ViewModels/Game/ExpeditionOverviewViewModel.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Sakuno.KanColle.Amatsukaze.Game;
-using Sakuno.KanColle.Amatsukaze.Game.Models;
-using Sakuno.KanColle.Amatsukaze.Game.Services;
-using Sakuno.KanColle.Amatsukaze.Services;
-using Sakuno.KanColle.Amatsukaze.Views.Game;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Sakuno.KanColle.Amatsukaze.ViewModels.Game
-{
-    [ViewInfo(typeof(ExpeditionOverview))]
-    public class ExpeditionOverviewViewModel : TabItemViewModel, IDisposable
-    {
-        public override string Name
-        {
-            get { return StringResources.Instance.Main.Tab_ExpeditionOverview; }
-            protected set { }
-        }
-
-        public IList<ExpeditionGroupByMapArea> MapAreas { get; private set; }
-
-        IDisposable[] r_PCELs;
-
-        internal ExpeditionOverviewViewModel()
-        {
-            if (KanColleGame.Current.Port.Ships.Count > 0)
-                Initialize();
-            else
-                ApiService.SubscribeOnce("api_port/port", _ => Initialize());
-        }
-
-        void Initialize()
-        {
-            MapAreas = KanColleGame.Current.MasterInfo.Expeditions.Values.Where(r => ExpeditionService.Instance.ContainsInfo(r.ID)).GroupBy(r => r.MapArea).Select(r => new ExpeditionGroupByMapArea(r)).ToList();
-            OnPropertyChanged(nameof(MapAreas));
-
-            r_PCELs = KanColleGame.Current.Port.Fleets.Table.Values.Skip(1).Select(r =>
-            {
-                var rPCEL = new PropertyChangedEventListener(r);
-                rPCEL.Add(nameof(r.Ships), (s, e) => Update(r));
-                return rPCEL;
-            }).ToArray();
-        }
-
-        void Update(Fleet rpFleet)
-        {
-            foreach (var rArea in MapAreas)
-                foreach (var rExpedition in rArea.Expeditions)
-                    rExpedition.Update(rpFleet);
-        }
-
-        public void Dispose()
-        {
-            if (r_PCELs != null)
-                foreach (var rPCEL in r_PCELs)
-                    rPCEL.Dispose();
-            r_PCELs = null;
-        }
-    }
-}
diff --git a/HeavenlyWind/ViewModels/Game/ExpeditionViewModel.cs b/HeavenlyWind/ViewModels/Game/ExpeditionViewModel.cs
deleted file mode 100644
index f476d616..00000000
--- a/HeavenlyWind/ViewModels/Game/ExpeditionViewModel.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Sakuno.KanColle.Amatsukaze.Game;
-using Sakuno.KanColle.Amatsukaze.Game.Models;
-using Sakuno.KanColle.Amatsukaze.Models;
-using Sakuno.KanColle.Amatsukaze.Services;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Sakuno.KanColle.Amatsukaze.ViewModels.Game
-{
-    public class ExpeditionViewModel : ModelBase
-    {
-        public ExpeditionInfo Info { get; }
-        ExpeditionInfo2 r_Info2;
-
-        public string TimeString
-        {
-            get
-            {
-                var rTime = TimeSpan.FromMinutes(Info.Time);
-                return ((int)rTime.TotalHours).ToString("D2") + rTime.ToString(@"\:mm\:ss");
-            }
-        }
-
-        public ExpeditionInfo2.RawRewardResources RewardResources => r_Info2.RewardResources;
-        public Tuple<ItemInfo, int> RewardItem1 => Info.RewardItem1ID != 0 ? Tuple.Create(KanColleGame.Current.MasterInfo.Items[Info.RewardItem1ID], Info.RewardItem1Count) : null;
-        public Tuple<ItemInfo, int> RewardItem2 => Info.RewardItem2ID != 0 ? Tuple.Create(KanColleGame.Current.MasterInfo.Items[Info.RewardItem2ID], Info.RewardItem2Count) : null;
-
-        public IList<ExpeditionResultPrediction> ResultPrediction { get; }
-
-        internal ExpeditionViewModel(ExpeditionInfo rpInfo)
-        {
-            Info = rpInfo;
-            r_Info2 = ExpeditionService.Instance.GetInfo(rpInfo.ID);
-
-            ResultPrediction = KanColleGame.Current.Port.Fleets.Table.Values.Skip(1).Select(r => new ExpeditionResultPrediction(r_Info2, r)).ToList();
-        }
-
-        internal void Update(Fleet rpFleet) => ResultPrediction[rpFleet.ID - 2].Check();
-    }
-}
diff --git a/HeavenlyWind/ViewModels/Game/FleetExpeditionStatusViewModel.cs b/HeavenlyWind/ViewModels/Game/FleetExpeditionStatusViewModel.cs
index 5493f742..52c02485 100644
--- a/HeavenlyWind/ViewModels/Game/FleetExpeditionStatusViewModel.cs
+++ b/HeavenlyWind/ViewModels/Game/FleetExpeditionStatusViewModel.cs
@@ -75,16 +75,117 @@ public ExpeditionYield(Fleet rpFleet, ExpeditionInfo2 rpInfo)
             {
                 var rExpedition = rpFleet.ExpeditionStatus.Expedition;
 
-                var rLandingCraftCount = rpFleet.Ships.SelectMany(r => r.Slots).Select(r => r.Equipment.Info.Icon).Count(r => r == EquipmentIconType.LandingCraft);
-                var rRate = 1.0 + rLandingCraftCount * .05;
-
-                var rFuel = rpInfo.RewardResources.Fuel * rRate;
-                var rBullet = rpInfo.RewardResources.Bullet * rRate;
-                var rSteel = rpInfo.RewardResources.Steel * rRate;
-                var rBauxite = rpInfo.RewardResources.Bauxite * rRate;
-
-                var rFuelConsumption = (int)rpFleet.Ships.Sum(r => r.Info.MaxFuelConsumption * rExpedition.FuelConsumption * (r.IsMarried ? .85 : 1.0));
-                var rBulletConsumption = (int)rpFleet.Ships.Sum(r => r.Info.MaxBulletConsumption * rExpedition.BulletConsumption * (r.IsMarried ? .85 : 1.0));
+                var rFuelConsumption = 0;
+                var rBulletConsumption = 0;
+
+                var rLandingCraftCount = 0;
+                var rLandingCraftLevel = 0;
+                var rLandingCraftBonusRate = 1.0;
+
+                var rTDLCCount = 0;
+                var rDLCCount = 0;
+
+                foreach (var rShip in rpFleet.Ships)
+                {
+                    var rFactor = rShip.IsMarried ? .85 : 1.0;
+                    rFuelConsumption += (int)(rShip.Info.MaxFuelConsumption * rExpedition.FuelConsumption * rFactor);
+                    rBulletConsumption += (int)(rShip.Info.MaxBulletConsumption * rExpedition.BulletConsumption * rFactor);
+
+                    if (rShip.Info.ID == 487)
+                        rLandingCraftBonusRate += .05;
+
+                    foreach (var rSlot in rShip.Slots)
+                    {
+                        switch (rSlot.Equipment.ID)
+                        {
+                            case 68:
+                                rLandingCraftBonusRate += .05;
+                                rDLCCount++;
+                                break;
+
+                            case 166:
+                                rLandingCraftBonusRate += .02;
+                                break;
+
+                            case 167:
+                                rLandingCraftBonusRate += .01;
+                                break;
+
+                            case 193:
+                                rLandingCraftBonusRate += .05;
+                                rTDLCCount++;
+                                break;
+
+                            default:
+                                continue;
+                        }
+
+                        rLandingCraftCount++;
+                        rLandingCraftLevel += rSlot.Equipment.Level;
+                    }
+                }
+
+                rLandingCraftBonusRate = Math.Min(rLandingCraftBonusRate, 1.2);
+
+                if (rLandingCraftCount > 0)
+                    rLandingCraftBonusRate += rLandingCraftBonusRate * (rLandingCraftLevel / (double)rLandingCraftCount) * .01;
+
+                switch (rTDLCCount)
+                {
+                    case 0:
+                    case 1:
+                    case 2:
+                        rLandingCraftBonusRate += rTDLCCount * .02;
+                        break;
+
+                    case 3:
+                        switch (rDLCCount)
+                        {
+                            case 0:
+                            case 1:
+                                rLandingCraftBonusRate += .05;
+                                break;
+
+                            case 2:
+                                rLandingCraftBonusRate += .052;
+                                break;
+
+                            default:
+                                rLandingCraftBonusRate += .054;
+                                break;
+                        }
+                        break;
+
+                    default:
+                        switch (rDLCCount)
+                        {
+                            case 0:
+                                rLandingCraftBonusRate += .054;
+                                break;
+
+                            case 1:
+                                rLandingCraftBonusRate += .056;
+                                break;
+
+                            case 2:
+                                rLandingCraftBonusRate += .058;
+                                break;
+
+                            case 3:
+                                rLandingCraftBonusRate += .059;
+                                break;
+
+                            default:
+                                rLandingCraftBonusRate += .06;
+                                break;
+                        }
+                        break;
+                }
+
+                var rFuel = rpInfo.RewardResources.Fuel * rLandingCraftBonusRate;
+                var rBullet = rpInfo.RewardResources.Bullet * rLandingCraftBonusRate;
+                var rSteel = rpInfo.RewardResources.Steel * rLandingCraftBonusRate;
+                var rBauxite = rpInfo.RewardResources.Bauxite * rLandingCraftBonusRate;
 
                 Fuel = (int)rFuel - rFuelConsumption;
                 Bullet = (int)rBullet - rBulletConsumption;
diff --git a/HeavenlyWind/ViewModels/Game/SortieViewModel.cs b/HeavenlyWind/ViewModels/Game/SortieViewModel.cs
index c18d1ae8..aa22e9fc 100644
--- a/HeavenlyWind/ViewModels/Game/SortieViewModel.cs
+++ b/HeavenlyWind/ViewModels/Game/SortieViewModel.cs
@@ -34,8 +34,8 @@ private set
 
         public EventMapOverviewViewModel EventMaps { get; private set; }
 
-        SortieInfo r_Info;
-        public SortieInfo Info
+        ModelBase r_Info;
+        public ModelBase Info
         {
             get { return r_Info; }
             private set
@@ -58,7 +58,7 @@ internal SortieViewModel()
 
             ApiService.Subscribe("api_req_member/get_practice_enemyinfo", delegate
             {
-                Info = KanColleGame.Current.Sortie;
+                Info = KanColleGame.Current.Practice;
                 Type = DisplayType.Practice;
             });
 
diff --git a/HeavenlyWind/ViewModels/History/ConstructionHistoryViewModel.cs b/HeavenlyWind/ViewModels/History/ConstructionHistoryViewModel.cs
index b80ad8f7..447e48a3 100644
--- a/HeavenlyWind/ViewModels/History/ConstructionHistoryViewModel.cs
+++ b/HeavenlyWind/ViewModels/History/ConstructionHistoryViewModel.cs
@@ -9,7 +9,7 @@ namespace Sakuno.KanColle.Amatsukaze.ViewModels.History
 {
     class ConstructionHistoryViewModel : HistoryViewModelBase<ConstructionRecord>
     {
-        protected override string LoadCommandText => "SELECT * FROM construction ORDER BY time DESC;";
+        protected override string LoadCommandText => "SELECT * FROM construction;";
 
         public FilterKeyCollection<ShipInfo> Ships { get; } = new FilterKeyCollection<ShipInfo>(ShipInfo.Dummy, (x, y) => x.ID - y.ID);
 
diff --git a/HeavenlyWind/ViewModels/History/DevelopmentHistoryViewModel.cs b/HeavenlyWind/ViewModels/History/DevelopmentHistoryViewModel.cs
index 4376b0dc..9906ead5 100644
--- a/HeavenlyWind/ViewModels/History/DevelopmentHistoryViewModel.cs
+++ b/HeavenlyWind/ViewModels/History/DevelopmentHistoryViewModel.cs
@@ -9,7 +9,7 @@ namespace Sakuno.KanColle.Amatsukaze.ViewModels.History
 {
     class DevelopmentHistoryViewModel : HistoryViewModelBase<DevelopmentRecord>
     {
-        protected override string LoadCommandText => "SELECT * FROM development ORDER BY time DESC;";
+        protected override string LoadCommandText => "SELECT * FROM development;";
 
         public FilterKeyCollection<EquipmentInfo> Equipment { get; } = new FilterKeyCollection<EquipmentInfo>(EquipmentInfo.Dummy, (x, y) => x.ID - y.ID);
         public FilterKeyCollection<ShipInfo> SecretaryShips { get; } = new FilterKeyCollection<ShipInfo>(ShipInfo.Dummy, (x, y) => x.ID - y.ID);
diff --git a/HeavenlyWind/ViewModels/History/ExpeditionHistoryViewModel.cs b/HeavenlyWind/ViewModels/History/ExpeditionHistoryViewModel.cs
index e5ae17eb..a74b0803 100644
--- a/HeavenlyWind/ViewModels/History/ExpeditionHistoryViewModel.cs
+++ b/HeavenlyWind/ViewModels/History/ExpeditionHistoryViewModel.cs
@@ -9,7 +9,7 @@ namespace Sakuno.KanColle.Amatsukaze.ViewModels.History
 {
     class ExpeditionHistoryViewModel : HistoryViewModelBase<ExpeditionRecord>
     {
-        protected override string LoadCommandText => "SELECT * FROM expedition ORDER BY time DESC;";
+        protected override string LoadCommandText => "SELECT * FROM expedition;";
 
         public FilterKeyCollection<ExpeditionInfo> Expeditions { get; } = new FilterKeyCollection<ExpeditionInfo>(ExpeditionInfo.Dummy, (x, y) => x.ID - y.ID);
 
diff --git a/HeavenlyWind/ViewModels/History/HistoryRecordsView.cs b/HeavenlyWind/ViewModels/History/HistoryRecordsView.cs
index e99d6cc2..690aa467 100644
--- a/HeavenlyWind/ViewModels/History/HistoryRecordsView.cs
+++ b/HeavenlyWind/ViewModels/History/HistoryRecordsView.cs
@@ -1,10 +1,11 @@
 using Sakuno.KanColle.Amatsukaze.Internal;
 using System.Linq;
 using System.Collections.Generic;
+using Sakuno.KanColle.Amatsukaze.Models.Records;
 
 namespace Sakuno.KanColle.Amatsukaze.ViewModels.History
 {
-    class HistoryRecordsView<T> : ItemsView<T> where T : ModelBase
+    class HistoryRecordsView<T> : ItemsView<T> where T : ModelBase, IRecordID
     {
         HistoryViewModelBase<T> r_Owner;
 
@@ -40,6 +41,14 @@ public void Add(T rpRecord)
             Refresh();
         }
 
+        public void Clear()
+        {
+            r_Records?.Clear();
+
+            Refresh();
+        }
+
         protected override bool Filter(T rpItem) => r_Owner.Filter(rpItem);
+        protected override IEnumerable<T> Sort(IEnumerable<T> rpItems) => rpItems.OrderByDescending(r => r.ID);
     }
 }
diff --git a/HeavenlyWind/ViewModels/History/HistoryViewModelBase.cs b/HeavenlyWind/ViewModels/History/HistoryViewModelBase.cs
index 4b353092..9f7cab81 100644
--- a/HeavenlyWind/ViewModels/History/HistoryViewModelBase.cs
+++ b/HeavenlyWind/ViewModels/History/HistoryViewModelBase.cs
@@ -1,4 +1,5 @@
 using Sakuno.KanColle.Amatsukaze.Game.Services;
+using Sakuno.KanColle.Amatsukaze.Models.Records;
 using Sakuno.SystemInterop;
 using Sakuno.SystemInterop.Dialogs;
 using Sakuno.UserInterface;
@@ -14,7 +15,7 @@
 
 namespace Sakuno.KanColle.Amatsukaze.ViewModels.History
 {
-    abstract class HistoryViewModelBase<T> : DisposableModelBase where T : ModelBase
+    abstract class HistoryViewModelBase<T> : DisposableModelBase where T : ModelBase, IRecordID
     {
         static Dispatcher r_Dispatcher = DispatcherUtil.UIDispatcher;
 
@@ -56,16 +57,20 @@ public void LoadRecords()
                 {
                     rCommand.CommandText = LoadCommandText;
 
+                    LastInsertedRecord = null;
+                    r_Records.Clear();
+
                     using (var rReader = rCommand.ExecuteReader())
                     {
                         var rRecords = new List<T>(rReader.VisibleFieldCount);
                         while (rReader.Read())
-                            rRecords.Add(CreateRecordFromReader(rReader));
+                        {
+                            LastInsertedRecord = CreateRecordFromReader(rReader);
+                            rRecords.Add(LastInsertedRecord);
+                        }
 
                         r_Records.Load(rRecords);
                     }
-
-                    LastInsertedRecord = r_Records.LastRecord;
                 }
 
                 OnInitialized();
@@ -117,6 +122,9 @@ protected virtual void OnRecordInsert(string rpTable, long rpRowID)
                 using (var rReader = rCommand.ExecuteReader())
                     if (rReader.Read())
                     {
+                        if (!BeforeNewRecordInserting(rReader))
+                            return;
+
                         LastInsertedRecord = CreateRecordFromReader(rReader);
                         r_Records.Add(LastInsertedRecord);
                     }
@@ -126,6 +134,7 @@ protected virtual void OnRecordDelete(string rpTable, long rpRowID) { }
         protected virtual void OnRecordUpdate(string rpTable, long rpRowID) { }
 
         protected abstract void PrepareCommandOnRecordInsert(SQLiteCommand rpCommand, string rpTable, long rpRowID);
+        protected virtual bool BeforeNewRecordInserting(SQLiteDataReader rpReader) => true;
 
         public void ExportAsCsvFile()
         {
diff --git a/HeavenlyWind/ViewModels/History/ResourceHistoryType.cs b/HeavenlyWind/ViewModels/History/ResourceHistoryType.cs
new file mode 100644
index 00000000..41e5c268
--- /dev/null
+++ b/HeavenlyWind/ViewModels/History/ResourceHistoryType.cs
@@ -0,0 +1,10 @@
+namespace Sakuno.KanColle.Amatsukaze.ViewModels.History
+{
+    enum ResourceHistoryType
+    {
+        Detail,
+        Daily,
+        Weekly,
+        Monthly,
+    }
+}
diff --git a/HeavenlyWind/ViewModels/History/ResourceHistoryTypeKey.cs b/HeavenlyWind/ViewModels/History/ResourceHistoryTypeKey.cs
new file mode 100644
index 00000000..f90c7192
--- /dev/null
+++ b/HeavenlyWind/ViewModels/History/ResourceHistoryTypeKey.cs
@@ -0,0 +1,110 @@
+using Sakuno.KanColle.Amatsukaze.Models.Records;
+using System;
+using System.Data.SQLite;
+using System.Globalization;
+
+namespace Sakuno.KanColle.Amatsukaze.ViewModels.History
+{
+    class ResourceHistoryTypeKey : ModelBase
+    {
+        public ResourceHistoryType Type { get; }
+
+        public Func<SQLiteDataReader, ResourceRecord> RecordConstructor { get; }
+
+        public string Clause { get; }
+
+        public long Maximum { get; private set; }
+
+        public ResourceHistoryTypeKey(ResourceHistoryType rpType)
+        {
+            Type = rpType;
+
+            switch (rpType)
+            {
+                case ResourceHistoryType.Detail:
+                    RecordConstructor = r => new ResourceRecord(r);
+                    break;
+
+                case ResourceHistoryType.Daily:
+                    RecordConstructor = r => new DailyResourceRecord(r);
+                    Clause = "GROUP BY julianday(time, 'unixepoch', 'localtime', 'start of day', 'utc')";
+                    break;
+
+                case ResourceHistoryType.Weekly:
+                    RecordConstructor = r => new WeeklyResourceRecord(r);
+                    Clause = "GROUP BY julianday(time, 'unixepoch', 'localtime', 'weekday 0', '-6 days', 'start of day', 'utc')";
+                    break;
+
+                case ResourceHistoryType.Monthly:
+                    RecordConstructor = r => new MonthlyResourceRecord(r);
+                    Clause = "GROUP BY julianday(time, 'unixepoch', 'localtime', 'start of month', 'utc')";
+                    break;
+            }
+        }
+
+        public void Update()
+        {
+            DateTime rNow;
+
+            switch (Type)
+            {
+                case ResourceHistoryType.Daily:
+                    Maximum = new DateTimeOffset(DateTime.Now.AddDays(1.0).Date).ToUnixTime();
+                    break;
+
+                case ResourceHistoryType.Weekly:
+                    rNow = DateTime.Now;
+                    Maximum = new DateTimeOffset(rNow.AddDays(-(rNow.DayOfWeek - DayOfWeek.Monday + 7) % 7).AddDays(7.0).Date).ToUnixTime();
+                    break;
+
+                case ResourceHistoryType.Monthly:
+                    rNow = DateTime.Now;
+                    Maximum = new DateTimeOffset(new DateTime(rNow.Year, rNow.Month, 1).AddMonths(1)).ToUnixTime();
+                    break;
+            }
+        }
+
+        class DailyResourceRecord : ResourceRecord
+        {
+            public override string Time => DateTimeUtil.FromUnixTime(ID).LocalDateTime.ToString("d");
+
+            public DailyResourceRecord(SQLiteDataReader rpReader) : base(rpReader) { }
+        }
+        class WeeklyResourceRecord : ResourceRecord
+        {
+            static Calendar r_Calendar = CultureInfo.CurrentUICulture.Calendar;
+
+            public override string Time
+            {
+                get
+                {
+                    var rMonday = DateTimeUtil.FromUnixTime(ID).LocalDateTime.Date;
+                    rMonday = rMonday.AddDays(-(rMonday.DayOfWeek - DayOfWeek.Monday + 7) % 7);
+
+                    var rMonth = rMonday.Month;
+
+                    var rFirstMonday = new DateTime(rMonday.Year, rMonday.Month, 1);
+                    rFirstMonday = rFirstMonday.AddDays(-(rFirstMonday.DayOfWeek - DayOfWeek.Monday + 7) % 7);
+
+                    if (rFirstMonday.Month != rMonth)
+                        rFirstMonday = rFirstMonday.AddDays(7.0);
+
+                    var rCurrentWeek = r_Calendar.GetWeekOfYear(rMonday, CalendarWeekRule.FirstFullWeek, DayOfWeek.Monday);
+                    var rFirstMondayWeek = r_Calendar.GetWeekOfYear(rFirstMonday, CalendarWeekRule.FirstFullWeek, DayOfWeek.Monday);
+
+                    var rWeek = rCurrentWeek - rFirstMondayWeek + 1;
+
+                    return rMonday.ToString("Y") + " " + string.Format(StringResources.Instance.Main.ResourceHistory_Week_Format, rWeek);
+                }
+            }
+
+            public WeeklyResourceRecord(SQLiteDataReader rpReader) : base(rpReader) { }
+        }
+        class MonthlyResourceRecord : ResourceRecord
+        {
+            public override string Time => DateTimeUtil.FromUnixTime(ID).LocalDateTime.ToString("Y");
+
+            public MonthlyResourceRecord(SQLiteDataReader rpReader) : base(rpReader) { }
+        }
+    }
+}
diff --git a/HeavenlyWind/ViewModels/History/ResourceHistoryViewModel.cs b/HeavenlyWind/ViewModels/History/ResourceHistoryViewModel.cs
index 94179598..0ca55ee1 100644
--- a/HeavenlyWind/ViewModels/History/ResourceHistoryViewModel.cs
+++ b/HeavenlyWind/ViewModels/History/ResourceHistoryViewModel.cs
@@ -1,44 +1,87 @@
 using Sakuno.KanColle.Amatsukaze.Models.Records;
+using System.Collections.Generic;
 using System.Data.SQLite;
 using System.IO;
+using System.Linq;
 
 namespace Sakuno.KanColle.Amatsukaze.ViewModels.History
 {
     class ResourceHistoryViewModel : HistoryViewModelBase<ResourceRecord>
     {
-        protected override string LoadCommandText => @"SELECT x.time,
-    x.fuel, coalesce(x.fuel - y.fuel, 0) AS fuel_diff,
-    x.bullet, coalesce(x.bullet - y.bullet, 0) AS bullet_diff,
-    x.steel, coalesce(x.steel - y.steel, 0) AS steel_diff,
-    x.bauxite, coalesce(x.bauxite - y.bauxite, 0) AS bauxite_diff,
-    x.instant_construction, coalesce(x.instant_construction - y.instant_construction, 0) AS instant_construction_diff,
-    x.bucket, coalesce(x.bucket - y.bucket, 0) AS bucket_diff,
-    x.development_material, coalesce(x.development_material - y.development_material, 0) AS development_material_diff,
-    x.improvement_material, coalesce(x.improvement_material - y.improvement_material, 0) AS improvement_material_diff
-FROM resources x
-LEFT JOIN resources y ON y.time = (SELECT max(time) FROM resources z WHERE z.time < x.time)
-ORDER BY x.time DESC;";
-
-        protected override ResourceRecord CreateRecordFromReader(SQLiteDataReader rpReader) => new ResourceRecord(rpReader);
+        public IList<ResourceHistoryTypeKey> Types { get; }
+
+        ResourceHistoryTypeKey r_Type;
+        public ResourceHistoryTypeKey SelectedType
+        {
+            get { return r_Type; }
+            set
+            {
+                if (r_Type != value)
+                {
+                    r_Type = value;
+                    OnPropertyChanged(nameof(SelectedType));
+
+                    r_Type.Update();
+
+                    LoadRecords();
+                }
+            }
+        }
+
+        protected override string LoadCommandText => $"SELECT * FROM resources {r_Type.Clause};";
+
+        public ResourceHistoryViewModel()
+        {
+            Types = Enumerable.Range(0, 4).Select(r => new ResourceHistoryTypeKey((ResourceHistoryType)r)).ToArray();
+            r_Type = Types[1];
+            r_Type.Update();
+        }
+
+        protected override ResourceRecord CreateRecordFromReader(SQLiteDataReader rpReader)
+        {
+            var rResult = r_Type.RecordConstructor(rpReader);
+
+            if (LastInsertedRecord != null)
+                rResult.Previous = LastInsertedRecord;
+
+            return rResult;
+        }
 
         protected override bool TableFilter(string rpTable) => rpTable == "main.resources";
 
         protected override void PrepareCommandOnRecordInsert(SQLiteCommand rpCommand, string rpTable, long rpRowID)
         {
-            rpCommand.CommandText = @"SELECT x.time,
-    x.fuel, coalesce(x.fuel - y.fuel, 0) AS fuel_diff,
-    x.bullet, coalesce(x.bullet - y.bullet, 0) AS bullet_diff,
-    x.steel, coalesce(x.steel - y.steel, 0) AS steel_diff,
-    x.bauxite, coalesce(x.bauxite - y.bauxite, 0) AS bauxite_diff,
-    x.instant_construction, coalesce(x.instant_construction - y.instant_construction, 0) AS instant_construction_diff,
-    x.bucket, coalesce(x.bucket - y.bucket, 0) AS bucket_diff,
-    x.development_material, coalesce(x.development_material - y.development_material, 0) AS development_material_diff,
-    x.improvement_material, coalesce(x.improvement_material - y.improvement_material, 0) AS improvement_material_diff
-FROM resources x
-LEFT JOIN resources y ON y.time = (SELECT max(time) FROM resources z WHERE z.time < @time)
-WHERE x.time = @time;";
+            rpCommand.CommandText = "SELECT * FROM resources WHERE time = @time;";
             rpCommand.Parameters.AddWithValue("@time", rpRowID);
         }
+        protected override bool BeforeNewRecordInserting(SQLiteDataReader rpReader)
+        {
+            if (r_Type.Type == ResourceHistoryType.Detail)
+                return true;
+
+            var rTime = rpReader.GetInt64("time");
+
+            if (rTime >= r_Type.Maximum)
+            {
+                r_Type.Update();
+
+                return true;
+            }
+
+            LastInsertedRecord.ID = rTime;
+            LastInsertedRecord.Fuel = rpReader.GetInt32("fuel");
+            LastInsertedRecord.Bullet = rpReader.GetInt32("bullet");
+            LastInsertedRecord.Steel = rpReader.GetInt32("steel");
+            LastInsertedRecord.Bauxite = rpReader.GetInt32("bauxite");
+            LastInsertedRecord.InstantConstruction = rpReader.GetInt32("instant_construction");
+            LastInsertedRecord.Bucket = rpReader.GetInt32("bucket");
+            LastInsertedRecord.DevelopmentMaterial = rpReader.GetInt32("development_material");
+            LastInsertedRecord.ImprovementMaterial = rpReader.GetInt32("improvement_material");
+
+            LastInsertedRecord.Update();
+
+            return false;
+        }
 
         protected override void ExportAsCsvFileCore(StreamWriter rpWriter)
         {
diff --git a/HeavenlyWind/ViewModels/History/ScrappingHistoryViewModel.cs b/HeavenlyWind/ViewModels/History/ScrappingHistoryViewModel.cs
index e5a51293..312e9a9a 100644
--- a/HeavenlyWind/ViewModels/History/ScrappingHistoryViewModel.cs
+++ b/HeavenlyWind/ViewModels/History/ScrappingHistoryViewModel.cs
@@ -7,8 +7,7 @@ class ScrappingHistoryViewModel : HistoryViewModelBase<FateRecord>
     {
         protected override string LoadCommandText => @"SELECT id, ship AS master_id, level, 0 AS proficiency, time, fate, 0 AS is_equipment FROM ship_fate WHERE ship != -1
 UNION
-SELECT id, equipment AS master_id, level, proficiency, time, fate, 1 AS is_equipment FROM equipment_fate WHERE equipment != -1
-ORDER BY time DESC;";
+SELECT id, equipment AS master_id, level, proficiency, time, fate, 1 AS is_equipment FROM equipment_fate WHERE equipment != -1;";
 
         protected override FateRecord CreateRecordFromReader(SQLiteDataReader rpReader) => new FateRecord(rpReader);
 
diff --git a/HeavenlyWind/ViewModels/History/SortieHistoryViewModel.cs b/HeavenlyWind/ViewModels/History/SortieHistoryViewModel.cs
index cb2a86a5..5d6da344 100644
--- a/HeavenlyWind/ViewModels/History/SortieHistoryViewModel.cs
+++ b/HeavenlyWind/ViewModels/History/SortieHistoryViewModel.cs
@@ -7,7 +7,6 @@
 using System.Data.SQLite;
 using System.IO;
 using System.Linq;
-using System;
 
 namespace Sakuno.KanColle.Amatsukaze.ViewModels.History
 {
@@ -110,7 +109,7 @@ public bool OtherRank
         public override bool Filter(SortieRecord rpItem)
         {
             var rResult = r_Map == SortieMapFilterKey.All ||
-                (rpItem.Map == r_Map.Map && (!r_Map.IsEventMap || rpItem.EventMapDifficulty == r_Map.EventMapDifficulty) && (r_Node == string.Empty || rpItem.NodeWikiID == r_Node));
+                (rpItem.Map == r_Map.Map && (!r_Map.IsEventMap || rpItem.EventMapDifficulty == r_Map.EventMapDifficulty) && (r_Node == string.Empty || rpItem.NodeWikiID == r_Node || rpItem.Node.ToString() == r_Node));
 
             switch (rpItem.BattleRank)
             {
@@ -178,7 +177,7 @@ void UpdateNodes()
 
         protected override void PrepareCommandOnRecordInsert(SQLiteCommand rpCommand, string rpTable, long rpRowID)
         {
-            rpCommand.CommandText = @"SELECT sortie.id AS id, sortie.map AS map, difficulty, step, node, type, subtype, extra_info, rank, dropped_ship, battle_dropped_item.item as dropped_item, battle_detail.first IS NOT NULL AS battle_detail, participant_hd.ships AS heavily_damaged FROM sortie
+            rpCommand.CommandText = @"SELECT sortie.id AS id, sortie.map AS map, difficulty, step, node, type, subtype, extra_info, rank, dropped_ship, battle_dropped_item.item as dropped_item, battle_detail.first IS NOT NULL AS battle_detail, participant_hd.ships AS heavily_damaged, mvp, mvp_escort FROM sortie
 JOIN sortie_map ON sortie.map = sortie_map.id
 JOIN sortie_detail ON sortie.id = sortie_detail.id
 JOIN sortie_node ON sortie.map = sortie_node.map AND sortie_detail.node = sortie_node.id
@@ -197,7 +196,7 @@ protected override void OnRecordUpdate(string rpTable, long rpRowID)
 
             using (var rCommand = CreateCommand())
             {
-                rCommand.CommandText = @"SELECT rank, dropped_ship, battle_dropped_item.item as dropped_item, battle_detail.first IS NOT NULL AS battle_detail, participant_hd.ships AS heavily_damaged FROM battle
+                rCommand.CommandText = @"SELECT rank, dropped_ship, battle_dropped_item.item as dropped_item, battle_detail.first IS NOT NULL AS battle_detail, participant_hd.ships AS heavily_damaged, mvp, mvp_escort  FROM battle
 LEFT JOIN battle_dropped_item ON battle.id = battle_dropped_item.id
 LEFT JOIN battle_detail.battle battle_detail ON battle.id = battle_detail.id
 LEFT JOIN battle_detail.participant_hd_view participant_hd ON battle.id = participant_hd.battle
diff --git a/HeavenlyWind/ViewModels/History/SortieHistoryViewModelBase.cs b/HeavenlyWind/ViewModels/History/SortieHistoryViewModelBase.cs
index 0e352730..a06d1d55 100644
--- a/HeavenlyWind/ViewModels/History/SortieHistoryViewModelBase.cs
+++ b/HeavenlyWind/ViewModels/History/SortieHistoryViewModelBase.cs
@@ -8,7 +8,7 @@
 
 namespace Sakuno.KanColle.Amatsukaze.ViewModels.History
 {
-    abstract class SortieHistoryViewModelBase<T> : HistoryViewModelBase<T> where T : SortieRecordBase
+    abstract class SortieHistoryViewModelBase<T> : HistoryViewModelBase<T> where T : SortieRecordBase, IRecordID
     {
         public FilterKeyCollection<SortieMapFilterKey> Maps { get; } = new FilterKeyCollection<SortieMapFilterKey>(SortieMapFilterKey.All, SortieMapFilterKey.Comparer);
 
diff --git a/HeavenlyWind/ViewModels/InitializationPageViewModel.cs b/HeavenlyWind/ViewModels/InitializationPageViewModel.cs
index 81de7075..7b03ac47 100644
--- a/HeavenlyWind/ViewModels/InitializationPageViewModel.cs
+++ b/HeavenlyWind/ViewModels/InitializationPageViewModel.cs
@@ -30,46 +30,58 @@ private set
         }
 
         public bool IsPortAvailable { get; private set; } = true;
+        public bool IsConnectionCycle { get; private set; }
         public bool IsUpstreamProxyAvailable { get; private set; }
 
         public ProcessInfo ProcessThatOccupyingPort { get; private set; }
 
-        public ICommand StartCommand { get; }
+        public ICommand RetryCommand { get; }
+        public ICommand SkipCommand { get; }
 
         public InitializationPageViewModel(MainWindowViewModel rpOwner)
         {
             r_Owner = rpOwner;
 
-            StartCommand = new DelegatedCommand(Start);
+            RetryCommand = new DelegatedCommand(CheckProxyPort);
+            SkipCommand = new DelegatedCommand(Start);
         }
 
-        public async void Start()
+        public async void CheckProxyPort()
         {
             Step = InitializationStep.Initializing;
 
-            await Task.Run(new Action(CheckProxyPort));
+            await Task.Run((Action)CheckProxyPortCore);
 
-            if (IsPortAvailable && IsUpstreamProxyAvailable)
+            if (IsPortAvailable && !IsConnectionCycle)
             {
-                KanColleProxy.Start();
-                r_Owner.Page = r_Owner.GameInformation;
-
-                Step = InitializationStep.None;
+                Start();
                 return;
             }
 
             Step = InitializationStep.Error;
         }
 
-        unsafe void CheckProxyPort()
+        void Start()
+        {
+            KanColleProxy.Start();
+            r_Owner.Page = r_Owner.GameInformation;
+
+            Step = InitializationStep.None;
+        }
+
+        unsafe void CheckProxyPortCore()
         {
-            var rPort = Preference.Instance.Network.Port;
+            var rPort = Preference.Instance.Network.Port.Default;
+            if (Preference.Instance.Network.PortCustomization)
+                rPort = Preference.Instance.Network.Port.Value;
             var rUpstreamProxy = Preference.Instance.Network.UpstreamProxy;
 
             var rIsPortAvailable = true;
             var rIsUpstreamProxyAvailable = false;
 
-            if (!rUpstreamProxy.Enabled || rUpstreamProxy.Host != "127.0.0.1")
+            if (rUpstreamProxy.Enabled && (rUpstreamProxy.Host == "127.0.0.1" || rUpstreamProxy.Host =="localhost"))
+                IsConnectionCycle = rPort == rUpstreamProxy.Port.Value;
+            else
                 rIsUpstreamProxyAvailable = true;
 
             var rBufferSize = 0;
@@ -108,11 +120,9 @@ unsafe void CheckProxyPort()
                 ProcessThatOccupyingPort = null;
 
             IsPortAvailable = rIsPortAvailable;
-            IsUpstreamProxyAvailable = rIsUpstreamProxyAvailable;
+            IsUpstreamProxyAvailable = IsConnectionCycle || rIsUpstreamProxyAvailable;
 
-            OnPropertyChanged(nameof(IsPortAvailable));
-            OnPropertyChanged(nameof(IsUpstreamProxyAvailable));
-            OnPropertyChanged(nameof(ProcessThatOccupyingPort));
+            OnPropertyChanged(string.Empty);
         }
     }
 }
diff --git a/HeavenlyWind/ViewModels/MainWindowViewModel.cs b/HeavenlyWind/ViewModels/MainWindowViewModel.cs
index 6e2f8ccf..a357a2af 100644
--- a/HeavenlyWind/ViewModels/MainWindowViewModel.cs
+++ b/HeavenlyWind/ViewModels/MainWindowViewModel.cs
@@ -1,11 +1,17 @@
 using Sakuno.KanColle.Amatsukaze.Game;
+using Sakuno.KanColle.Amatsukaze.Game.Models;
 using Sakuno.KanColle.Amatsukaze.Game.Services;
+using Sakuno.KanColle.Amatsukaze.Models;
 using Sakuno.KanColle.Amatsukaze.Services;
+using Sakuno.KanColle.Amatsukaze.ViewModels.Tools;
 using Sakuno.KanColle.Amatsukaze.Views.History;
 using Sakuno.KanColle.Amatsukaze.Views.Preferences;
 using Sakuno.KanColle.Amatsukaze.Views.Statistics;
+using Sakuno.KanColle.Amatsukaze.Views.Tools;
 using Sakuno.UserInterface;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Input;
 
 namespace Sakuno.KanColle.Amatsukaze.ViewModels
@@ -33,10 +39,20 @@ internal set
 
         Accent r_BlinkingBrownAccent;
 
+        public IList<UIZoomInfo> UIZoomFactors { get; private set; }
+
         public ICommand ShowPreferencesWindowCommand { get; } = new DelegatedCommand(() => WindowService.Instance.Show<PreferencesWindow>(rpClearDataContextOnWindowClosed: false));
 
+        SessionToolViewModel r_SessionTool = new SessionToolViewModel();
+
+        public ICommand ShowSessionToolCommand { get; }
+
         public ICommand ExpandMenuCommand { get; }
 
+        public ICommand UISetZoomCommand { get; private set; }
+        public ICommand UIZoomInCommand { get; private set; }
+        public ICommand UIZoomOutCommand { get; private set; }
+
         public ICommand ShowConstructionHistoryCommand { get; }
         public ICommand ShowDevelopmentHistoryCommand { get; }
         public ICommand ShowSortieHistoryCommand { get; }
@@ -48,8 +64,8 @@ internal set
 
         internal MainWindowViewModel()
         {
+            r_Page = new InitializationPageViewModel(this);
             GameInformation = new GameInformationViewModel(this);
-            r_Page = GameInformation;
 
             ApiService.SubscribeOnce("api_start2", delegate
             {
@@ -57,9 +73,20 @@ internal MainWindowViewModel()
                 OnPropertyChanged(nameof(IsGameStarted));
             });
 
+            ShowSessionToolCommand = new DelegatedCommand(() => WindowService.Instance.Show<SessionToolWindow>(r_SessionTool));
+
             ApiService.Subscribe("api_req_map/start", _ => ThemeManager.Instance.ChangeAccent(Accent.Brown));
             KanColleGame.Current.ReturnedFromSortie += _ => ThemeManager.Instance.ChangeAccent(Accent.Blue);
 
+            Preference.Instance.Game.DisableHeavyDamageBlinkingWarning.Subscribe(rpValue =>
+            {
+                if (SortieInfo.Current == null)
+                    return;
+
+                if (!rpValue)
+                    ThemeManager.Instance.ChangeAccent(Accent.Brown);
+            });
+
             r_BlinkingBrownAccent = new Accent("BlinkingBrown", new Uri("pack://application:,,,/HeavenlyWind;component/Themes/Accents/BlinkingBrown.xaml"));
 
             PropertyChangedEventListener.FromSource(NotificationService.Instance)
@@ -69,6 +96,12 @@ internal MainWindowViewModel()
                         ThemeManager.Instance.ChangeAccent(r_BlinkingBrownAccent);
                 });
 
+            UISetZoomCommand = new DelegatedCommand<double>(SetZoom);
+            UIZoomInCommand = new DelegatedCommand(() => SetZoom(Preference.Instance.UI.Zoom.Value + .05));
+            UIZoomOutCommand = new DelegatedCommand(() => SetZoom(Preference.Instance.UI.Zoom.Value - .05));
+
+            UIZoomFactors = new[] { .25, .5, .75, 1.0, 1.25, 1.5, 1.75, 2.0, 3.0, 4.0 }.Select(r => new UIZoomInfo(r, UISetZoomCommand)).ToArray();
+
             ShowConstructionHistoryCommand = new DelegatedCommand(() => WindowService.Instance.Show<ConstructionHistoryWindow>());
             ShowDevelopmentHistoryCommand = new DelegatedCommand(() => WindowService.Instance.Show<DevelopmentHistoryWindow>());
             ShowSortieHistoryCommand = new DelegatedCommand(() => WindowService.Instance.Show<SortieHistoryWindow>());
@@ -78,5 +111,18 @@ internal MainWindowViewModel()
             ShowSortieConsumptionHistoryCommand = new DelegatedCommand(() => WindowService.Instance.Show<SortieConsumptionHistoryWindow>());
             ShowSortieStatisticCommand = new DelegatedCommand(() => WindowService.Instance.Show<SortieStatisticWindow>());
         }
+
+        void SetZoom(double rpZoom)
+        {
+            rpZoom = Math.Round(rpZoom, 2);
+
+            if (rpZoom < .25)
+                return;
+
+            foreach (var rInfo in UIZoomFactors)
+                rInfo.IsSelected = rInfo.Zoom == rpZoom;
+
+            Preference.Instance.UI.Zoom.Value = rpZoom;
+        }
     }
 }
diff --git a/HeavenlyWind/ViewModels/Overviews/EquipmentOverviewViewModel.cs b/HeavenlyWind/ViewModels/Overviews/EquipmentOverviewViewModel.cs
index 636bffbb..a717ef98 100644
--- a/HeavenlyWind/ViewModels/Overviews/EquipmentOverviewViewModel.cs
+++ b/HeavenlyWind/ViewModels/Overviews/EquipmentOverviewViewModel.cs
@@ -1,12 +1,14 @@
 using Sakuno.KanColle.Amatsukaze.Game;
 using Sakuno.KanColle.Amatsukaze.Game.Models;
 using Sakuno.KanColle.Amatsukaze.Game.Services;
+using Sakuno.UserInterface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
+using System.Windows.Input;
 
 namespace Sakuno.KanColle.Amatsukaze.ViewModels.Overviews
 {
@@ -58,9 +60,13 @@ public bool? SelectAllTypes
 
         IDisposable r_HomeportSubscription;
 
+        public ICommand SelectThisTypeOnlyCommand { get; }
+
         internal EquipmentOverviewViewModel()
         {
-            r_TypeMap = KanColleGame.Current.MasterInfo.Equipment.Values.Select(r => r.Icon).Distinct().ToDictionary(IdentityFunction<EquipmentIconType>.Instance, r => new EquipmentTypeViewModel(r) { IsSelectedChangedCallback = UpdateSelection });
+            SelectThisTypeOnlyCommand = new DelegatedCommand<EquipmentTypeViewModel>(SelectThisTypeOnly);
+
+            r_TypeMap = KanColleGame.Current.MasterInfo.Equipment.Values.Select(r => r.Icon).Distinct().ToDictionary(IdentityFunction<EquipmentIconType>.Instance, r => new EquipmentTypeViewModel(r) { IsSelectedChangedCallback = UpdateSelection, SelectThisTypeOnlyCommand = SelectThisTypeOnlyCommand });
             Types = r_TypeMap.Values.ToArray();
 
             var rSelectedTypes = Preference.Instance.Game.SelectedEquipmentTypes.Value;
@@ -122,6 +128,14 @@ void UpdateSelectionCore()
             Refresh();
         }
 
+        void SelectThisTypeOnly(EquipmentTypeViewModel rpType)
+        {
+            foreach (var rType in Types)
+                rType.SetIsSelectedWithoutCallback(rType == rpType);
+
+            UpdateSelection();
+        }
+
         void UpdateCore()
         {
             if (r_SelectAllTypes.HasValue && !r_SelectAllTypes.Value)
@@ -142,7 +156,7 @@ void UpdateCore()
                             rGroup.Update(rShip, new EquipmentGroupingKey(rEquipment.Level, rEquipment.Proficiency));
                     }
 
-                Equipment = r_EquipmentMap.Values.Where(r => r.Type.IsSelected).ToArray();
+                Equipment = r_EquipmentMap.Values.Where(r => r.Type.IsSelected).OrderBy(r => r.Info.Icon).ToArray();
             }
 
             OnPropertyChanged(nameof(Equipment));
diff --git a/HeavenlyWind/ViewModels/Overviews/EquipmentTypeViewModel.cs b/HeavenlyWind/ViewModels/Overviews/EquipmentTypeViewModel.cs
index 6db0523d..a0356008 100644
--- a/HeavenlyWind/ViewModels/Overviews/EquipmentTypeViewModel.cs
+++ b/HeavenlyWind/ViewModels/Overviews/EquipmentTypeViewModel.cs
@@ -1,4 +1,6 @@
 using Sakuno.KanColle.Amatsukaze.Game.Models;
+using System;
+using System.Windows.Input;
 
 namespace Sakuno.KanColle.Amatsukaze.ViewModels.Overviews
 {
@@ -6,6 +8,8 @@ public class EquipmentTypeViewModel : FilterTypeViewModel
     {
         public EquipmentIconType Type { get; }
 
+        public ICommand SelectThisTypeOnlyCommand { get; internal set; }
+
         public EquipmentTypeViewModel(EquipmentIconType rpType)
         {
             Type = rpType;
diff --git a/HeavenlyWind/ViewModels/Overviews/ShipCollectionView.cs b/HeavenlyWind/ViewModels/Overviews/ShipCollectionView.cs
index 098003bc..f08dd8fe 100644
--- a/HeavenlyWind/ViewModels/Overviews/ShipCollectionView.cs
+++ b/HeavenlyWind/ViewModels/Overviews/ShipCollectionView.cs
@@ -37,40 +37,79 @@ protected override IEnumerable<ShipViewModel> Sort(IEnumerable<ShipViewModel> rp
             switch (SortingColumn)
             {
                 case "ID":
-                    return rpItems.OrderBy(r => r.Ship.ID);
+                    if (!r_Owner.IsOppositeOrder)
+                        return rpItems.OrderByDescending(r => r.Ship.ID);
+                    else
+                        return rpItems.OrderBy(r => r.Ship.ID);
 
                 case "Name":
-                    return rpItems.OrderBy(r => r.Ship.Info.Name);
+                    if (!r_Owner.IsOppositeOrder)
+                        return rpItems.OrderByDescending(r => r.Ship.Info.Name);
+                    else
+                        return rpItems.OrderBy(r => r.Ship.Info.Name);
 
                 case "ShipLocking":
                     return rpItems.OrderByDescending(r => r.Ship.RawData.LockingTag != 0).ThenBy(r => r.Ship.RawData.LockingTag);
 
                 case "Level":
-                    return rpItems.OrderByDescending(r => r.Ship.Level).ThenBy(r => r.Ship.SortNumber).ThenBy(r => r.Ship.ID);
+                    if (!r_Owner.IsOppositeOrder)
+                        return rpItems.OrderByDescending(r => r.Ship.Level).ThenBy(r => r.Ship.SortNumber).ThenBy(r => r.Ship.ID);
+                    else
+                        return rpItems.OrderBy(r => r.Ship.Level).ThenBy(r => r.Ship.SortNumber).ThenBy(r => r.Ship.ID);
 
                 case "Condition":
-                    return rpItems.OrderByDescending(r => r.Ship.Condition);
+                    if (!r_Owner.IsOppositeOrder)
+                        return rpItems.OrderByDescending(r => r.Ship.Condition);
+                    else
+                        return rpItems.OrderBy(r => r.Ship.Condition);
 
                 case "Firepower":
-                    return rpItems.OrderByDescending(r => r.Ship.Status.FirepowerBase.Current);
+                    if (!r_Owner.IsOppositeOrder)
+                        return rpItems.OrderByDescending(r => r.Ship.Status.FirepowerBase.Current);
+                    else
+                        return rpItems.OrderBy(r => r.Ship.Status.FirepowerBase.Current);
                 case "Torpedo":
-                    return rpItems.OrderByDescending(r => r.Ship.Status.TorpedoBase.Current);
+                    if (!r_Owner.IsOppositeOrder)
+                        return rpItems.OrderByDescending(r => r.Ship.Status.TorpedoBase.Current);
+                    else
+                        return rpItems.OrderBy(r => r.Ship.Status.TorpedoBase.Current);
                 case "AA":
-                    return rpItems.OrderByDescending(r => r.Ship.Status.AABase.Current);
+                    if (!r_Owner.IsOppositeOrder)
+                        return rpItems.OrderByDescending(r => r.Ship.Status.AABase.Current);
+                    else
+                        return rpItems.OrderBy(r => r.Ship.Status.AABase.Current);
                 case "Armor":
-                    return rpItems.OrderByDescending(r => r.Ship.Status.ArmorBase.Current);
+                    if (!r_Owner.IsOppositeOrder)
+                        return rpItems.OrderByDescending(r => r.Ship.Status.ArmorBase.Current);
+                    else
+                        return rpItems.OrderBy(r => r.Ship.Status.ArmorBase.Current);
                 case "Luck":
-                    return rpItems.OrderByDescending(r => r.Ship.Status.LuckBase.Current);
+                    if (!r_Owner.IsOppositeOrder)
+                        return rpItems.OrderByDescending(r => r.Ship.Status.LuckBase.Current);
+                    else
+                        return rpItems.OrderBy(r => r.Ship.Status.LuckBase.Current);
 
                 case "Evasion":
-                    return rpItems.OrderByDescending(r => r.Ship.Status.Evasion);
+                    if (!r_Owner.IsOppositeOrder)
+                        return rpItems.OrderByDescending(r => r.Ship.Status.Evasion);
+                    else
+                        return rpItems.OrderBy(r => r.Ship.Status.Evasion);
                 case "ASW":
-                    return rpItems.OrderByDescending(r => r.Ship.Status.ASW);
+                    if (!r_Owner.IsOppositeOrder)
+                        return rpItems.OrderByDescending(r => r.Ship.Status.ASW);
+                    else
+                        return rpItems.OrderBy(r => r.Ship.Status.Evasion);
                 case "LoS":
-                    return rpItems.OrderByDescending(r => r.Ship.Status.LoS);
+                    if (!r_Owner.IsOppositeOrder)
+                        return rpItems.OrderByDescending(r => r.Ship.Status.LoS);
+                    else
+                        return rpItems.OrderBy(r => r.Ship.Status.Evasion);
 
                 case "RepairTime":
-                    return rpItems.OrderByDescending(r => r.Ship.RepairTime);
+                    if (!r_Owner.IsOppositeOrder)
+                        return rpItems.OrderByDescending(r => r.Ship.RepairTime);
+                    else
+                        return rpItems.OrderBy(r => r.Ship.RepairTime);
 
                 default:
                     return rpItems;
diff --git a/HeavenlyWind/ViewModels/Overviews/ShipOverviewViewModel.cs b/HeavenlyWind/ViewModels/Overviews/ShipOverviewViewModel.cs
index 7093494a..aa13a12a 100644
--- a/HeavenlyWind/ViewModels/Overviews/ShipOverviewViewModel.cs
+++ b/HeavenlyWind/ViewModels/Overviews/ShipOverviewViewModel.cs
@@ -134,6 +134,8 @@ public bool ExceptMaxModernizationShips
 
         IDisposable r_HomeportSubscription;
 
+        public bool IsOppositeOrder { get; set; }
+
         internal ShipOverviewViewModel()
         {
             TypeMaps = KanColleGame.Current.MasterInfo.ShipTypes.Values.Where(r => r.ID != 12 && r.ID != 15).ToDictionary(IdentityFunction<ShipTypeInfo>.Instance, r => new ShipTypeViewModel(r) { IsSelectedChangedCallback = UpdateSelection });
@@ -189,7 +191,13 @@ internal void Sort(GridViewColumnHeader rpColumnHeader)
             if (rColumn == null)
                 return;
 
-            r_Ships.SortingColumn = rColumn;
+            if (r_Ships.SortingColumn == rColumn)
+                IsOppositeOrder = !IsOppositeOrder;
+            else
+            {
+                r_Ships.SortingColumn = rColumn;
+                IsOppositeOrder = false;
+            }
 
             Refresh();
         }
diff --git a/HeavenlyWind/ViewModels/Statistics/SortieStatisticAreaViewModel.cs b/HeavenlyWind/ViewModels/Statistics/SortieStatisticAreaViewModel.cs
new file mode 100644
index 00000000..a9fdcda4
--- /dev/null
+++ b/HeavenlyWind/ViewModels/Statistics/SortieStatisticAreaViewModel.cs
@@ -0,0 +1,32 @@
+using Sakuno.KanColle.Amatsukaze.Game.Models;
+using System;
+
+namespace Sakuno.KanColle.Amatsukaze.ViewModels.Statistics
+{
+    class SortieStatisticAreaViewModel : ModelBase
+    {
+        public MapAreaInfo Area { get; }
+
+        bool r_IsSelected = true;
+        public bool IsSelected
+        {
+            get { return r_IsSelected; }
+            set
+            {
+                if (r_IsSelected != value)
+                {
+                    r_IsSelected = value;
+                    OnPropertyChanged(nameof(IsSelected));
+                    IsSelectedChangedCallback?.Invoke();
+                }
+            }
+        }
+
+        public Action IsSelectedChangedCallback { get; internal set; }
+
+        public SortieStatisticAreaViewModel(MapAreaInfo rpArea)
+        {
+            Area = rpArea;
+        }
+    }
+}
diff --git a/HeavenlyWind/ViewModels/Statistics/SortieStatisticCustomTimeSpanGroupViewModel.cs b/HeavenlyWind/ViewModels/Statistics/SortieStatisticCustomTimeSpanGroupViewModel.cs
new file mode 100644
index 00000000..37859531
--- /dev/null
+++ b/HeavenlyWind/ViewModels/Statistics/SortieStatisticCustomTimeSpanGroupViewModel.cs
@@ -0,0 +1,82 @@
+using Sakuno.KanColle.Amatsukaze.Models.Statistics;
+using System;
+
+namespace Sakuno.KanColle.Amatsukaze.ViewModels.Statistics
+{
+    class SortieStatisticCustomTimeSpanGroupViewModel : SortieStatisticTimeSpanGroupViewModel
+    {
+        public DateTime MinDisplayDateStart { get; internal set; }
+
+        DateTime r_SelectedDateStart;
+        public DateTime SelectedDateStart
+        {
+            get { return r_SelectedDateStart; }
+            set
+            {
+                if (r_SelectedDateStart != value)
+                {
+                    r_SelectedDateStart = value.AddDays(1.0).Date.AddSeconds(-1.0);
+                    OnPropertyChanged(nameof(SelectedDateStart));
+
+                    IsDateStartCalendarOpened = false;
+                    TimeSpanStart = new DateTimeOffset(r_SelectedDateStart).ToUnixTime().ToString();
+                    Reload();
+                }
+            }
+        }
+
+        DateTime r_SelectedDateEnd;
+        public DateTime SelectedDateEnd
+        {
+            get { return r_SelectedDateEnd; }
+            set
+            {
+                if (r_SelectedDateEnd != value)
+                {
+                    r_SelectedDateEnd = value.AddDays(1.0).Date.AddSeconds(-1.0);
+                    OnPropertyChanged(nameof(SelectedDateEnd));
+
+                    IsDateEndCalendarOpened = false;
+                    TimeSpanEnd = new DateTimeOffset(r_SelectedDateEnd).ToUnixTime().ToString();
+                    Reload();
+                }
+            }
+        }
+
+        bool r_IsDateStartCalendarOpened;
+        public bool IsDateStartCalendarOpened
+        {
+            get { return r_IsDateStartCalendarOpened; }
+            set
+            {
+                if (r_IsDateStartCalendarOpened != value)
+                {
+                    r_IsDateStartCalendarOpened = value;
+                    OnPropertyChanged(nameof(IsDateStartCalendarOpened));
+                }
+            }
+        }
+
+        bool r_IsDateEndCalendarOpened;
+        public bool IsDateEndCalendarOpened
+        {
+            get { return r_IsDateEndCalendarOpened; }
+            set
+            {
+                if (r_IsDateEndCalendarOpened != value)
+                {
+                    r_IsDateEndCalendarOpened = value;
+                    OnPropertyChanged(nameof(IsDateEndCalendarOpened));
+                }
+            }
+        }
+
+        public SortieStatisticCustomTimeSpanGroupViewModel(SortieStatisticViewModel rpOwner) : base(rpOwner, SortieStatisticTimeSpanType.Custom)
+        {
+            var rNow = new DateTimeOffset(DateTime.Now.AddDays(1.0).Date.AddSeconds(-1.0));
+
+            r_SelectedDateStart = r_SelectedDateEnd = rNow.DateTime;
+            TimeSpanStart = TimeSpanEnd = rNow.ToUnixTime().ToString();
+        }
+    }
+}
diff --git a/HeavenlyWind/ViewModels/Statistics/SortieStatisticDefaultTimeSpanGroupViewModel.cs b/HeavenlyWind/ViewModels/Statistics/SortieStatisticDefaultTimeSpanGroupViewModel.cs
new file mode 100644
index 00000000..225a99e2
--- /dev/null
+++ b/HeavenlyWind/ViewModels/Statistics/SortieStatisticDefaultTimeSpanGroupViewModel.cs
@@ -0,0 +1,43 @@
+using Sakuno.KanColle.Amatsukaze.Models.Statistics;
+
+namespace Sakuno.KanColle.Amatsukaze.ViewModels.Statistics
+{
+    class SortieStatisticDefaultTimeSpanGroupViewModel : SortieStatisticTimeSpanGroupViewModel
+    {
+        public SortieStatisticDefaultTimeSpanGroupViewModel(SortieStatisticViewModel rpOwner, SortieStatisticTimeSpanType rpType) : base(rpOwner, rpType)
+        {
+            switch (rpType)
+            {
+                case SortieStatisticTimeSpanType.Today:
+                    TimeSpanStart = "strftime('%s', 'now', 'localtime', 'start of day', 'utc')";
+                    TimeSpanEnd = "strftime('%s', 'now')";
+                    break;
+
+                case SortieStatisticTimeSpanType.ThisWeek:
+                    TimeSpanStart = "strftime('%s', 'now', 'localtime', 'weekday 0', '-6 days', 'start of day', 'utc')";
+                    TimeSpanEnd = "strftime('%s', 'now')";
+                    break;
+
+                case SortieStatisticTimeSpanType.ThisMonth:
+                    TimeSpanStart = "strftime('%s', 'now', 'localtime', 'start of month', 'utc')";
+                    TimeSpanEnd = "strftime('%s', 'now')";
+                    break;
+
+                case SortieStatisticTimeSpanType.Yesterday:
+                    TimeSpanStart = "strftime('%s', 'now', 'localtime', 'start of day', '-1 days', 'utc')";
+                    TimeSpanEnd = "strftime('%s', 'now', 'localtime', 'start of day', 'utc')";
+                    break;
+
+                case SortieStatisticTimeSpanType.LastWeek:
+                    TimeSpanStart = "strftime('%s', 'now', 'localtime', 'weekday 0', '-13 days', 'start of day', 'utc')";
+                    TimeSpanEnd = "strftime('%s', 'now', 'localtime', 'weekday 0', '-6 days', 'start of day', 'utc')";
+                    break;
+
+                case SortieStatisticTimeSpanType.LastMonth:
+                    TimeSpanStart = "strftime('%s', 'now', 'localtime', 'start of month', '-1 month', 'utc')";
+                    TimeSpanEnd = "strftime('%s', 'now', 'localtime', 'start of month', 'utc')";
+                    break;
+            }
+        }
+    }
+}
diff --git a/HeavenlyWind/ViewModels/Statistics/SortieStatisticTimeSpanGroupViewModel.cs b/HeavenlyWind/ViewModels/Statistics/SortieStatisticTimeSpanGroupViewModel.cs
index 80d5a483..0755da80 100644
--- a/HeavenlyWind/ViewModels/Statistics/SortieStatisticTimeSpanGroupViewModel.cs
+++ b/HeavenlyWind/ViewModels/Statistics/SortieStatisticTimeSpanGroupViewModel.cs
@@ -1,25 +1,133 @@
-using Sakuno.KanColle.Amatsukaze.Models.Statistics;
+using Sakuno.KanColle.Amatsukaze.Game.Models;
+using Sakuno.KanColle.Amatsukaze.Game.Services;
+using Sakuno.KanColle.Amatsukaze.Models.Statistics;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace Sakuno.KanColle.Amatsukaze.ViewModels.Statistics
 {
-    class SortieStatisticTimeSpanGroupViewModel : ModelBase
+    abstract class SortieStatisticTimeSpanGroupViewModel : ModelBase
     {
+        const string CommandTextBase = @"SELECT sortie_map.id AS map, sortie_map.difficulty,
+    count(*) AS count,
+    sum(statistic.fuel) AS fuel_consumption,
+    sum(statistic.bullet) AS bullet_consumption,
+    sum(statistic.steel) AS steel_consumption,
+    sum(statistic.bauxite) AS bauxite_consumption,
+    sum(statistic.bucket) AS bucket_consumption,
+    sum(statistic.ranking_point) AS ranking_point,
+    sum(statistic.s_rank) AS s_rank_count,
+    sum(statistic.a_rank) AS a_rank_count,
+    sum(statistic.b_rank) AS b_rank_count,
+    sum(statistic.failure_rank) AS failure_rank_count
+FROM (SELECT DISTINCT map AS id, difficulty FROM sortie WHERE map / 10 IN ({0}) ORDER BY id, difficulty) sortie_map
+JOIN (
+    SELECT id, map, difficulty,
+        ifnull(sum(sortie_consumption_detail.fuel), 0) - ifnull(sortie_reward.fuel, 0) AS fuel,
+        ifnull(sum(sortie_consumption_detail.bullet), 0) - ifnull(sortie_reward.bullet, 0) AS bullet,
+        ifnull(sum(sortie_consumption_detail.steel), 0) - ifnull(sortie_reward.steel, 0) AS steel,
+        ifnull(sum(sortie_consumption_detail.bauxite), 0) - ifnull(sortie_reward.bauxite, 0) AS bauxite,
+        ifnull(sum(sortie_consumption_detail.bucket), 0) AS bucket,
+        ((SELECT experience FROM admiral_experience WHERE time = (SELECT min(time) FROM admiral_experience WHERE time >= sortie.return_time)) - (SELECT experience FROM admiral_experience WHERE time = (SELECT max(time) FROM admiral_experience WHERE time <= sortie.id))) * 7.0 / 10000 + ifnull((SELECT point FROM ranking_point_bonus WHERE sortie = sortie.id), 0) AS ranking_point,
+        s_rank, a_rank, b_rank, failure_rank
+    FROM sortie_consumption
+    JOIN sortie USING(id)
+    JOIN (
+        SELECT sortie_detail.id,
+            count(CASE WHEN rank = 5 THEN sortie_detail.id END) AS s_rank,
+            count(CASE WHEN rank = 4 THEN sortie_detail.id END) AS a_rank,
+            count(CASE WHEN rank = 3 THEN sortie_detail.id END) AS b_rank,
+            count(CASE WHEN rank NOT IN (3, 4, 5) THEN sortie_detail.id END) AS failure_rank
+        FROM sortie_detail
+        JOIN battle ON battle.id = sortie_detail.extra_info
+        GROUP BY sortie_detail.id
+    ) USING(id)
+    LEFT JOIN sortie_consumption_detail USING(id)
+    LEFT JOIN sortie_reward USING(id)
+    GROUP BY id
+    ORDER BY id DESC
+) statistic ON map = sortie_map.id AND statistic.difficulty IS sortie_map.difficulty AND statistic.id >= {1} AND statistic.id < {2}
+GROUP BY sortie_map.id, sortie_map.difficulty;";
+
+        SortieStatisticViewModel r_Owner;
+
         public SortieStatisticTimeSpanType Type { get; }
 
-        public IList<ModelBase> Maps { get; private set; }
+        protected string TimeSpanStart { get; set; }
+        protected string TimeSpanEnd { get; set; }
+
+        IList<ModelBase> r_Map;
+        public IList<ModelBase> Maps
+        {
+            get { return r_Map; }
+            internal set
+            {
+                if (r_Map != value)
+                {
+                    r_Map = value;
+                    OnPropertyChanged(nameof(Maps));
+                }
+            }
+        }
 
-        public SortieStatisticTimeSpanGroupViewModel(SortieStatisticTimeSpanType rpType)
+        protected SortieStatisticTimeSpanGroupViewModel(SortieStatisticViewModel rpOwner, SortieStatisticTimeSpanType rpType)
         {
+            r_Owner = rpOwner;
+
             Type = rpType;
         }
 
-        public void Update(IEnumerable<SortieStatisticData> rpItems)
+        public void Reload() => Task.Run((Action)ReloadCore);
+        void ReloadCore()
         {
-            Maps = rpItems.Select(r => new SortieStatisticMapItem(r)).ToList<ModelBase>();
-            Maps.Insert(0, new SortieStatisticTotalItem(rpItems));
-            OnPropertyChanged(string.Empty);
+            if (TimeSpanStart.IsNullOrEmpty() || TimeSpanEnd.IsNullOrEmpty())
+                return;
+
+            using (var rCommand = RecordService.Instance.CreateCommand())
+            {
+                var rBuilder = new StringBuilder(256);
+                foreach (var rArea in r_Owner.Areas)
+                {
+                    if (!rArea.IsSelected)
+                        continue;
+
+                    if (rArea.Area == null && r_Owner.PastAreas == null)
+                        continue;
+
+                    if (rBuilder.Length > 0)
+                        rBuilder.Append(", ");
+
+                    if (rArea.Area != null)
+                        rBuilder.Append(rArea.Area.ID);
+                    else
+                        rBuilder.Append(r_Owner.PastAreas);
+                }
+
+                if (rBuilder.Length == 0)
+                {
+                    Maps = new[] { new SortieStatisticTotalItem(Enumerable.Empty<SortieStatisticData>()) };
+                    OnPropertyChanged(string.Empty);
+
+                    return;
+                }
+
+                rCommand.CommandText = string.Format(CommandTextBase, rBuilder, TimeSpanStart, TimeSpanEnd);
+
+                using (var rReader = rCommand.ExecuteReader())
+                {
+                    var rData = new List<SortieStatisticData>(rReader.VisibleFieldCount);
+
+                    while (rReader.Read())
+                        rData.Add(new SortieStatisticData(rReader));
+
+                    Maps = rData.Select(r => new SortieStatisticMapItem(r)).ToList<ModelBase>();
+                    Maps.Insert(0, new SortieStatisticTotalItem(rData));
+                    OnPropertyChanged(string.Empty);
+                }
+            }
         }
     }
 }
diff --git a/HeavenlyWind/ViewModels/Statistics/SortieStatisticViewModel.cs b/HeavenlyWind/ViewModels/Statistics/SortieStatisticViewModel.cs
index 1da262b5..4d0f3ebd 100644
--- a/HeavenlyWind/ViewModels/Statistics/SortieStatisticViewModel.cs
+++ b/HeavenlyWind/ViewModels/Statistics/SortieStatisticViewModel.cs
@@ -1,10 +1,9 @@
-using Sakuno.KanColle.Amatsukaze.Game.Services;
+using Sakuno.KanColle.Amatsukaze.Game;
+using Sakuno.KanColle.Amatsukaze.Game.Services;
 using Sakuno.KanColle.Amatsukaze.Models.Statistics;
 using System;
 using System.Collections.Generic;
-using System.Data.SQLite;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace Sakuno.KanColle.Amatsukaze.ViewModels.Statistics
 {
@@ -12,6 +11,8 @@ class SortieStatisticViewModel : DisposableModelBase
     {
         public IList<SortieStatisticTimeSpanGroupViewModel> TimeSpans { get; private set; }
 
+        public SortieStatisticCustomTimeSpanGroupViewModel CustomTimeSpan { get; }
+
         SortieStatisticTimeSpanGroupViewModel r_SelectedTimeSpan;
         public SortieStatisticTimeSpanGroupViewModel SelectedTimeSpan
         {
@@ -20,91 +21,46 @@ public SortieStatisticTimeSpanGroupViewModel SelectedTimeSpan
             {
                 if (r_SelectedTimeSpan != value)
                 {
+                    if (r_SelectedTimeSpan != null)
+                        r_SelectedTimeSpan.Maps = null;
+
                     r_SelectedTimeSpan = value;
                     OnPropertyChanged(nameof(SelectedTimeSpan));
+
+                    r_SelectedTimeSpan?.Reload();
                 }
             }
         }
 
+        public IList<SortieStatisticAreaViewModel> Areas { get; }
+
+        internal string PastAreas { get; }
+
         public SortieStatisticViewModel()
         {
-            TimeSpans = Enumerable.Range(0, 6).Select(r => new SortieStatisticTimeSpanGroupViewModel((SortieStatisticTimeSpanType)r)).ToArray();
+            var rTimeSpans = Enumerable.Range(0, 6).Select(r => new SortieStatisticDefaultTimeSpanGroupViewModel(this, (SortieStatisticTimeSpanType)r)).ToList<SortieStatisticTimeSpanGroupViewModel>();
+            rTimeSpans.Add(CustomTimeSpan = new SortieStatisticCustomTimeSpanGroupViewModel(this));
+            TimeSpans = rTimeSpans.ToArray();
             r_SelectedTimeSpan = TimeSpans[0];
-        }
 
-        public void Load() => Task.Run((Action)LoadCore);
-        void LoadCore()
-        {
-            using (var rCommand = CreateCommand())
+            using (var rCommand = RecordService.Instance.CreateCommand())
             {
-                rCommand.CommandText = @"SELECT type, sortie_map.id AS map, sortie_map.difficulty,
-    count(*) AS count,
-    sum(statistic.fuel) AS fuel_consumption,
-    sum(statistic.bullet) AS bullet_consumption,
-    sum(statistic.steel) AS steel_consumption,
-    sum(statistic.bauxite) AS bauxite_consumption,
-    sum(statistic.bucket) AS bucket_consumption,
-    sum(statistic.ranking_point) AS ranking_point,
-    sum(statistic.s_rank) AS s_rank_count,
-    sum(statistic.a_rank) AS a_rank_count,
-    sum(statistic.b_rank) AS b_rank_count,
-    sum(statistic.failure_rank) AS failure_rank_count
-FROM (
-    SELECT 0 AS type, strftime('%s', 'now', 'localtime', 'start of day', 'utc') AS start, strftime('%s', 'now') AS end
-    UNION ALL
-    SELECT 1, strftime('%s', 'now', 'localtime', 'weekday 0', '-6 days', 'start of day', 'utc'), strftime('%s', 'now')
-    UNION ALL
-    SELECT 2, strftime('%s', 'now', 'localtime', 'start of month', 'utc'), strftime('%s', 'now')
-    UNION ALL
-    SELECT 3, strftime('%s', 'now', 'localtime', 'start of day', '-1 days', 'utc'), strftime('%s', 'now', 'localtime', 'start of day', 'utc')
-    UNION ALL
-    SELECT 4, strftime('%s', 'now', 'localtime', 'weekday 0', '-13 days', 'start of day', 'utc'), strftime('%s', 'now', 'localtime', 'weekday 0', '-6 days', 'start of day', 'utc')
-    UNION ALL
-    SELECT 5, strftime('%s', 'now', 'localtime', 'start of month', '-1 month', 'utc'), strftime('%s', 'now', 'localtime', 'start of month', 'utc')
-) timespan
-CROSS JOIN (SELECT DISTINCT map AS id, difficulty FROM sortie ORDER BY id, difficulty) sortie_map
-JOIN (
-    SELECT id, map, difficulty,
-        ifnull(sum(sortie_consumption_detail.fuel), 0) - ifnull(sortie_reward.fuel, 0) AS fuel,
-        ifnull(sum(sortie_consumption_detail.bullet), 0) - ifnull(sortie_reward.bullet, 0) AS bullet,
-        ifnull(sum(sortie_consumption_detail.steel), 0) - ifnull(sortie_reward.steel, 0) AS steel,
-        ifnull(sum(sortie_consumption_detail.bauxite), 0) - ifnull(sortie_reward.bauxite, 0) AS bauxite,
-        ifnull(sum(sortie_consumption_detail.bucket), 0) AS bucket,
-        ((SELECT experience FROM admiral_experience WHERE time = (SELECT min(time) FROM admiral_experience WHERE time >= sortie.return_time)) - (SELECT experience FROM admiral_experience WHERE time = (SELECT max(time) FROM admiral_experience WHERE time <= sortie.id))) * 7.0 / 10000 + ifnull((SELECT point FROM ranking_point_bonus WHERE sortie = sortie.id), 0) AS ranking_point,
-        s_rank, a_rank, b_rank, failure_rank
-    FROM sortie_consumption
-    JOIN sortie USING(id)
-    JOIN (
-        SELECT sortie_detail.id,
-            count(CASE WHEN rank = 5 THEN sortie_detail.id END) AS s_rank,
-            count(CASE WHEN rank = 4 THEN sortie_detail.id END) AS a_rank,
-            count(CASE WHEN rank = 3 THEN sortie_detail.id END) AS b_rank,
-            count(CASE WHEN rank NOT IN (3, 4, 5) THEN sortie_detail.id END) AS failure_rank
-        FROM sortie_detail
-        JOIN battle ON battle.id = sortie_detail.extra_info
-        GROUP BY sortie_detail.id
-    ) USING(id)
-    LEFT JOIN sortie_consumption_detail USING(id)
-    LEFT JOIN sortie_reward USING(id)
-    GROUP BY id
-    ORDER BY id DESC
-) statistic ON map = sortie_map.id AND statistic.difficulty IS sortie_map.difficulty AND statistic.id >= timespan.start AND statistic.id < timespan.end
-GROUP BY type, sortie_map.id, sortie_map.difficulty;";
+                rCommand.CommandText = "SELECT group_concat(DISTINCT map / 10) FROM sortie WHERE id >= strftime('%s', 'now', 'localtime', 'start of month', '-1 month', 'utc') AND map NOT IN (" + string.Join(", ", KanColleGame.Current.MasterInfo.Maps.Keys) + ");";
+                var rPastAreas = rCommand.ExecuteScalar();
+                if (rPastAreas != DBNull.Value)
+                    PastAreas = (string)rPastAreas;
 
-                using (var rReader = rCommand.ExecuteReader())
-                {
-                    var rData = new List<SortieStatisticData>(rReader.VisibleFieldCount);
+                var rAreas = KanColleGame.Current.MasterInfo.MapAreas.Values.Select(r => new SortieStatisticAreaViewModel(r) { IsSelectedChangedCallback = Load }).ToList();
+                if (PastAreas != null)
+                    rAreas.Add(new SortieStatisticAreaViewModel(null) { IsSelectedChangedCallback = Load });
+                Areas = rAreas.ToArray();
 
-                    while (rReader.Read())
-                        rData.Add(new SortieStatisticData(rReader));
-
-                    foreach (var rGroup in rData.GroupBy(r => r.Type))
-                        TimeSpans[(int)rGroup.Key].Update(rGroup);
-                }
+                rCommand.CommandText = "SELECT min(id) FROM sortie_consumption;";
+                CustomTimeSpan.MinDisplayDateStart = DateTimeUtil.FromUnixTime((long)rCommand.ExecuteScalar()).ToOffset(DateTimeOffset.Now.Offset).DateTime.Date;
             }
         }
 
-        SQLiteCommand CreateCommand() => RecordService.Instance.CreateCommand();
+        public void Load() => r_SelectedTimeSpan.Reload();
 
         protected override void DisposeManagedResources()
         {
diff --git a/HeavenlyWind/ViewModels/TabItemViewModel.cs b/HeavenlyWind/ViewModels/TabItemViewModel.cs
index 4aff62f1..84b100a0 100644
--- a/HeavenlyWind/ViewModels/TabItemViewModel.cs
+++ b/HeavenlyWind/ViewModels/TabItemViewModel.cs
@@ -3,5 +3,7 @@
     public abstract class TabItemViewModel : ModelBase
     {
         public abstract string Name { get; protected set; }
+
+        public virtual bool IsClosable => false;
     }
 }
diff --git a/HeavenlyWind/ViewModels/ToolViewModel.cs b/HeavenlyWind/ViewModels/ToolViewModel.cs
index d2b2ee96..93ad065c 100644
--- a/HeavenlyWind/ViewModels/ToolViewModel.cs
+++ b/HeavenlyWind/ViewModels/ToolViewModel.cs
@@ -3,7 +3,7 @@
 
 namespace Sakuno.KanColle.Amatsukaze.ViewModels
 {
-    public class ToolViewModel : TabItemViewModel
+    public abstract class ToolViewModel : TabItemViewModel
     {
         IToolPane r_Tool;
 
@@ -13,15 +13,29 @@ public override string Name
             protected set { }
         }
 
+        public override bool IsClosable => true;
+
         public object View => r_Tool.View;
 
-        public ICommand OpenCommand { get; }
+        public ICommand OpenCommand { get; internal set; }
 
-        internal ToolViewModel(IToolPane rpTool, ICommand rpOpenCommand)
+        internal ToolViewModel(IToolPane rpTool)
         {
             r_Tool = rpTool;
+        }
+    }
+
+    class ToolWithoutScrollBarViewModel : ToolViewModel
+    {
+        public ToolWithoutScrollBarViewModel(IToolPane rpTool) : base(rpTool) { }
+    }
+    class ToolWithScrollBarViewModel : ToolViewModel
+    {
+        public IToolPaneScrollBarVisibilities ScrollBarVisibilities { get; }
 
-            OpenCommand = rpOpenCommand;
+        internal ToolWithScrollBarViewModel(IToolPane rpTool, IToolPaneScrollBarVisibilities rpVisibilities) : base(rpTool)
+        {
+            ScrollBarVisibilities = rpVisibilities;
         }
     }
 }
diff --git a/HeavenlyWind/ViewModels/Tools/ScreenshotToolPreviewViewModel.cs b/HeavenlyWind/ViewModels/Tools/ScreenshotToolPreviewViewModel.cs
index fd7e2346..9d766b2e 100644
--- a/HeavenlyWind/ViewModels/Tools/ScreenshotToolPreviewViewModel.cs
+++ b/HeavenlyWind/ViewModels/Tools/ScreenshotToolPreviewViewModel.cs
@@ -17,9 +17,9 @@ public ScreenshotToolPreviewViewModel(OverviewScreenshotToolViewModel rpOwner)
         {
             Owner = rpOwner;
 
-            TakeScreenshotCommand = new DelegatedCommand(async () =>
+            TakeScreenshotCommand = new DelegatedCommand(() =>
             {
-                Screenshot = await ScreenshotService.Instance.TakePartialScreenshot(ScreenshotToolViewModel.Regions[Owner.Type]);
+                Screenshot = ScreenshotService.Instance.TakePartialScreenshot(ScreenshotToolViewModel.Regions[Owner.Type]);
                 OnPropertyChanged(nameof(Screenshot));
             });
         }
diff --git a/HeavenlyWind/ViewModels/ToolsViewModel.cs b/HeavenlyWind/ViewModels/ToolsViewModel.cs
index 9c254675..2186212c 100644
--- a/HeavenlyWind/ViewModels/ToolsViewModel.cs
+++ b/HeavenlyWind/ViewModels/ToolsViewModel.cs
@@ -1,8 +1,6 @@
-using Sakuno.KanColle.Amatsukaze.Services;
-using Sakuno.KanColle.Amatsukaze.ViewModels.Game;
-using Sakuno.KanColle.Amatsukaze.ViewModels.Tools;
+using Sakuno.KanColle.Amatsukaze.Extensibility;
+using Sakuno.KanColle.Amatsukaze.Services;
 using Sakuno.KanColle.Amatsukaze.Views;
-using Sakuno.KanColle.Amatsukaze.Views.Tools;
 using Sakuno.UserInterface;
 using System.Collections.Generic;
 using System.Linq;
@@ -21,11 +19,6 @@ protected set { }
 
         GameInformationViewModel r_Owner;
 
-        SessionToolViewModel r_SessionTool = new SessionToolViewModel();
-
-        public ICommand ShowSessionToolCommand { get; }
-        public ICommand ShowExpeditionOverviewCommand { get; }
-
         ICommand r_OpenToolPaneCommand;
         public IList<ToolViewModel> ToolPanes { get; }
 
@@ -33,15 +26,19 @@ public ToolsViewModel(GameInformationViewModel rpOwner)
         {
             r_Owner = rpOwner;
 
-            ShowSessionToolCommand = new DelegatedCommand(() => WindowService.Instance.Show<SessionToolWindow>(r_SessionTool));
-            ShowExpeditionOverviewCommand = new DelegatedCommand(() =>
+            r_OpenToolPaneCommand = new DelegatedCommand<ToolViewModel>(r_Owner.AddTabItem);
+            ToolPanes = PluginService.Instance.ToolPanes?.Select(r =>
             {
-                var rExpeditionOverview = r_Owner.TabItems.OfType<ExpeditionOverviewViewModel>().SingleOrDefault() ?? new ExpeditionOverviewViewModel();
-                r_Owner.AddTabItem(rExpeditionOverview);
-            });
+                ToolViewModel rResult;
 
-            r_OpenToolPaneCommand = new DelegatedCommand<ToolViewModel>(r_Owner.AddTabItem);
-            ToolPanes = PluginService.Instance.ToolPanes?.Select(r => new ToolViewModel(r, r_OpenToolPaneCommand)).ToList().AsReadOnly();
+                var rScrollBarVisibilities = r as IToolPaneScrollBarVisibilities;
+                if (rScrollBarVisibilities == null)
+                    rResult = new ToolWithoutScrollBarViewModel(r) { OpenCommand = r_OpenToolPaneCommand };
+                else
+                    rResult = new ToolWithScrollBarViewModel(r, rScrollBarVisibilities) { OpenCommand = r_OpenToolPaneCommand };
+
+                return rResult;
+            }).ToArray();
         }
     }
 }
diff --git a/HeavenlyWind/Views/BrowserNavigator.xaml b/HeavenlyWind/Views/BrowserNavigator.xaml
index eefb4499..d3b1ad62 100644
--- a/HeavenlyWind/Views/BrowserNavigator.xaml
+++ b/HeavenlyWind/Views/BrowserNavigator.xaml
@@ -46,11 +46,6 @@
                         <TextBlock Text="{rb:StringResource Main.Browser_Navigator_SetCookie}" />
                     </Button>
                 </ListBoxItem>
-                <ListBoxItem>
-                    <Button Command="{Binding ShowSessionToolCommand}">
-                        <TextBlock Text="{rb:StringResource Main.SessionTool_Title}" />
-                    </Button>
-                </ListBoxItem>
             </ListBox>
         </ruic:DropDownButton>
 
diff --git a/HeavenlyWind/Views/Game/Battle/EnemyEncounters.xaml b/HeavenlyWind/Views/Game/Battle/EnemyEncounters.xaml
index 52f08bcb..b923aee7 100644
--- a/HeavenlyWind/Views/Game/Battle/EnemyEncounters.xaml
+++ b/HeavenlyWind/Views/Game/Battle/EnemyEncounters.xaml
@@ -54,24 +54,31 @@
 
                             <Rectangle Fill="{DynamicResource HighlightBorderBrushKey}" Height="1" Grid.Row="1" Grid.ColumnSpan="2" />
 
-                            <ItemsControl ItemsSource="{Binding Formations}" Grid.Row="2" Grid.ColumnSpan="2">
-                                <ItemsControl.ItemsPanel>
-                                    <ItemsPanelTemplate>
-                                        <StackPanel Orientation="Horizontal" />
-                                    </ItemsPanelTemplate>
-                                </ItemsControl.ItemsPanel>
-                                <ItemsControl.ItemTemplate>
-                                    <DataTemplate>
-                                        <TextBlock Name="Formation" Text="{rb:EnumToStringResource ., Battle_Formation, StringFormat={} / {0}}" />
+                            <StackPanel Grid.Row="2" Grid.ColumnSpan="2">
+                                <ItemsControl ItemsSource="{Binding Formations}">
+                                    <ItemsControl.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <StackPanel Orientation="Horizontal" />
+                                        </ItemsPanelTemplate>
+                                    </ItemsControl.ItemsPanel>
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate>
+                                            <TextBlock Name="Formation" Text="{rb:EnumToStringResource ., Battle_Formation, StringFormat={} / {0}}" />
 
-                                        <DataTemplate.Triggers>
-                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource PreviousData}}" Value="{x:Null}">
-                                                <Setter TargetName="Formation" Property="Text" Value="{rb:EnumToStringResource ., Battle_Formation}" />
-                                            </DataTrigger>
-                                        </DataTemplate.Triggers>
-                                    </DataTemplate>
-                                </ItemsControl.ItemTemplate>
-                            </ItemsControl>
+                                            <DataTemplate.Triggers>
+                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource PreviousData}}" Value="{x:Null}">
+                                                    <Setter TargetName="Formation" Property="Text" Value="{rb:EnumToStringResource ., Battle_Formation}" />
+                                                </DataTrigger>
+                                            </DataTemplate.Triggers>
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                </ItemsControl>
+
+                                <TextBlock Margin="0, 4, 0, 0" Visibility="{rb:CollapsedIfZero FighterPower}">
+                                    <Run Text="{rb:StringResource Main.Fleet_FighterPower}" />:
+                                    <Run Text="{Binding FighterPower, Mode=OneWay}" />
+                                </TextBlock>
+                            </StackPanel>
                         </Grid>
                     </Border>
 
diff --git a/HeavenlyWind/Views/Game/Events/Battle.xaml b/HeavenlyWind/Views/Game/Events/Battle.xaml
index cb37b861..90b43779 100644
--- a/HeavenlyWind/Views/Game/Events/Battle.xaml
+++ b/HeavenlyWind/Views/Game/Events/Battle.xaml
@@ -8,6 +8,7 @@
              xmlns:ruic="clr-namespace:Sakuno.UserInterface.Controls;assembly=Sakuno.UserInterface"
              xmlns:rgme="clr-namespace:Sakuno.KanColle.Amatsukaze.Game.Models.Events;assembly=HeavenlyWind.Game"
              xmlns:rvgb="clr-namespace:Sakuno.KanColle.Amatsukaze.Views.Game.Battle"
+             xmlns:rvge="clr-namespace:Sakuno.KanColle.Amatsukaze.Views.Game.Events"
              mc:Ignorable="d"
              d:DataContext="{d:DesignInstance rgme:BattleEvent}"
              d:DesignWidth="300" d:DesignHeight="300">
@@ -100,6 +101,8 @@
                                 <TextBlock Text="{rb:StringResource Main.Sortie_LandBaseAerialSupport_Ready}" FontWeight="Bold" Visibility="{Binding IsLandBaseAerialSupportReady, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0, 4, 0, 0" HorizontalAlignment="Center" Grid.Row="3" Grid.ColumnSpan="7" />
                             </Grid>
 
+                            <rvge:EnemyAerialRaid x:Name="EnemyAerialRaid" DataContext="{Binding EnemyAerialRaid}" Visibility="{rb:CollapsedIfNull}" Margin="0, 4, 0, 0" DockPanel.Dock="Top" />
+
                             <rvgb:EnemyEncounters x:Name="EnemyEncounters" Margin="0, 8, 0, 0" />
                         </DockPanel>
 
@@ -107,6 +110,7 @@
                             <DataTrigger Binding="{rb:CurrentDock Converter={StaticResource DockToOrientationConverter}}" Value="Vertical">
                                 <Setter TargetName="Grid" Property="DockPanel.Dock" Value="Left" />
                                 <Setter TargetName="EnemyEncounters" Property="Margin" Value="8, 0, 0, 0" />
+                                <Setter TargetName="EnemyAerialRaid" Property="Visibility" Value="Collapsed" />
                             </DataTrigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
diff --git a/HeavenlyWind/Views/Game/Events/EnemyAerialRaid.xaml b/HeavenlyWind/Views/Game/Events/EnemyAerialRaid.xaml
new file mode 100644
index 00000000..b5d6668f
--- /dev/null
+++ b/HeavenlyWind/Views/Game/Events/EnemyAerialRaid.xaml
@@ -0,0 +1,37 @@
+<UserControl x:Class="Sakuno.KanColle.Amatsukaze.Views.Game.Events.EnemyAerialRaid"
+             x:ClassModifier="internal"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:rb="clr-namespace:Sakuno.KanColle.Amatsukaze;assembly=HeavenlyWind.Base"
+             xmlns:rc="clr-namespace:Sakuno.KanColle.Amatsukaze.Controls"
+             xmlns:ruic="clr-namespace:Sakuno.UserInterface.Controls;assembly=Sakuno.UserInterface"
+             mc:Ignorable="d"
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Control Visibility="{rb:CollapsedIfNull}">
+        <Control.Style>
+            <Style TargetType="{x:Type Control}">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type Control}">
+                            <Border BorderBrush="{DynamicResource HighlightBorderBrushKey}" BorderThickness="1" Margin="0, 8, 0, 0" Padding="4" HorizontalAlignment="Left" MinWidth="200" Grid.Row="3">
+                                <StackPanel>
+                                    <TextBlock Text="{rb:StringResource Main.Sortie_EnemyAerialRaid}" FontWeight="Bold" TextAlignment="Center" />
+
+                                    <ruic:BBCodeBlock x:Name="Message" BBCode="{rb:StringResource Main.Sortie_EnemyAerialRaid_Message}" TextAlignment="Center" Margin="4, 2" />
+                                </StackPanel>
+                            </Border>
+
+                            <ControlTemplate.Triggers>
+                                <DataTrigger Binding="{Binding Amount}" Value="0">
+                                    <Setter TargetName="Message" Property="BBCode" Value="{rb:StringResource Main.Sortie_EnemyAerialRaid_Message_NoDamage}" />
+                                </DataTrigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+        </Control.Style>
+    </Control>
+</UserControl>
diff --git a/HeavenlyWind/Views/Game/Events/EnemyAerialRaid.xaml.cs b/HeavenlyWind/Views/Game/Events/EnemyAerialRaid.xaml.cs
new file mode 100644
index 00000000..d6f9d36e
--- /dev/null
+++ b/HeavenlyWind/Views/Game/Events/EnemyAerialRaid.xaml.cs
@@ -0,0 +1,13 @@
+namespace Sakuno.KanColle.Amatsukaze.Views.Game.Events
+{
+    /// <summary>
+    /// EnemyAerialRaid.xaml の相互作用ロジック
+    /// </summary>
+    partial class EnemyAerialRaid
+    {
+        public EnemyAerialRaid()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/HeavenlyWind/Views/Game/ExpeditionOverview.xaml b/HeavenlyWind/Views/Game/ExpeditionOverview.xaml
deleted file mode 100644
index ce99d654..00000000
--- a/HeavenlyWind/Views/Game/ExpeditionOverview.xaml
+++ /dev/null
@@ -1,123 +0,0 @@
-<UserControl x:Class="Sakuno.KanColle.Amatsukaze.Views.Game.ExpeditionOverview"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:rb="clr-namespace:Sakuno.KanColle.Amatsukaze;assembly=HeavenlyWind.Base"
-             xmlns:rc="clr-namespace:Sakuno.KanColle.Amatsukaze.Controls"
-             mc:Ignorable="d"
-             d:DesignWidth="300" d:DesignHeight="300">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/HeavenlyWind;component/Styles/Icons/Cross.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/HeavenlyWind;component/Styles/Icons/Tick.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
-    <ScrollViewer PanningMode="VerticalOnly">
-        <ItemsControl ItemsSource="{Binding MapAreas}" Grid.IsSharedSizeScope="True">
-            <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                    <Expander IsExpanded="True">
-                        <Expander.Header>
-                            <TextBlock Text="{rb:ExtraStringResource Area, MapArea.ID, MapArea.Name}" Margin="4, 2" />
-                        </Expander.Header>
-
-                        <ItemsControl ItemsSource="{Binding Expeditions}">
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate>
-                                    <Grid Margin="2">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition SharedSizeGroup="ID" />
-                                            <ColumnDefinition Width="2" />
-                                            <ColumnDefinition SharedSizeGroup="Name" />
-                                            <ColumnDefinition Width="8" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition />
-                                        </Grid.ColumnDefinitions>
-
-                                        <TextBlock Text="{Binding Info.ID}" />
-                                        <TextBlock Text="{rb:ExtraStringResource Expedition, Info.ID, Info.Name}" Grid.Column="2" />
-                                        <Border Background="Transparent" Margin="4, 2" Grid.ColumnSpan="4">
-                                            <Border.ToolTip>
-                                                <ToolTip>
-                                                    <StackPanel>
-                                                        <TextBlock>
-                                                            <Run Text="{rb:StringResource Main.ExpeditionOverview_Time}" />
-                                                            <Run Text="{Binding TimeString, Mode=OneWay}" />
-                                                        </TextBlock>
-
-                                                        <TextBlock Text="{rb:StringResource Main.ExpeditionOverview_Consumption}" Margin="0, 4, 0, 0" />
-                                                        <StackPanel DataContext="{Binding Info}" Orientation="Horizontal" Margin="0, 2, 0, 0">
-                                                            <rc:MaterialIcon Type="Fuel" Margin="2" Visibility="{rb:CollapsedIfZero FuelConsumption}" />
-                                                            <TextBlock Text="{Binding FuelConsumption, StringFormat={}{0:P0}}" Margin="4, 2" Visibility="{rb:CollapsedIfZero FuelConsumption}" />
-
-                                                            <rc:MaterialIcon Type="Bullet" Margin="2" Visibility="{rb:CollapsedIfZero BulletConsumption}" />
-                                                            <TextBlock Text="{Binding BulletConsumption, StringFormat={}{0:P0}}" Margin="4, 2" Visibility="{rb:CollapsedIfZero BulletConsumption}" />
-                                                        </StackPanel>
-
-                                                        <TextBlock Text="{rb:StringResource Main.ExpeditionOverview_Rewards}" Margin="0, 4, 0, 0" />
-                                                        <StackPanel DataContext="{Binding RewardResources}" Orientation="Horizontal" Margin="0, 2, 0, 0">
-                                                            <rc:MaterialIcon Type="Fuel" Margin="2" Visibility="{rb:CollapsedIfZero Fuel}" />
-                                                            <TextBlock Text="{Binding Fuel}" Margin="4, 2" Visibility="{rb:CollapsedIfZero Fuel}" />
-
-                                                            <rc:MaterialIcon Type="Bullet" Margin="2" Visibility="{rb:CollapsedIfZero Bullet}" />
-                                                            <TextBlock Text="{Binding Bullet}" Margin="4, 2" Visibility="{rb:CollapsedIfZero Bullet}" />
-
-                                                            <rc:MaterialIcon Type="Steel" Margin="2" Visibility="{rb:CollapsedIfZero Steel}" />
-                                                            <TextBlock Text="{Binding Steel}" Margin="4, 2" Visibility="{rb:CollapsedIfZero Steel}" />
-
-                                                            <rc:MaterialIcon Type="Bauxite" Margin="2" Visibility="{rb:CollapsedIfZero Bauxite}" />
-                                                            <TextBlock Text="{Binding Bauxite}" Margin="4, 2" Visibility="{rb:CollapsedIfZero Bauxite}" />
-                                                        </StackPanel>
-
-                                                        <TextBlock DataContext="{Binding RewardItem1}" Visibility="{rb:CollapsedIfNull}">
-                                                            <Run Text="{Binding Item1.Name, Mode=OneWay}" />
-                                                            0~<Run Text="{Binding Item2, Mode=OneWay}" />
-                                                        </TextBlock>
-                                                        <TextBlock DataContext="{Binding RewardItem2}" Visibility="{rb:CollapsedIfNull}">
-                                                            <Run Text="{Binding Item1.Name, Mode=OneWay}" />
-                                                            0~<Run Text="{Binding Item2, Mode=OneWay}" />
-                                                            <Run Text="{rb:StringResource Main.ExpeditionOverview_Rewards_GreatSuccessOnly}" FontWeight="Bold" />
-                                                        </TextBlock>
-                                                    </StackPanel>
-                                                </ToolTip>
-                                            </Border.ToolTip>
-                                        </Border>
-
-                                        <ItemsControl ItemsSource="{Binding ResultPrediction}" Grid.Column="4">
-                                            <ItemsControl.ItemsPanel>
-                                                <ItemsPanelTemplate>
-                                                    <StackPanel Orientation="Horizontal" />
-                                                </ItemsPanelTemplate>
-                                            </ItemsControl.ItemsPanel>
-                                            <ItemsControl.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Border Name="Border" Background="Transparent" Margin="4, 0" Padding="4, 2">
-                                                        <StackPanel Orientation="Horizontal">
-                                                            <TextBlock Text="{Binding ID}" />
-                                                            <Path Name="Result" Data="{StaticResource CrossPathData}" Fill="{DynamicResource ForegroundBrushKey}" Stretch="Uniform" Width="14" Height="14" Margin="4, 0, 0, 0" />
-                                                        </StackPanel>
-                                                    </Border>
-
-                                                    <DataTemplate.Triggers>
-                                                        <DataTrigger Binding="{Binding Success}" Value="True">
-                                                            <Setter TargetName="Border" Property="Background" Value="Green" />
-                                                            <Setter TargetName="Result" Property="Data" Value="{StaticResource TickPathData}" />
-                                                        </DataTrigger>
-                                                    </DataTemplate.Triggers>
-                                                </DataTemplate>
-                                            </ItemsControl.ItemTemplate>
-                                        </ItemsControl>
-                                    </Grid>
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
-                        </ItemsControl>
-                    </Expander>
-                </DataTemplate>
-            </ItemsControl.ItemTemplate>
-        </ItemsControl>
-    </ScrollViewer>
-</UserControl>
diff --git a/HeavenlyWind/Views/Game/ExpeditionOverview.xaml.cs b/HeavenlyWind/Views/Game/ExpeditionOverview.xaml.cs
deleted file mode 100644
index a2e9d6de..00000000
--- a/HeavenlyWind/Views/Game/ExpeditionOverview.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Windows.Controls;
-
-namespace Sakuno.KanColle.Amatsukaze.Views.Game
-{
-    /// <summary>
-    /// ExpeditionOverview.xaml の相互作用ロジック
-    /// </summary>
-    public partial class ExpeditionOverview : UserControl
-    {
-        public ExpeditionOverview()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/HeavenlyWind/Views/Game/Headquarter.xaml b/HeavenlyWind/Views/Game/Headquarter.xaml
index 2becb880..20760c5f 100644
--- a/HeavenlyWind/Views/Game/Headquarter.xaml
+++ b/HeavenlyWind/Views/Game/Headquarter.xaml
@@ -32,11 +32,21 @@
             <TextBlock Text="{Binding Name}" Margin="0, 0, 8, 0" />
 
             <TextBlock Grid.Column="1">
+                <TextBlock.Resources>
+                    <Style x:Key="ExperienceToNextLevel" TargetType="{x:Type Run}">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding ExperienceToNextLevel}" Value="0">
+                                <Setter Property="Text" Value="" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Resources>
+
                 <Run Text="Lv." Foreground="{DynamicResource ForegroundBrushKey}" FontSize="12" />
                 <Run Text="{Binding Level, Mode=OneWay}" />
                 [<Run Text="{rb:EnumToStringResource Rank, Overview_Admiral_Rank}" />]
-                <Run Text="Next:" Foreground="{DynamicResource ForegroundBrushKey}" FontSize="12" />
-                <Run Text="{Binding ExperienceToNextLevel, Mode=OneWay}" />
+                <Run Style="{StaticResource ExperienceToNextLevel}" Text="Next:" Foreground="{DynamicResource ForegroundBrushKey}" FontSize="12" />
+                <Run Style="{StaticResource ExperienceToNextLevel}" Text="{Binding ExperienceToNextLevel, Mode=OneWay}" />
             </TextBlock>
             <Rectangle Fill="Transparent" Grid.Column="1">
                 <Rectangle.ToolTip>
diff --git a/HeavenlyWind/Views/Game/Overview.xaml b/HeavenlyWind/Views/Game/Overview.xaml
index 5d42bd2a..a97acec9 100644
--- a/HeavenlyWind/Views/Game/Overview.xaml
+++ b/HeavenlyWind/Views/Game/Overview.xaml
@@ -67,13 +67,33 @@
                                     <rvg:ActiveQuestsOverview />
                                 </Border>
 
-                                <rvg:DockOverview Margin="0, 8, 0, 0" Grid.Column="2" Grid.Row="2" />
-
-                                <Border Style="{StaticResource PanelBorderStyle}" Margin="0, 8, 0, 0" Grid.Column="2" Grid.Row="3">
-                                    <rvg:FleetOverview />
-                                </Border>
+                                <ContentControl Name="Overview1" Margin="0, 8, 0, 0" Grid.Column="2" Grid.Row="2">
+                                    <rvg:DockOverview />
+                                </ContentControl>
+                                <ContentControl Name="Overview2" Margin="0, 8, 0, 0" Grid.Column="2" Grid.Row="3">
+                                    <Border Style="{StaticResource PanelBorderStyle}">
+                                        <rvg:FleetOverview />
+                                    </Border>
+                                </ContentControl>
                             </Grid>
                         </ScrollViewer>
+
+                        <ControlTemplate.Triggers>
+                            <DataTrigger Binding="{rb:Preference UI.SwapPositionOfRepairDocksAndFleetOverviews}" Value="True">
+                                <Setter TargetName="Overview1" Property="Content">
+                                    <Setter.Value>
+                                        <Border Style="{StaticResource PanelBorderStyle}">
+                                            <rvg:FleetOverview />
+                                        </Border>
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="Overview2" Property="Content">
+                                    <Setter.Value>
+                                        <rvg:DockOverview />
+                                    </Setter.Value>
+                                </Setter>
+                            </DataTrigger>
+                        </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
@@ -117,11 +137,14 @@
                                         </StackPanel>
 
                                         <StackPanel Grid.Column="2">
-                                            <rvg:DockOverview />
-
-                                            <Border Style="{StaticResource PanelBorderStyle}" Margin="0, 8, 0, 0">
-                                                <rvg:FleetOverview />
-                                            </Border>
+                                            <ContentControl Name="Overview1">
+                                                <rvg:DockOverview />
+                                            </ContentControl>
+                                            <ContentControl Name="Overview2" Margin="0, 8, 0, 0">
+                                                <Border Style="{StaticResource PanelBorderStyle}">
+                                                    <rvg:FleetOverview />
+                                                </Border>
+                                            </ContentControl>
 
                                             <Border Style="{StaticResource PanelBorderStyle}" Margin="0, 8, 0, 0">
                                                 <rvg:ActiveQuestsOverview />
@@ -129,6 +152,23 @@
                                         </StackPanel>
                                     </Grid>
                                 </ScrollViewer>
+
+                                <ControlTemplate.Triggers>
+                                    <DataTrigger Binding="{rb:Preference UI.SwapPositionOfRepairDocksAndFleetOverviews}" Value="True">
+                                        <Setter TargetName="Overview1" Property="Content">
+                                            <Setter.Value>
+                                                <Border Style="{StaticResource PanelBorderStyle}">
+                                                    <rvg:FleetOverview />
+                                                </Border>
+                                            </Setter.Value>
+                                        </Setter>
+                                        <Setter TargetName="Overview2" Property="Content">
+                                            <Setter.Value>
+                                                <rvg:DockOverview />
+                                            </Setter.Value>
+                                        </Setter>
+                                    </DataTrigger>
+                                </ControlTemplate.Triggers>
                             </ControlTemplate>
                         </Setter.Value>
                     </Setter>
diff --git a/HeavenlyWind/Views/Game/Sortie.xaml b/HeavenlyWind/Views/Game/Sortie.xaml
index 4ffd0746..f6996cdc 100644
--- a/HeavenlyWind/Views/Game/Sortie.xaml
+++ b/HeavenlyWind/Views/Game/Sortie.xaml
@@ -50,6 +50,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="8" />
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
             <RowDefinition />
         </Grid.RowDefinitions>
 
@@ -124,5 +125,7 @@
                 </DataTemplate>
             </ContentControl.Resources>
         </ContentControl>
+
+        <rvge:EnemyAerialRaid DataContext="{Binding Node.EnemyAerialRaid}" Grid.Row="3" />
     </Grid>
 </UserControl>
diff --git a/HeavenlyWind/Views/GameController.xaml b/HeavenlyWind/Views/GameController.xaml
index 92c9053f..31294567 100644
--- a/HeavenlyWind/Views/GameController.xaml
+++ b/HeavenlyWind/Views/GameController.xaml
@@ -85,50 +85,25 @@
             </Border>
         </ruic:SplitButton>
 
-        <ToggleButton IsChecked="{Binding Topmost, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Height="30" Margin="5, 0, 0, 0">
-            <Path Stretch="Uniform" Fill="{DynamicResource ActiveForegroundBrushKey}" HorizontalAlignment="Center" Data="M71.048203,0 L93.770935,10.424871 152.85001,37.529528 171.02817,45.869425 230.10727,72.974085 252.82999,83.398958 238.23517,115.21076 215.51245,104.78589 187.73206,165.33783 188.45349,168.04767 C193.10251,186.74838 194.03778,207.59044 190.93973,229.09215 L190.71091,230.57726 104.44453,190.99945 45.929749,318.5421 27.751572,310.2022 86.266357,182.65956 0,143.08176 0.97650146,141.93968 C15.254585,125.5672 31.663315,112.68233 48.871078,104.00919 L51.395721,102.78861 79.176117,42.236681 56.453384,31.811808 z" />
-        </ToggleButton>
-
         <ruic:DropDownButton PopupAutoClose="False" ShowDropDownMarker="False" Height="30" Margin="5, 0, 0, 0" Padding="4">
             <ruic:DropDownButton.Header>
                 <StackPanel Orientation="Horizontal">
                     <Path Style="{StaticResource GameButtonIcon}" Data="M104.46785,22.852232 C98.738756,22.860838 93.051485,23.239569 89.537455,23.985228 64.855799,29.222551 44.877947,43.622969 33.093569,64.671064 8.7868118,108.08537 28.577024,162.78128 75.283785,181.27579 83.806391,184.65048 98.63254,187.23462 106.28639,186.67941 107.76689,186.57202 111.07167,186.32878 113.63036,186.13887 119.41904,185.70924 128.71668,183.39836 135.24393,180.76692 161.5575,170.15875 180.58289,146.56703 185.57587,118.35472 186.8262,111.28984 186.80742,98.51428&#xD;&#xA;185.53571,91.035421 179.81395,57.386 153.63187,30.723513 119.64923,23.940023 115.96788,23.205164 110.19695,22.843634 104.46785,22.852232 z M100.7017,0.50330734 C102.84497,0.4895916 105.17205,0.51896477 107.76052,0.58345222 125.93491,1.0362282 135.7722,3.4267998 151.44875,11.200174 180.57292,25.641699 201.03769,52.462049 207.40022,84.52812 209.96155,97.43672 209.66319,115.03569 206.66117,128.12237 203.42534,142.22825 195.71623,158.63843 187.74376,168.39136 185.63161,170.9752 185.63161,170.9752 197.85083,183.19208 210.07006,195.40893 210.07006,195.40893 213.01277,193.91765 216.38539,192.20851 219.59934,192.02144&#xD;&#xA;222.80052,193.34791 224.34493,193.98787 236.40251,205.63809 262.26097,231.47519 297.40871,266.59387 299.49748,268.79901 299.49748,270.78601 299.49748,272.73248 298.49419,273.89364 286.18315,286.19555 272.86885,299.5 272.86885,299.5 269.57259,299.5 266.27635,299.5 266.27635,299.5 229.41904,262.56259 199.63605,232.71484 192.41959,225.17882 191.82105,223.29967 190.84711,220.24183 191.43077,215.59724 193.08006,213.28102 194.38585,211.44725&#xD;&#xA;194.38585,211.44725 182.18903,199.23881 175.48078,192.52418 169.71622,187.13611 169.37889,187.26533 169.04157,187.39454 166.69141,188.9884 164.15633,190.80725 155.4614,197.04556 141.80219,203.23869 130.32115,206.14819 116.70577,209.59859 98.082247,210.10565 84.471163,207.39657 58.185205,202.16478 34.986361,187.16664 19.216692,165.20933 14.505785,158.64998 7.703352,145.12176 5.1901493,137.31431 1.6701889,126.3793 0.90057564,121.44359 0.57668114,107.72713&#xD;&#xA;0.24999809,93.892408 0.90468407,87.539709 3.7551594,76.885122 13.09421,41.977285 41.974752,13.096739 76.882593,3.7576866 85.578432,1.4312458 91.414232,0.5627327 100.7017,0.50330734 z" />
-                    <TextBlock Text="{Binding Zoom, StringFormat=P0}" FontSize="14" Margin="2, 0, 0, 0" VerticalAlignment="Center" />
+                    <TextBlock Text="{rb:Preference Browser.Zoom, StringFormat=P0}" FontSize="14" Margin="2, 0, 0, 0" VerticalAlignment="Center" />
                 </StackPanel>
             </ruic:DropDownButton.Header>
 
             <StackPanel>
-                <StackPanel.Resources>
-                    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-                        <Setter Property="Background" Value="Transparent" />
-
-                        <Setter Property="Template">
-                            <Setter.Value>
-                                <ControlTemplate TargetType="{x:Type Button}">
-                                    <Border Background="{TemplateBinding Background}" Padding="16, 8">
-                                        <ContentPresenter />
-                                    </Border>
-
-                                    <ControlTemplate.Triggers>
-                                        <Trigger Property="IsMouseOver" Value="True">
-                                            <Setter Property="Background" Value="{DynamicResource ActiveBackgroundBrushKey}" />
-                                        </Trigger>
-                                    </ControlTemplate.Triggers>
-                                </ControlTemplate>
-                            </Setter.Value>
-                        </Setter>
-                    </Style>
-                </StackPanel.Resources>
-
                 <ListBox Style="{StaticResource MenuListBoxStyle}" ItemsSource="{Binding ZoomFactors}" MinWidth="120">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
-                            <Button Command="{Binding Command}" CommandParameter="{Binding Zoom}">
+                            <Button Name="Button" Command="{Binding Command}" CommandParameter="{Binding Zoom}">
                                 <TextBlock Name="Zoom" Text="{Binding Zoom, StringFormat=P0}" />
                             </Button>
 
                             <DataTemplate.Triggers>
                                 <DataTrigger Binding="{Binding IsSelected}" Value="True">
+                                    <Setter TargetName="Button" Property="Background" Value="{DynamicResource AccentBrushKey}" />
                                     <Setter TargetName="Zoom" Property="FontWeight" Value="Bold" />
                                 </DataTrigger>
                             </DataTemplate.Triggers>
@@ -138,10 +113,10 @@
 
                 <Rectangle Fill="{DynamicResource HighlightBorderBrushKey}" Height="1" Margin="2" />
 
-                <Button Command="{Binding ZoomInCommand}">
+                <Button Style="{StaticResource MenuListBoxButtonStyle}" Command="{Binding ZoomInCommand}">
                     <TextBlock Text="{rb:StringResource Main.Browser_Zoom_ZoomIn}" />
                 </Button>
-                <Button Command="{Binding ZoomOutCommand}">
+                <Button Style="{StaticResource MenuListBoxButtonStyle}" Command="{Binding ZoomOutCommand}">
                     <TextBlock Text="{rb:StringResource Main.Browser_Zoom_ZoomOut}" />
                 </Button>
             </StackPanel>
diff --git a/HeavenlyWind/Views/GameInformation.xaml b/HeavenlyWind/Views/GameInformation.xaml
index b1f5e20a..5bfeebca 100644
--- a/HeavenlyWind/Views/GameInformation.xaml
+++ b/HeavenlyWind/Views/GameInformation.xaml
@@ -19,11 +19,5 @@
         </Style>
     </UserControl.Resources>
 
-    <ruic:AdvancedTabControl ItemsSource="{Binding TabItems}" TabController="{StaticResource TabController}" SelectedValue="{Binding SelectedItem}" ContentTemplateSelector="{StaticResource TabContentTemplateSelector}" ConsolidateOrphanedItems="True" LockLayout="{rb:Preference UI.LockTabs}" OrphanedItemFilterCallback="{Binding OrphanedItemFilter}">
-        <ruic:AdvancedTabControl.ItemTemplate>
-            <DataTemplate>
-                <TextBlock Text="{Binding Name}" FontSize="14" />
-            </DataTemplate>
-        </ruic:AdvancedTabControl.ItemTemplate>
-    </ruic:AdvancedTabControl>
+    <ruic:AdvancedTabControl ItemsSource="{Binding TabItems}" TabController="{StaticResource TabController}" SelectedValue="{Binding SelectedItem}" ContentTemplateSelector="{StaticResource TabContentTemplateSelector}" ConsolidateOrphanedItems="True" LockLayout="{rb:Preference UI.LockTabs}" OrphanedItemFilterCallback="{Binding OrphanedItemFilter}" />
 </UserControl>
diff --git a/HeavenlyWind/Views/History/ResourceHistoryWindow.xaml b/HeavenlyWind/Views/History/ResourceHistoryWindow.xaml
index ebeb0b8d..df286bd6 100644
--- a/HeavenlyWind/Views/History/ResourceHistoryWindow.xaml
+++ b/HeavenlyWind/Views/History/ResourceHistoryWindow.xaml
@@ -12,6 +12,19 @@
                   Width="1024" Height="600"
                   FontSize="14"
                   UseLayoutRounding="True">
+    <ruic:MetroWindow.Resources>
+        <Style x:Key="MaterialDifferenceStyle" TargetType="{x:Type Run}">
+            <Setter Property="Text" Value="{Binding StringFormat=(↑0);(↓0);#, Mode=OneWay}" />
+            <Setter Property="FontSize" Value="10" />
+
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding Converter={StaticResource IsGreaterThanConverter}, ConverterParameter=0}" Value="True">
+                    <Setter Property="Foreground" Value="Yellow" />
+                </DataTrigger>
+            </Style.Triggers>
+        </Style>
+    </ruic:MetroWindow.Resources>
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -27,12 +40,39 @@
             <TextBlock Style="{StaticResource TitleTextBlockStyle}" Text="{rb:StringResource Main.Window_ResourceHistory}" />
         </DockPanel>
 
-        <DockPanel Margin="8, 0, 8, 8" Grid.Row="1">
-            <Button Command="{Binding ExportAsCsvFileCommand}" Margin="0, 0, 0, 8" HorizontalAlignment="Left" DockPanel.Dock="Top">
-                <TextBlock Text="{rb:StringResource Main.Export_CSV}" />
-            </Button>
-
-            <ListView ItemsSource="{Binding Records}">
+        <Grid Margin="8, 0, 8, 8" Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="8" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <DockPanel>
+                <Button Command="{Binding ExportAsCsvFileCommand}" HorizontalAlignment="Left" DockPanel.Dock="Right">
+                    <TextBlock Text="{rb:StringResource Main.Export_CSV}" />
+                </Button>
+
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock>
+                        <Run Text="{rb:StringResource Main.Record_Time, Mode=OneWay}" />:
+                    </TextBlock>
+
+                    <ListBox ItemsSource="{Binding Types}" SelectedValue="{Binding SelectedType}" Margin="4, 0, 0, 0">
+                        <ListBox.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Orientation="Horizontal" />
+                            </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{rb:EnumToStringResource Type, ResourceHistory_Type}" />
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+                </StackPanel>
+            </DockPanel>
+
+            <ListView ItemsSource="{Binding Records}" Grid.Row="2">
                 <ListView.View>
                     <GridView>
                         <GridViewColumn Width="150">
@@ -45,98 +85,98 @@
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
 
-                        <GridViewColumn Width="100">
-                            <TextBlock Text="{rb:StringResource Main.Material_Fuel}" />
+                        <GridViewColumn Width="120">
+                            <rc:MaterialIcon Type="Fuel" />
 
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock Margin="0, 4">
 	                                    <Run Text="{Binding Fuel, Mode=OneWay}" Foreground="{DynamicResource ActiveForegroundBrushKey}" />
-	                                    <Run Text="{Binding FuelDifference, StringFormat=(+0);(-0);#, Mode=OneWay}" FontSize="10" />
+	                                    <Run DataContext="{Binding FuelDifference}" Style="{StaticResource MaterialDifferenceStyle}" />
                                     </TextBlock>
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
-                        <GridViewColumn Width="100">
-                            <TextBlock Text="{rb:StringResource Main.Material_Bullet}" />
+                        <GridViewColumn Width="120">
+                            <rc:MaterialIcon Type="Bullet" />
 
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock Margin="0, 4">
 	                                    <Run Text="{Binding Bullet, Mode=OneWay}" Foreground="{DynamicResource ActiveForegroundBrushKey}" />
-	                                    <Run Text="{Binding BulletDifference, StringFormat=(+0);(-0);#, Mode=OneWay}" FontSize="10" />
+	                                    <Run DataContext="{Binding BulletDifference}" Style="{StaticResource MaterialDifferenceStyle}" />
                                     </TextBlock>
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
-                        <GridViewColumn Width="100">
-                            <TextBlock Text="{rb:StringResource Main.Material_Steel}" />
+                        <GridViewColumn Width="120">
+                            <rc:MaterialIcon Type="Steel" />
 
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock Margin="0, 4">
 	                                    <Run Text="{Binding Steel, Mode=OneWay}" Foreground="{DynamicResource ActiveForegroundBrushKey}" />
-	                                    <Run Text="{Binding SteelDifference, StringFormat=(+0);(-0);#, Mode=OneWay}" FontSize="10" />
+	                                    <Run DataContext="{Binding SteelDifference}" Style="{StaticResource MaterialDifferenceStyle}" />
                                     </TextBlock>
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
-                        <GridViewColumn Width="100">
-                            <TextBlock Text="{rb:StringResource Main.Material_Bauxite}" />
+                        <GridViewColumn Width="120">
+                            <rc:MaterialIcon Type="Bauxite" />
 
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock Margin="0, 4">
 	                                    <Run Text="{Binding Bauxite, Mode=OneWay}" Foreground="{DynamicResource ActiveForegroundBrushKey}" />
-	                                    <Run Text="{Binding BauxiteDifference, StringFormat=(+0);(-0);#, Mode=OneWay}" FontSize="10" />
+	                                    <Run DataContext="{Binding BauxiteDifference}" Style="{StaticResource MaterialDifferenceStyle}" />
                                     </TextBlock>
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
-                        <GridViewColumn Width="80">
-                            <TextBlock Text="{rb:StringResource Main.Material_InstantConstruction}" />
+                        <GridViewColumn Width="85">
+                            <rc:MaterialIcon Type="InstantConstruction" />
 
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock Margin="0, 4">
 	                                    <Run Text="{Binding InstantConstruction, Mode=OneWay}" Foreground="{DynamicResource ActiveForegroundBrushKey}" />
-	                                    <Run Text="{Binding InstantConstructionDifference, StringFormat=(+0);(-0);#, Mode=OneWay}" FontSize="10" />
+	                                    <Run DataContext="{Binding InstantConstructionDifference}" Style="{StaticResource MaterialDifferenceStyle}" />
                                     </TextBlock>
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
-                        <GridViewColumn Width="80">
-                            <TextBlock Text="{rb:StringResource Main.Material_Bucket}" />
+                        <GridViewColumn Width="85">
+                            <rc:MaterialIcon Type="Bucket" />
 
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock Margin="0, 4">
 	                                    <Run Text="{Binding Bucket, Mode=OneWay}" Foreground="{DynamicResource ActiveForegroundBrushKey}" />
-	                                    <Run Text="{Binding BucketDifference, StringFormat=(+0);(-0);#, Mode=OneWay}" FontSize="10" />
+	                                    <Run DataContext="{Binding BucketDifference}" Style="{StaticResource MaterialDifferenceStyle}" />
                                     </TextBlock>
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
-                        <GridViewColumn Width="80">
-                            <TextBlock Text="{rb:StringResource Main.Material_DevelopmentMaterial}" />
+                        <GridViewColumn Width="85">
+                            <rc:MaterialIcon Type="DevelopmentMaterial" />
 
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock Margin="0, 4">
 	                                    <Run Text="{Binding DevelopmentMaterial, Mode=OneWay}" Foreground="{DynamicResource ActiveForegroundBrushKey}" />
-	                                    <Run Text="{Binding DevelopmentMaterialDifference, StringFormat=(+0);(-0);#, Mode=OneWay}" FontSize="10" />
+	                                    <Run DataContext="{Binding DevelopmentMaterialDifference}" Style="{StaticResource MaterialDifferenceStyle}" />
                                     </TextBlock>
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
-                        <GridViewColumn Width="80">
-                            <TextBlock Text="{rb:StringResource Main.Material_ImprovementMaterial}" />
+                        <GridViewColumn Width="85">
+                            <rc:MaterialIcon Type="ImprovementMaterial" />
 
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock Margin="0, 4">
 	                                    <Run Text="{Binding ImprovementMaterial, Mode=OneWay}" Foreground="{DynamicResource ActiveForegroundBrushKey}" />
-	                                    <Run Text="{Binding ImprovementMaterialDifference, StringFormat=(+0);(-0);#, Mode=OneWay}" FontSize="10" />
+	                                    <Run DataContext="{Binding ImprovementMaterialDifference}" Style="{StaticResource MaterialDifferenceStyle}" />
                                     </TextBlock>
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
@@ -144,7 +184,7 @@
                     </GridView>
                 </ListView.View>
             </ListView>
-        </DockPanel>
+        </Grid>
     </Grid>
 
 </ruic:MetroWindow>
diff --git a/HeavenlyWind/Views/InitializationPage.xaml b/HeavenlyWind/Views/InitializationPage.xaml
index a8504613..44b9f1a6 100644
--- a/HeavenlyWind/Views/InitializationPage.xaml
+++ b/HeavenlyWind/Views/InitializationPage.xaml
@@ -57,6 +57,30 @@
                                     </StackPanel>
                                 </Border>
 
+                                <Border BorderBrush="{DynamicResource HighlightBorderBrushKey}" BorderThickness="0, 1, 0, 0" Margin="0, 8, 0, 0" Padding="0, 4, 0, 0" Visibility="{Binding IsConnectionCycle, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                    <StackPanel>
+                                        <TextBlock Text="{rb:StringResource Main.InitializationPage_ConnectionCycle}" FontSize="16" FontWeight="Bold" />
+                                        <TextBlock Text="{rb:StringResource Main.InitializationPage_ConnectionCycle_Content}" TextWrapping="Wrap" Margin="0, 4, 0, 0" />
+
+                                        <TextBlock Text="{rb:StringResource Main.InitializationPage_Solution}" FontWeight="Bold" Margin="0, 6, 0, 0" />
+                                        <TextBlock Margin="0, 4, 0, 0">
+                                            <Run Text="•" />
+                                            <Run Text="{rb:StringResource Main.InitializationPage_ConnectionCycle_Solution_DisablePortCustomization}" />
+                                        </TextBlock>
+                                        <TextBlock Margin="0, 4, 0, 0">
+                                            <Run Text="•" />
+                                            <Run Text="{rb:StringResource Main.InitializationPage_PortIsOccupied_Solution_ChangePort}" />
+                                        </TextBlock>
+
+                                        <StackPanel Orientation="Horizontal" Margin="8, 8, 0, 0">
+                                            <CheckBox IsChecked="{rb:Preference Network.PortCustomization}">
+                                                <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Network_Port_Customization}" />
+                                            </CheckBox>
+                                            <TextBox Text="{rb:Preference Network.Port}" IsEnabled="{rb:Preference Network.PortCustomization}" Width="75" Margin="8, 0, 0, 0" />
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+
                                 <Border BorderBrush="{DynamicResource HighlightBorderBrushKey}" BorderThickness="0, 1, 0, 0" Margin="0, 8, 0, 0" Padding="0, 4, 0, 0" Visibility="{Binding IsUpstreamProxyAvailable, Converter={StaticResource BooleanToInvisibilityConverter}}">
                                     <StackPanel>
                                         <TextBlock Text="{rb:StringResource Main.InitializationPage_UpstreamProxy}" FontSize="16" FontWeight="Bold" />
@@ -81,9 +105,15 @@
                                     </StackPanel>
                                 </Border>
 
-                                <Button Command="{Binding StartCommand}" Margin="0, 12, 0, 0" Padding="16, 8" HorizontalAlignment="Right">
-                                    <TextBlock Text="{rb:StringResource Main.InitializationPage_Retry}" />
-                                </Button>
+                                <DockPanel Margin="0, 12, 0, 0" LastChildFill="False">
+                                    <Button Command="{Binding RetryCommand}" Padding="16, 8" DockPanel.Dock="Right">
+                                        <TextBlock Text="{rb:StringResource Main.InitializationPage_Retry}" />
+                                    </Button>
+
+                                    <Button Command="{Binding SkipCommand}" Margin="0, 0, 8, 0" Padding="16, 8" DockPanel.Dock="Right">
+                                        <TextBlock Text="{rb:StringResource Main.InitializationPage_Skip}" />
+                                    </Button>
+                                </DockPanel>
                             </StackPanel>
                         </Border>
                     </ControlTemplate>
diff --git a/HeavenlyWind/Views/MainWindow.xaml b/HeavenlyWind/Views/MainWindow.xaml
index 9c179274..97425360 100644
--- a/HeavenlyWind/Views/MainWindow.xaml
+++ b/HeavenlyWind/Views/MainWindow.xaml
@@ -1,4 +1,5 @@
 <ruic:MetroWindow x:Class="Sakuno.KanColle.Amatsukaze.Views.MainWindow"
+                  x:ClassModifier="internal"
                   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"
@@ -15,6 +16,17 @@
                   Width="1350" Height="720"
                   WindowPlacementPreference="{StaticResource WindowPlacementPreference}"
                   UseLayoutRounding="True">
+    <ruic:MetroWindow.Resources>
+        <Style x:Key="TitleBarDropDownButtonStyle" TargetType="{x:Type ruic:DropDownButton}" BasedOn="{StaticResource FlatDropDownButtonStyle}">
+            <Setter Property="ShowDropDownMarker" Value="False" />
+            <Setter Property="Width" Value="34" />
+            <Setter Property="Height" Value="26" />
+        </Style>
+        <Style x:Key="TitleBarToggleButtonStyle"  TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource FlatToggleButtonStyle}">
+            <Setter Property="Width" Value="34" />
+            <Setter Property="Height" Value="26" />
+        </Style>
+    </ruic:MetroWindow.Resources>
     <ruic:MetroWindow.TaskbarItemInfo>
         <TaskbarItemInfo ProgressState="{Binding State, Source={x:Static rs:TaskbarProgressService.Instance}}" ProgressValue="{Binding Value, Source={x:Static rs:TaskbarProgressService.Instance}}" />
     </ruic:MetroWindow.TaskbarItemInfo>
@@ -26,25 +38,10 @@
             <RowDefinition Height="23" />
         </Grid.RowDefinitions>
         <Grid.LayoutTransform>
-            <ScaleTransform ScaleX="{Binding UIZoom, Source={x:Static rs:StatusBarService.Instance}}" ScaleY="{Binding UIZoom, Source={x:Static rs:StatusBarService.Instance}}" />
+            <ScaleTransform ScaleX="{rb:Preference UI.Zoom}" ScaleY="{rb:Preference UI.Zoom}" />
         </Grid.LayoutTransform>
 
         <DockPanel x:Name="r_CaptionBar" x:FieldModifier="private" ruic:MetroWindow.IsCaptionBar="True">
-            <DockPanel.Resources>
-                <Style TargetType="{x:Type ruic:DropDownButton}">
-                    <Setter Property="Background" Value="Transparent" />
-                    <Setter Property="BorderThickness" Value="0" />
-                    <Setter Property="ShowDropDownMarker" Value="False" />
-                    <Setter Property="Width" Value="34" />
-                    <Setter Property="Height" Value="26" />
-                </Style>
-                <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-                    <Setter Property="Background" Value="Transparent" />
-                    <Setter Property="BorderThickness" Value="0" />
-                    <Setter Property="Width" Value="34" />
-                    <Setter Property="Height" Value="26" />
-                </Style>
-            </DockPanel.Resources>
             <DockPanel.Style>
                 <Style TargetType="{x:Type DockPanel}">
                     <Setter Property="Background" Value="Transparent" />
@@ -63,56 +60,84 @@
             <ruic:WindowCaptionButton Command="{Binding ShowPreferencesWindowCommand}" WindowChrome.IsHitTestVisibleInChrome="True" DockPanel.Dock="Right">
                 <Path Stretch="Uniform" Fill="{DynamicResource ActiveForegroundBrushKey}" Margin="5" Data="M150,89.999996 C116.86238,89.999996 90,116.86238 90,150 90,183.13689 116.86238,210 150,210 183.13762,210 210,183.13762 210,150 210,116.86238 183.13762,89.999996 150,89.999996 z M132,0 L168,0 C174.62694,0 179.85437,5.3730583 179.85437,12 L179.85437,33.797325 C190.7767,36.637135 201.29344,41.023544 210.83447,46.668934 L226.36746,31.210194 C231.05243,26.523785 238.65146,26.528156 243.3364,31.214565 L268.79272,56.679607 C273.48059,61.366016 273.48059,68.981792 268.79272,73.668201 L253.33325,89.164806 C258.97864,98.706554 263.36142,109.2233 266.2034,120.14563 L288,120.14563 C294.62695,120.14563 300,125.37305 300,132 L300,168 C300,174.62694 294.62766,179.85437 288,179.85437 L266.2034,179.85437 C263.36142,190.77669 258.97644,201.29345 253.33105,210.83446 L268.78906,226.36748 C273.47623,231.05243 273.47183,238.65146 268.78397,243.3364 L243.31821,268.79273 C238.63397,273.48059 231.01675,273.48059 226.33179,268.79273 L210.83519,253.33326 C201.29344,258.97864 190.7767,263.36139 179.85437,266.2034 L179.85437,288 C179.85437,294.62693 174.62767,300 168,300 L132,300 C125.37306,300 120.14563,294.62766 120.14563,288 L120.14563,266.2034 C109.2233,263.36139 98.706558,258.97644 89.165535,253.33106 L73.632523,268.78907 C68.946114,273.4762 61.348541,273.47184 56.662132,268.78397 L31.205826,243.31821 C26.519417,238.63398 26.519417,231.01674 31.205826,226.33179 L46.667473,210.83519 C41.021355,201.29345 36.637138,190.77669 33.797333,179.85437 L12,179.85437 C5.3730583,179.85437 -1.9073486E-06,174.62767 0,168 L0,132 C-1.9073486E-06,125.37305 5.3730583,120.14563 12,120.14563 L33.797333,120.14563 C36.637138,109.2233 41.022087,98.706554 46.66893,89.165531 L31.210194,73.632526 C26.523785,68.947575 26.528152,61.348545 31.214561,56.663593 L56.679611,31.207279 C61.36602,26.519417 68.981796,26.519417 73.668205,31.207279 L89.164803,46.667477 C98.706558,41.021358 109.2233,36.637135 120.14563,33.797325 L120.14563,12 C120.14563,5.3730583 125.37306,0 132,0 z" />
             </ruic:WindowCaptionButton>
-            <ruic:DropDownButton Visibility="{Binding IsGameStarted, Converter={StaticResource BooleanToVisibilityConverter}}" WindowChrome.IsHitTestVisibleInChrome="True" DockPanel.Dock="Right">
+            <ruic:DropDownButton Style="{StaticResource TitleBarDropDownButtonStyle}" Visibility="{Binding IsGameStarted, Converter={StaticResource BooleanToVisibilityConverter}}" WindowChrome.IsHitTestVisibleInChrome="True" DockPanel.Dock="Right">
                 <ruic:DropDownButton.Header>
                     <Path Stretch="Uniform" Fill="{DynamicResource ActiveForegroundBrushKey}" Data="M140.68552,40.490219 C143.41989,40.490234 145.78806,41.491211 147.79001,43.493149 149.79196,45.495117 150.79294,47.863281 150.79294,50.597641 L150.79294,130.57809 200.89059,130.57809 C203.62494,130.57809 205.94427,131.60348 207.8486,133.65426 209.75287,135.70504 210.70502,138.14645 210.70502,140.97848 210.70502,143.71285 209.75287,146.08102 207.8486,148.08297 205.94427,150.08492 203.62494,151.0859 200.89059,151.0859 L140.68552,151.0859 C137.85349,151.0859 135.41208,150.08492 133.3613,148.08297 131.31052,146.08102 130.28513,143.71285 130.28513,140.97848 L130.28513,50.597641 C130.28513,47.863281 131.31052,45.495117 133.3613,43.493149 135.41208,41.491211 137.85349,40.490234 140.68552,40.490219 z M142.44333,20.714836 C131.31052,20.714851 120.56833,22.130867 110.21677,24.962883 99.865204,27.79493 90.172821,31.798836 81.139633,36.974602 72.10643,42.150391 63.878891,48.375977 56.457016,55.651352 49.035141,62.926735 42.687485,70.958961 37.414055,79.748024 32.140617,88.537086 28.039055,97.985329 25.109375,108.09275 22.17968,118.20017 20.714836,128.72262 20.714836,139.66012 20.714836,150.59762 22.155266,161.16891 25.036125,171.37399 27.916985,181.57906 31.969719,191.17379&#xD;&#xA;37.194336,200.15816 42.41893,209.14254 48.66893,217.37008 55.944321,224.84078 63.219711,232.31145 71.276352,238.73235 80.114243,244.10345 88.952118,249.47454 98.40036,253.64935 108.45895,256.62786 118.51755,259.60638 128.91794,261.09563 139.66013,261.09563 150.79294,261.09563 161.53513,259.67962 171.88669,256.84759 182.23822,254.01556 191.90619,250.01165 200.89059,244.83587 209.87494,239.66009 218.07806,233.45892 225.49994,226.23238 232.92181,219.00582&#xD;&#xA;239.26947,210.97359 244.54291,202.1357 249.81635,193.29781 253.89349,183.82516 256.77435,173.71774 259.65521,163.61031 261.09564,153.08785 261.09564,142.15035 261.09564,131.31051 259.6308,120.78806 256.70111,110.58298 253.77142,100.37791 249.66986,90.78318 244.39642,81.798805 239.12299,72.81443 232.82416,64.586891 225.49994,57.116196 218.17572,49.645508 210.11908,43.200195 201.33005,37.780266 192.54095,32.360359 183.16595,28.16114 173.20505,25.18261&#xD;&#xA;163.24411,22.204109 152.9902,20.714851 142.44333,20.714836 z M140.97849,0.5 C154.06442,0.50001526 166.61325,2.1845856 178.62497,5.5537033 190.63666,8.9228592 201.84271,13.659187 212.2431,19.762688 222.64349,25.866219 232.06732,33.239265 240.51459,41.881821 248.96185,50.524414 256.21283,60.094727 262.26752,70.592751 268.3222,81.090797 272.98529,92.394508 276.25677,104.50388 279.52826,116.61326 281.164,129.25973 281.164,142.44332 281.164,155.23629 279.47943,167.54098 276.11029,179.35738 272.74115,191.17379 268.00482,202.20895&#xD;&#xA;261.90131,212.46285 255.79779,222.71676 248.44916,232.06731 239.85541,240.51458 231.26166,248.96185 221.789,256.18841 211.43744,262.19427 201.08588,268.20013 189.95306,272.86321 178.03903,276.18353 166.12497,279.50384 153.77145,281.16399 140.97849,281.16399 127.69724,281.16399 115.00192,279.47942 102.89256,276.11028 90.783188,272.74114 79.528305,267.9804 69.127914,261.82806 58.727524,255.67571 49.303696,248.30267 40.85643,239.70892 32.409172,231.11517&#xD;&#xA;25.207024,221.61813 19.249992,211.21774 13.292969,200.81734 8.6787109,189.6357 5.4072266,177.67281 2.1357422,165.70992 0.5,153.33199 0.5,140.53902 0.5,127.45309 2.1845703,114.92869 5.5537109,102.9658 8.9228516,91.002907 13.683594,79.821266 19.83593,69.420876 25.988274,59.020508 33.36132,49.59668 41.955063,41.149399 50.548813,32.702156 60.045883,25.45118 70.446274,19.396477 80.846664,13.341805 92.003891,8.6787186 103.91795,5.4072189&#xD;&#xA;115.832,2.1357574 128.18552,0.50001526 140.97849,0.5 z" />
                 </ruic:DropDownButton.Header>
 
                 <ListBox Style="{StaticResource MenuListBoxStyle}">
-                    <ListBoxItem>
-                        <Button Command="{Binding ShowConstructionHistoryCommand}">
-                            <TextBlock Text="{rb:StringResource Main.Window_ConstructionHistory}" />
-                        </Button>
-                    </ListBoxItem>
-                    <ListBoxItem>
-                        <Button Command="{Binding ShowDevelopmentHistoryCommand}">
-                            <TextBlock Text="{rb:StringResource Main.Window_DevelopmentHistory}" />
-                        </Button>
-                    </ListBoxItem>
-                    <ListBoxItem>
-                        <Button Command="{Binding ShowSortieHistoryCommand}">
-                            <TextBlock Text="{rb:StringResource Main.Window_SortieHistory}" />
-                        </Button>
-                    </ListBoxItem>
-                    <ListBoxItem>
-                        <Button Command="{Binding ShowExpeditionHistoryCommand}">
-                            <TextBlock Text="{rb:StringResource Main.Window_ExpeditionHistory}" />
-                        </Button>
-                    </ListBoxItem>
-                    <ListBoxItem>
-                        <Button Command="{Binding ShowScrappingHistoryCommand}">
-                            <TextBlock Text="{rb:StringResource Main.Window_ScrappingHistory}" />
-                        </Button>
-                    </ListBoxItem>
-                    <ListBoxItem>
-                        <Button Command="{Binding ShowResourceHistoryCommand}">
-                            <TextBlock Text="{rb:StringResource Main.Window_ResourceHistory}" />
-                        </Button>
-                    </ListBoxItem>
-                    <ListBoxItem>
-                        <Button Command="{Binding ShowSortieConsumptionHistoryCommand}">
-                            <TextBlock Text="{rb:StringResource Main.Window_SortieConsumptionHistory}" />
-                        </Button>
-                    </ListBoxItem>
-                    <ListBoxItem>
-                        <Button Command="{Binding ShowSortieStatisticCommand}">
-                            <TextBlock Text="{rb:StringResource Main.Window_SortieStatistic}" />
-                        </Button>
-                    </ListBoxItem>
+                    <Button Command="{Binding ShowConstructionHistoryCommand}">
+                        <TextBlock Text="{rb:StringResource Main.Window_ConstructionHistory}" />
+                    </Button>
+                    <Button Command="{Binding ShowDevelopmentHistoryCommand}">
+                        <TextBlock Text="{rb:StringResource Main.Window_DevelopmentHistory}" />
+                    </Button>
+                    <Button Command="{Binding ShowSortieHistoryCommand}">
+                        <TextBlock Text="{rb:StringResource Main.Window_SortieHistory}" />
+                    </Button>
+                    <Button Command="{Binding ShowExpeditionHistoryCommand}">
+                        <TextBlock Text="{rb:StringResource Main.Window_ExpeditionHistory}" />
+                    </Button>
+                    <Button Command="{Binding ShowScrappingHistoryCommand}">
+                        <TextBlock Text="{rb:StringResource Main.Window_ScrappingHistory}" />
+                    </Button>
+                    <Button Command="{Binding ShowResourceHistoryCommand}">
+                        <TextBlock Text="{rb:StringResource Main.Window_ResourceHistory}" />
+                    </Button>
+                    <Button Command="{Binding ShowSortieConsumptionHistoryCommand}">
+                        <TextBlock Text="{rb:StringResource Main.Window_SortieConsumptionHistory}" />
+                    </Button>
+                    <Button Command="{Binding ShowSortieStatisticCommand}">
+                        <TextBlock Text="{rb:StringResource Main.Window_SortieStatistic}" />
+                    </Button>
                 </ListBox>
             </ruic:DropDownButton>
 
-            <ToggleButton IsChecked="{Binding Topmost, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Visibility="{Binding NoInstalledLayoutEngines, Source={x:Static rs:BrowserService.Instance}, Converter={StaticResource BooleanToVisibilityConverter}}" WindowChrome.IsHitTestVisibleInChrome="True" DockPanel.Dock="Right">
+            <ruic:WindowCaptionButton Command="{Binding ShowSessionToolCommand}" WindowChrome.IsHitTestVisibleInChrome="True" DockPanel.Dock="Right">
+                <Path Stretch="Uniform" Fill="{DynamicResource ActiveForegroundBrushKey}" Margin="5" Data="M120,17.1429 L300,17.1429 L300,205.714 L180,205.714 L180,231.429 L214.286,231.429 L222.857,257.143 L102.857,257.143 L111.429,231.429 L145.714,231.429 L145.714,205.714 L77.1429,205.714 L77.1429,171.429 L257.143,171.429 L257.143,51.4286 L120,51.4286 z M0,8.57143 L25.7143,8.57143 L25.7143,94.2857 L85.7143,94.2857 L85.7143,8.57143 L111.429,8.57143 L111.429,128.571 L85.7143,128.571 L68.5714,145.714 L68.5714,231.429 L42.8571,231.429 L42.8571,145.714 L25.7143,128.571 L0,128.571 z M42.8571,0 L68.5714,0 L68.5714,77.1429 L42.8571,77.1429 z" />
+            </ruic:WindowCaptionButton>
+
+            <Rectangle Fill="{DynamicResource HighlightBorderBrushKey}" Width="1" Margin="2" DockPanel.Dock="Right" />
+
+            <ruic:DropDownButton Style="{StaticResource TitleBarDropDownButtonStyle}" PopupAutoClose="False" Width="Auto" WindowChrome.IsHitTestVisibleInChrome="True" DockPanel.Dock="Right">
+                <ruic:DropDownButton.Header>
+                    <StackPanel Orientation="Horizontal" TextElement.FontSize="14">
+                        <TextBlock Text="UI" FontWeight="Bold" VerticalAlignment="Bottom" />
+                        <Path Stretch="Fill" Fill="{DynamicResource ActiveForegroundBrushKey}" Width="16" Height="16" Margin="2, 0, 0, 0" Data="M104.46785,22.852232 C98.738756,22.860838 93.051485,23.239569 89.537455,23.985228 64.855799,29.222551 44.877947,43.622969 33.093569,64.671064 8.7868118,108.08537 28.577024,162.78128 75.283785,181.27579 83.806391,184.65048 98.63254,187.23462 106.28639,186.67941 107.76689,186.57202 111.07167,186.32878 113.63036,186.13887 119.41904,185.70924 128.71668,183.39836 135.24393,180.76692 161.5575,170.15875 180.58289,146.56703 185.57587,118.35472 186.8262,111.28984 186.80742,98.51428&#xD;&#xA;185.53571,91.035421 179.81395,57.386 153.63187,30.723513 119.64923,23.940023 115.96788,23.205164 110.19695,22.843634 104.46785,22.852232 z M100.7017,0.50330734 C102.84497,0.4895916 105.17205,0.51896477 107.76052,0.58345222 125.93491,1.0362282 135.7722,3.4267998 151.44875,11.200174 180.57292,25.641699 201.03769,52.462049 207.40022,84.52812 209.96155,97.43672 209.66319,115.03569 206.66117,128.12237 203.42534,142.22825 195.71623,158.63843 187.74376,168.39136 185.63161,170.9752 185.63161,170.9752 197.85083,183.19208 210.07006,195.40893 210.07006,195.40893 213.01277,193.91765 216.38539,192.20851 219.59934,192.02144&#xD;&#xA;222.80052,193.34791 224.34493,193.98787 236.40251,205.63809 262.26097,231.47519 297.40871,266.59387 299.49748,268.79901 299.49748,270.78601 299.49748,272.73248 298.49419,273.89364 286.18315,286.19555 272.86885,299.5 272.86885,299.5 269.57259,299.5 266.27635,299.5 266.27635,299.5 229.41904,262.56259 199.63605,232.71484 192.41959,225.17882 191.82105,223.29967 190.84711,220.24183 191.43077,215.59724 193.08006,213.28102 194.38585,211.44725&#xD;&#xA;194.38585,211.44725 182.18903,199.23881 175.48078,192.52418 169.71622,187.13611 169.37889,187.26533 169.04157,187.39454 166.69141,188.9884 164.15633,190.80725 155.4614,197.04556 141.80219,203.23869 130.32115,206.14819 116.70577,209.59859 98.082247,210.10565 84.471163,207.39657 58.185205,202.16478 34.986361,187.16664 19.216692,165.20933 14.505785,158.64998 7.703352,145.12176 5.1901493,137.31431 1.6701889,126.3793 0.90057564,121.44359 0.57668114,107.72713&#xD;&#xA;0.24999809,93.892408 0.90468407,87.539709 3.7551594,76.885122 13.09421,41.977285 41.974752,13.096739 76.882593,3.7576866 85.578432,1.4312458 91.414232,0.5627327 100.7017,0.50330734 z" />
+                        <TextBlock Text="{rb:Preference UI.Zoom, StringFormat=P0}" Margin="2, 0" VerticalAlignment="Bottom" />
+                    </StackPanel>
+                </ruic:DropDownButton.Header>
+
+                <StackPanel>
+                    <ListBox Style="{StaticResource MenuListBoxStyle}" ItemsSource="{Binding UIZoomFactors}" MinWidth="120">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <Button Name="Button" Command="{Binding Command}" CommandParameter="{Binding Zoom}">
+                                    <TextBlock Name="UIZoom" Text="{Binding Zoom, StringFormat=P0}" />
+                                </Button>
+
+                                <DataTemplate.Triggers>
+                                    <DataTrigger Binding="{Binding IsSelected}" Value="True">
+                                        <Setter TargetName="Button" Property="Background" Value="{DynamicResource AccentBrushKey}" />
+                                        <Setter TargetName="UIZoom" Property="FontWeight" Value="Bold" />
+                                    </DataTrigger>
+                                </DataTemplate.Triggers>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+
+                    <Rectangle Fill="{DynamicResource HighlightBorderBrushKey}" Height="1" Margin="2" />
+
+                    <Button Style="{StaticResource MenuListBoxButtonStyle}" Command="{Binding UIZoomInCommand}">
+                        <TextBlock Text="{rb:StringResource Main.UIZoom_ZoomIn}" />
+                    </Button>
+                    <Button Style="{StaticResource MenuListBoxButtonStyle}" Command="{Binding UIZoomOutCommand}">
+                        <TextBlock Text="{rb:StringResource Main.UIZoom_ZoomOut}" />
+                    </Button>
+                </StackPanel>
+            </ruic:DropDownButton>
+
+            <ToggleButton Style="{StaticResource TitleBarToggleButtonStyle}" IsChecked="{Binding Topmost, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" WindowChrome.IsHitTestVisibleInChrome="True" DockPanel.Dock="Right">
                 <Path Stretch="Uniform" Fill="{DynamicResource ActiveForegroundBrushKey}" HorizontalAlignment="Center" Data="M71.048203,0 L93.770935,10.424871 152.85001,37.529528 171.02817,45.869425 230.10727,72.974085 252.82999,83.398958 238.23517,115.21076 215.51245,104.78589 187.73206,165.33783 188.45349,168.04767 C193.10251,186.74838 194.03778,207.59044 190.93973,229.09215 L190.71091,230.57726 104.44453,190.99945 45.929749,318.5421 27.751572,310.2022 86.266357,182.65956 0,143.08176 0.97650146,141.93968 C15.254585,125.5672 31.663315,112.68233 48.871078,104.00919 L51.395721,102.78861 79.176117,42.236681 56.453384,31.811808 z" />
             </ToggleButton>
 
diff --git a/HeavenlyWind/Views/MainWindow.xaml.cs b/HeavenlyWind/Views/MainWindow.xaml.cs
index 281c4b8d..eafcfc61 100644
--- a/HeavenlyWind/Views/MainWindow.xaml.cs
+++ b/HeavenlyWind/Views/MainWindow.xaml.cs
@@ -4,6 +4,7 @@
 using Sakuno.KanColle.Amatsukaze.Game.Models;
 using Sakuno.KanColle.Amatsukaze.Models;
 using Sakuno.KanColle.Amatsukaze.Services;
+using Sakuno.KanColle.Amatsukaze.ViewModels;
 using Sakuno.SystemInterop;
 using Sakuno.UserInterface;
 using Sakuno.UserInterface.Controls;
@@ -19,10 +20,9 @@ namespace Sakuno.KanColle.Amatsukaze.Views
     /// <summary>
     /// MainWindow.xaml の相互作用ロジック
     /// </summary>
-    public partial class MainWindow : MetroWindow, IMainWindowService
+    partial class MainWindow : MetroWindow, IMainWindowService
     {
-        IntPtr r_Handle;
-        IntPtr IMainWindowService.Handle => r_Handle;
+        public IntPtr Handle { get; private set; }
 
         static MainWindow()
         {
@@ -37,19 +37,26 @@ protected override void OnSourceInitialized(EventArgs e)
         {
             base.OnSourceInitialized(e);
 
-            r_Handle = new WindowInteropHelper(this).Handle;
+            Handle = new WindowInteropHelper(this).Handle;
 
             PowerManager.RegisterMonitor(this);
 
-            PanicKeyService.Instance.Initialize(r_Handle);
+            PanicKeyService.Instance.Initialize(Handle);
 
             ServiceManager.Register<IMainWindowService>(this);
         }
 
+        protected override void OnContentRendered(EventArgs e)
+        {
+            base.OnContentRendered(e);
+
+            ((InitializationPageViewModel)App.Root.Page).CheckProxyPort();
+        }
+
         protected override void OnClosing(CancelEventArgs e)
         {
             var rMode = Preference.Instance.UI.CloseConfirmationMode.Value;
-            if (rMode == ConfirmationMode.Always || (rMode == ConfirmationMode.DuringSortie && KanColleGame.Current.Sortie is SortieInfo && !(KanColleGame.Current.Sortie is PracticeInfo)))
+            if (rMode == ConfirmationMode.Always || (rMode == ConfirmationMode.DuringSortie && KanColleGame.Current.Sortie is SortieInfo))
             {
                 var rDialog = new TaskDialog()
                 {
@@ -128,10 +135,10 @@ void IMainWindowService.Flash(int rpCount, int rpTimeout)
             var rInfo = new NativeStructs.FLASHWINFO()
             {
                 cbSize = Marshal.SizeOf(typeof(NativeStructs.FLASHWINFO)),
-                hwnd = r_Handle,
+                hwnd = Handle,
                 dwFlags = NativeEnums.FLASHW.FLASHW_TRAY | NativeEnums.FLASHW.FLASHW_TIMERNOFG,
-                uCount = (uint)rpCount,
-                dwTimeout = (uint)rpTimeout,
+                uCount = rpCount,
+                dwTimeout = rpTimeout,
             };
             NativeMethods.User32.FlashWindowEx(ref rInfo);
         }
diff --git a/HeavenlyWind/Views/Overviews/EquipmentOverviewWindow.xaml b/HeavenlyWind/Views/Overviews/EquipmentOverviewWindow.xaml
index 1e3a7564..820ffb44 100644
--- a/HeavenlyWind/Views/Overviews/EquipmentOverviewWindow.xaml
+++ b/HeavenlyWind/Views/Overviews/EquipmentOverviewWindow.xaml
@@ -3,6 +3,7 @@
                   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:i="http://schemas.microsoft.com/expression/2010/interactivity"
                   xmlns:rb="clr-namespace:Sakuno.KanColle.Amatsukaze;assembly=HeavenlyWind.Base"
                   xmlns:rvmo="clr-namespace:Sakuno.KanColle.Amatsukaze.ViewModels.Overviews"
                   xmlns:ruic="clr-namespace:Sakuno.UserInterface.Controls;assembly=Sakuno.UserInterface"
@@ -72,9 +73,16 @@
                         </ItemsControl.ItemsPanel>
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
-                                <CheckBox IsChecked="{Binding IsSelected}" Margin="4, 2">
-                                    <rc:EquipmentIcon Type="{Binding Type}" Width="20" Height="20" />
-                                </CheckBox>
+                                <StackPanel Orientation="Horizontal">
+                                    <CheckBox IsChecked="{Binding IsSelected}" Margin="4, 2" />
+                                    <rc:EquipmentIcon Type="{Binding Type}" Width="20" Height="20">
+                                        <i:Interaction.Triggers>
+                                            <i:EventTrigger EventName="MouseUp">
+                                                <i:InvokeCommandAction Command="{Binding SelectThisTypeOnlyCommand}" CommandParameter="{Binding}" />
+                                            </i:EventTrigger>
+                                        </i:Interaction.Triggers>
+                                    </rc:EquipmentIcon>
+                                </StackPanel>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
diff --git a/HeavenlyWind/Views/Preferences/Behaviour.xaml b/HeavenlyWind/Views/Preferences/Behaviour.xaml
index 98a175df..8f404309 100644
--- a/HeavenlyWind/Views/Preferences/Behaviour.xaml
+++ b/HeavenlyWind/Views/Preferences/Behaviour.xaml
@@ -30,5 +30,9 @@
         <CheckBox IsChecked="{rb:Preference Game.ShowDrop}" Margin="0, 6, 0, 0">
             <TextBlock Text="{rb:StringResource PreferenceWindow_Behaviour_ShowDrop}" />
         </CheckBox>
+
+        <CheckBox IsChecked="{rb:Preference Game.DisableHeavyDamageBlinkingWarning}" Margin="0, 12, 0, 0">
+            <TextBlock Text="{rb:StringResource PreferenceWindow_Behaviour_DisableHeavyDamageBlinkingWarning}" />
+        </CheckBox>
     </StackPanel>
 </UserControl>
diff --git a/HeavenlyWind/Views/Preferences/Network.xaml b/HeavenlyWind/Views/Preferences/Network.xaml
index 77dec1a1..1d7b6759 100644
--- a/HeavenlyWind/Views/Preferences/Network.xaml
+++ b/HeavenlyWind/Views/Preferences/Network.xaml
@@ -14,7 +14,7 @@
     </UserControl.Resources>
 
     <StackPanel>
-        <CheckBox Name="EnablePortCustomization">
+        <CheckBox Name="EnablePortCustomization" IsChecked="{rb:Preference Network.PortCustomization}">
             <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Network_Port_Customization}" />
         </CheckBox>
         <StackPanel Orientation="Horizontal" IsEnabled="{Binding IsChecked, ElementName=EnablePortCustomization}" Margin="0, 6, 0, 0">
diff --git a/HeavenlyWind/Views/Preferences/UI.xaml b/HeavenlyWind/Views/Preferences/UI.xaml
index c1680fdb..04b21d28 100644
--- a/HeavenlyWind/Views/Preferences/UI.xaml
+++ b/HeavenlyWind/Views/Preferences/UI.xaml
@@ -166,5 +166,21 @@
                 </Style>
             </ruic:BBCodeBlock.Style>
         </ruic:BBCodeBlock>
+
+        <StackPanel Orientation="Horizontal" Margin="0, 12, 0, 0">
+            <TextBlock Text="{rb:StringResource Main.PreferenceWindow_UI_StatusBarSortieInfo}" />
+
+            <ComboBox ItemsSource="{rb:Enumeration {x:Type rbm:StatusBarSortieInfoPlacement}}" SelectedValue="{rb:Preference UI.StatusBarSortieInfo}" Margin="6, 0, 0, 0">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{rb:EnumToStringResource ., PreferenceWindow_UI_StatusBarSortieInfo}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+        </StackPanel>
+
+        <CheckBox IsChecked="{rb:Preference UI.SwapPositionOfRepairDocksAndFleetOverviews}" Margin="0, 12, 0, 0">
+            <TextBlock Text="{rb:StringResource Main.PreferenceWindow_UI_SwapPositionOfRepairDocksAndFleetOverview}" />
+        </CheckBox>
     </StackPanel>
 </UserControl>
diff --git a/HeavenlyWind/Views/Preferences/Window.xaml b/HeavenlyWind/Views/Preferences/Window.xaml
index c3296074..f096a557 100644
--- a/HeavenlyWind/Views/Preferences/Window.xaml
+++ b/HeavenlyWind/Views/Preferences/Window.xaml
@@ -142,5 +142,11 @@
                 </Grid>
             </Border>
         </StackPanel>
+
+        <Rectangle Fill="{DynamicResource InactiveForegroundBrushKey}" Height="1" Margin="0, 12" />
+
+        <CheckBox IsChecked="{rb:Preference UI.LockTabs}">
+            <TextBlock Text="{rb:StringResource Main.PreferenceWindow_Window_Layout_LockTabs}" />
+        </CheckBox>
     </StackPanel>
 </UserControl>
diff --git a/HeavenlyWind/Views/Statistics/SortieStatisticWindow.xaml b/HeavenlyWind/Views/Statistics/SortieStatisticWindow.xaml
index 6489b0a8..d4330fe0 100644
--- a/HeavenlyWind/Views/Statistics/SortieStatisticWindow.xaml
+++ b/HeavenlyWind/Views/Statistics/SortieStatisticWindow.xaml
@@ -43,6 +43,8 @@
 
         <Grid Margin="8, 0, 8, 8" Grid.Row="1">
             <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="8" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="8" />
                 <RowDefinition />
@@ -66,9 +68,82 @@
                     </ListBox.ItemTemplate>
                 </ListBox>
 
+                <StackPanel Orientation="Horizontal" Margin="4, 0, 0, 0">
+                    <StackPanel.Style>
+                        <Style TargetType="{x:Type StackPanel}">
+                            <Setter Property="Visibility" Value="Collapsed" />
+
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding SelectedTimeSpan.Type}" Value="Custom">
+                                    <Setter Property="Visibility" Value="Visible" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </StackPanel.Style>
+                    <StackPanel.Resources>
+                        <StreamGeometry x:Key="CalenderDaySelection">M217.5,217.502 L262.5,217.502 L262.5,255.002 L217.5,255.002 z M157.5,217.502 L202.499,217.502 L202.499,255.002 L157.5,255.002 z M97.4998,217.502 L142.5,217.502 L142.5,255.002 L97.4998,255.002 z M37.5,217.502 L82.4997,217.502 L82.4997,255.002 L37.5,255.002 z M105,172.501 L105,195.001 L135,195.001 L135,172.501 z M217.5,165.002 L262.5,165.002 L262.5,202.502 L217.5,202.502 z M157.5,165.002 L202.499,165.002 L202.499,202.502 L157.5,202.502 z M97.4998,165.002 L142.5,165.002 L142.5,202.502 L97.4998,202.502 z M37.5,165.002 L82.4997,165.002 L82.4997,202.502 L37.5,202.502 z M217.5,112.503 L262.5,112.503 L262.5,150.003 L217.5,150.003 z M157.5,112.503 L202.499,112.503 L202.499,150.003 L157.5,150.003 z M97.4998,112.503 L142.5,112.503 L142.5,150.003 L97.4998,150.003 z M22.4998,97.5021 L22.4998,270.003 L277.499,270.003 L277.499,97.5021 z M228.749,15.0024 C222.537,15.0024 217.5,20.0387 217.5,26.2523 L217.5,48.7522 C217.5,54.9651 222.537,60.0021 228.749,60.0021 L236.249,60.0021 C242.463,60.0021 247.5,54.9651 247.5,48.7522 L247.5,26.2523 C247.5,20.0387 242.463,15.0024 236.249,15.0024 z M63.7501,15.0016 C57.5364,15.0016 52.5001,20.0387 52.5001,26.2516 L52.5001,48.7522 C52.5001,54.9651 57.5364,60.0021 63.7501,60.0021 L71.2498,60.0021 C77.4634,60.0021 82.4997,54.9651 82.4997,48.7522 L82.4997,26.2516 C82.4997,20.0387 77.4634,15.0016 71.2498,15.0016 z M217.5,0 L247.5,0 C255.784,1E-06 262.5,6.71531 262.5,15.0001 L262.5,37.5015 L300,37.5015 L300,292.503 L0,292.503 L0,37.5015 L37.5,37.5015 L37.5,15.0016 C37.5007,6.71681 44.2161,0.001503 52.5001,0.001502 L82.4997,0.001502 C90.7838,0.001503 97.4991,6.71681 97.4998,15.0001 L97.4998,37.5015 L202.5,37.5015 L202.499,15.0001 C202.499,6.71531 209.215,1E-06 217.5,0 z</StreamGeometry>
+                    </StackPanel.Resources>
+
+                    <TextBlock>
+                        <Run Text="{rb:StringResource Main.SortieStatistic_CustomTimeSpan_Start}" />:
+                    </TextBlock>
+                    <DockPanel Width="120" Margin="4, 0, 0, 0">
+                        <ruic:DropDownButton Style="{StaticResource FlatDropDownButtonStyle}" ShowDropDownMarker="False" PopupAutoClose="False" IsPopupOpened="{Binding CustomTimeSpan.IsDateStartCalendarOpened}" DockPanel.Dock="Right">
+                            <ruic:DropDownButton.Header>
+                                <Path Stretch="Uniform" Fill="{DynamicResource ActiveForegroundBrushKey}" Width="20" Height="20" Data="{StaticResource CalenderDaySelection}" />
+                            </ruic:DropDownButton.Header>
+
+                            <Calendar Name="TimeSpanStartCalender" SelectedDate="{Binding CustomTimeSpan.SelectedDateStart}" DisplayDateStart="{Binding CustomTimeSpan.MinDisplayDateStart}" DisplayDateEnd="{Binding CustomTimeSpan.SelectedDateEnd}" Margin="0, -3" />
+                        </ruic:DropDownButton>
+
+                        <TextBlock Text="{Binding SelectedDate, ElementName=TimeSpanStartCalender, StringFormat=d}" Margin="4, 0, 0, 0" />
+                    </DockPanel>
+
+                    <TextBlock Margin="4, 0, 0, 0">
+                        <Run Text="{rb:StringResource Main.SortieStatistic_CustomTimeSpan_End}" />:
+                    </TextBlock>
+                    <DockPanel Width="120" Margin="4, 0, 0, 0">
+                        <ruic:DropDownButton Style="{StaticResource FlatDropDownButtonStyle}" ShowDropDownMarker="False" PopupAutoClose="False" IsPopupOpened="{Binding CustomTimeSpan.IsDateEndCalendarOpened}" DockPanel.Dock="Right">
+                            <ruic:DropDownButton.Header>
+                                <Path Stretch="Uniform" Fill="{DynamicResource ActiveForegroundBrushKey}" Width="20" Height="20" Data="{StaticResource CalenderDaySelection}" />
+                            </ruic:DropDownButton.Header>
+
+                            <Calendar Name="TimeSpanEndCalender" SelectedDate="{Binding CustomTimeSpan.SelectedDateEnd}" DisplayDateStart="{Binding CustomTimeSpan.SelectedDateStart}" Margin="0, -3" />
+                        </ruic:DropDownButton>
+
+                        <TextBlock Text="{Binding SelectedDate, ElementName=TimeSpanEndCalender, StringFormat=d}" Margin="4, 0, 0, 0" />
+                    </DockPanel>
+                </StackPanel>
+            </StackPanel>
+
+            <StackPanel Orientation="Horizontal" Grid.Row="2">
+                <TextBlock>
+                    <Run Text="{rb:StringResource Main.SortieHistory_Area}" />:
+                </TextBlock>
+
+                <ItemsControl ItemsSource="{Binding Areas}" Margin="4, 0, 0, 0">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <WrapPanel />
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <CheckBox IsChecked="{Binding IsSelected}">
+                                <TextBlock Name="Area" Text="{rb:ExtraStringResource Area, Area.ID, Area.Name}" Margin="4, 2" />
+                            </CheckBox>
+
+                            <DataTemplate.Triggers>
+                                <DataTrigger Binding="{Binding Area}" Value="{x:Null}">
+                                    <Setter TargetName="Area" Property="Text" Value="{rb:StringResource Main.SortieStatistic_PastAreas}" />
+                                </DataTrigger>
+                            </DataTemplate.Triggers>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
             </StackPanel>
 
-            <ListView Foreground="{DynamicResource ActiveForegroundBrushKey}" ItemsSource="{Binding SelectedTimeSpan.Maps}" Grid.Row="2">
+            <ListView Foreground="{DynamicResource ActiveForegroundBrushKey}" ItemsSource="{Binding SelectedTimeSpan.Maps}" Grid.Row="4">
                 <ListView.View>
                     <GridView>
                         <GridViewColumn Width="200" CellTemplateSelector="{StaticResource FirstColumnDataTemplateSelector}">
diff --git a/HeavenlyWind/Views/StatusBar.xaml b/HeavenlyWind/Views/StatusBar.xaml
index 430e86a7..8661222d 100644
--- a/HeavenlyWind/Views/StatusBar.xaml
+++ b/HeavenlyWind/Views/StatusBar.xaml
@@ -11,6 +11,40 @@
              DataContext="{Binding Source={x:Static rs:StatusBarService.Instance}}"
              FontSize="13"
              d:DesignWidth="800" d:DesignHeight="23">
+    <UserControl.Resources>
+        <Style x:Key="StatusBarDropDownButtonStyle" TargetType="{x:Type ruic:DropDownButton}" BasedOn="{StaticResource FlatDropDownButtonStyle}">
+            <Setter Property="ShowDropDownMarker" Value="False" />
+
+            <Style.Triggers>
+                <MultiTrigger>
+                    <MultiTrigger.Conditions>
+                        <Condition Property="IsMouseOver" Value="True" />
+                        <Condition Property="IsPopupOpened" Value="False" />
+                    </MultiTrigger.Conditions>
+
+                    <Setter Property="Background" Value="#40FFFFFF" />
+                    <Setter Property="BorderBrush" Value="#40FFFFFF" />
+                    <Setter Property="Foreground" Value="{DynamicResource ActiveForegroundBrushKey}" />
+                </MultiTrigger>
+                <Trigger Property="IsPopupOpened" Value="True">
+                    <Setter Property="Background" Value="#40FFFFFF" />
+                    <Setter Property="BorderBrush" Value="#40FFFFFF" />
+                    <Setter Property="Foreground" Value="{DynamicResource ActiveForegroundBrushKey}" />
+                </Trigger>
+                <Trigger Property="IsEnabled" Value="False">
+                    <Setter Property="Background" Value="{DynamicResource InactiveBackgroundBrushKey}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource InactiveBorderBrushKey}" />
+                    <Setter Property="Foreground" Value="{DynamicResource InactiveForegroundBrushKey}" />
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+
+        <StreamGeometry x:Key="BatteryLifeCriticalLevel">M4,11 L4,55 L28,55 L28,11 z M10,0 L22,0 L22,5 L32,5 L32,60 L0,60 L0,5 L10,5 z</StreamGeometry>
+        <StreamGeometry x:Key="BatteryLifeLowLevel">M4,11 L4,55 L28,55 L28,11 z M10,0 L22,0 L22,5 L32,5 L32,60 L0,60 L0,5 L10,5 z M6,45 L6,53 L26,53 L26,37 z</StreamGeometry>
+        <StreamGeometry x:Key="BatteryLifeMediumLevel">M4,11 L4,55 L28,55 L28,11 z M10,0 L22,0 L22,5 L32,5 L32,60 L0,60 L0,5 L10,5 z M6,45 L6,53 L26,53 L26,37 z M6,31 L6,43 L26,35 L26,23 z</StreamGeometry>
+        <StreamGeometry x:Key="BatteryLifeHighLevel">M4,11 L4,55 L28,55 L28,11 z M10,0 L22,0 L22,5 L32,5 L32,60 L0,60 L0,5 L10,5 z M6,45 L6,53 L26,53 L26,37 z M6,31 L6,43 L26,35 L26,23 z M6,13 L6,29 L26,21 L26,13 z</StreamGeometry>
+    </UserControl.Resources>
+
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition />
@@ -26,78 +60,128 @@
                     <Run Text="{Binding CurrentTime, StringFormat=HH:mm:ss, Mode=OneWay}" />
                 </TextBlock>
 
-                <StackPanel Orientation="Horizontal" Margin="3, 0, 0, 0" Visibility="{Binding Power.IsBatteryPresent, Converter={StaticResource BooleanToVisibilityConverter}}" DockPanel.Dock="Right">
-                    <Path Fill="{DynamicResource ActiveForegroundBrushKey}" Stretch="Uniform" Margin="2" Data="M35.009781,64.453026 L105.61525,64.453026 105.61525,255.46832 35.009781,255.46832 z M20.507813,50.097588 L20.507813,269.82375 120.41019,269.82375 120.41019,50.097588 z M39.99025,0 L100.92775,0 100.92775,29.882778 140.918,29.882778 140.918,290.77099 0,290.77099 0,29.882778 39.99025,29.882778 z" />
-                    <TextBlock Text="{Binding Power.BatteryRemainingPercentage, StringFormat={}{0}%}" />
+                <StackPanel DataContext="{Binding Power}" Orientation="Horizontal" Margin="3, 0, 0, 0" Visibility="{Binding IsBatteryPresent, Converter={StaticResource BooleanToVisibilityConverter}}" DockPanel.Dock="Right">
+                    <Grid MinWidth="10">
+                        <Path Fill="{DynamicResource ActiveForegroundBrushKey}" Stretch="Uniform" Margin="2">
+                            <Path.Style>
+                                <Style TargetType="{x:Type Path}">
+                                    <Setter Property="Data" Value="{StaticResource BatteryLifeCriticalLevel}" />
+
+                                    <Style.Triggers>
+                                        <MultiDataTrigger>
+                                            <MultiDataTrigger.Conditions>
+                                                <Condition Binding="{Binding IsCharging}" Value="False" />
+                                                <Condition Binding="{Binding BatteryRemainingPercentage, Converter={StaticResource IsGreaterThanOrEqualToConverter}, ConverterParameter=.25}" Value="True" />
+                                            </MultiDataTrigger.Conditions>
+
+                                            <Setter Property="Data" Value="{StaticResource BatteryLifeLowLevel}" />
+                                        </MultiDataTrigger>
+                                        <MultiDataTrigger>
+                                            <MultiDataTrigger.Conditions>
+                                                <Condition Binding="{Binding IsCharging}" Value="False" />
+                                                <Condition Binding="{Binding BatteryRemainingPercentage, Converter={StaticResource IsGreaterThanOrEqualToConverter}, ConverterParameter=.5}" Value="True" />
+                                            </MultiDataTrigger.Conditions>
+
+                                            <Setter Property="Data" Value="{StaticResource BatteryLifeMediumLevel}" />
+                                        </MultiDataTrigger>
+                                        <MultiDataTrigger>
+                                            <MultiDataTrigger.Conditions>
+                                                <Condition Binding="{Binding IsCharging}" Value="False" />
+                                                <Condition Binding="{Binding BatteryRemainingPercentage, Converter={StaticResource IsGreaterThanOrEqualToConverter}, ConverterParameter=.75}" Value="True" />
+                                            </MultiDataTrigger.Conditions>
+
+                                            <Setter Property="Data" Value="{StaticResource BatteryLifeHighLevel}" />
+                                        </MultiDataTrigger>
+
+                                        <DataTrigger Binding="{Binding IsCharging}" Value="True">
+                                            <DataTrigger.EnterActions>
+                                                <BeginStoryboard Name="Sparking">
+                                                    <Storyboard RepeatBehavior="Forever">
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Data" Duration="0:0:4">
+                                                            <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{StaticResource BatteryLifeCriticalLevel}" />
+                                                            <DiscreteObjectKeyFrame KeyTime="0:0:1" Value="{StaticResource BatteryLifeLowLevel}" />
+                                                            <DiscreteObjectKeyFrame KeyTime="0:0:2" Value="{StaticResource BatteryLifeMediumLevel}" />
+                                                            <DiscreteObjectKeyFrame KeyTime="0:0:3" Value="{StaticResource BatteryLifeHighLevel}" />
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                    </Storyboard>
+                                                </BeginStoryboard>
+                                            </DataTrigger.EnterActions>
+                                            <DataTrigger.ExitActions>
+                                                <StopStoryboard BeginStoryboardName="Sparking" />
+                                            </DataTrigger.ExitActions>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Path.Style>
+                        </Path>
+                        <Path Fill="{DynamicResource ActiveForegroundBrushKey}" Stroke="{DynamicResource AccentBrushKey}" StrokeThickness="1" Stretch="Uniform" Width="12" Height="12" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="-2, 0, 0, 0" Visibility="{Binding IsOnExternalPower, Converter={StaticResource BooleanToVisibilityConverter}}" Data="F1 M40,38 L40,48 L36,48 L36,38 L34,38 C32.3431,38 31,36.6569 31,35 L31,28 L34,28 L34,24 L37,24 L37,28 L39,28 L39,24 L42,24 L42,28 L45,28 L45,35 C45,36.6569 43.6568,38 42,38 L40,38 z" />
+                    </Grid>
+
+                    <TextBlock Text="{Binding BatteryRemainingPercentage, StringFormat=P0}" Margin="2, 0" />
                 </StackPanel>
 
-                <ruic:DropDownButton BorderThickness="0" PopupAutoClose="False" ShowDropDownMarker="False" PopupVerticalOffset="1" Margin="5, 0, 0, 0" Padding="4, 0" DockPanel.Dock="Right">
+                <ruic:DropDownButton DataContext="{Binding Sortie}">
                     <ruic:DropDownButton.Style>
-                        <Style TargetType="{x:Type ruic:DropDownButton}">
-                            <Setter Property="Background" Value="Transparent" />
+                        <Style TargetType="{x:Type ruic:DropDownButton}" BasedOn="{StaticResource StatusBarDropDownButtonStyle}">
+                            <Setter Property="Visibility" Value="{rb:CollapsedIfNull}" />
+                            <Setter Property="DockPanel.Dock" Value="Right" />
 
                             <Style.Triggers>
-                                <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Background" Value="#40FFFFFF" />
-                                </Trigger>
+                                <DataTrigger Binding="{rb:Preference UI.StatusBarSortieInfo}" Value="Hidden">
+                                    <Setter Property="Visibility" Value="Collapsed" />
+                                </DataTrigger>
+                                <DataTrigger Binding="{rb:Preference UI.StatusBarSortieInfo}" Value="Left">
+                                    <Setter Property="DockPanel.Dock" Value="Left" />
+                                </DataTrigger>
                             </Style.Triggers>
                         </Style>
                     </ruic:DropDownButton.Style>
                     <ruic:DropDownButton.Header>
                         <StackPanel Orientation="Horizontal">
-                            <Path Stretch="Fill" Fill="{DynamicResource ActiveForegroundBrushKey}" Width="16" Height="16" Data="M104.46785,22.852232 C98.738756,22.860838 93.051485,23.239569 89.537455,23.985228 64.855799,29.222551 44.877947,43.622969 33.093569,64.671064 8.7868118,108.08537 28.577024,162.78128 75.283785,181.27579 83.806391,184.65048 98.63254,187.23462 106.28639,186.67941 107.76689,186.57202 111.07167,186.32878 113.63036,186.13887 119.41904,185.70924 128.71668,183.39836 135.24393,180.76692 161.5575,170.15875 180.58289,146.56703 185.57587,118.35472 186.8262,111.28984 186.80742,98.51428&#xD;&#xA;185.53571,91.035421 179.81395,57.386 153.63187,30.723513 119.64923,23.940023 115.96788,23.205164 110.19695,22.843634 104.46785,22.852232 z M100.7017,0.50330734 C102.84497,0.4895916 105.17205,0.51896477 107.76052,0.58345222 125.93491,1.0362282 135.7722,3.4267998 151.44875,11.200174 180.57292,25.641699 201.03769,52.462049 207.40022,84.52812 209.96155,97.43672 209.66319,115.03569 206.66117,128.12237 203.42534,142.22825 195.71623,158.63843 187.74376,168.39136 185.63161,170.9752 185.63161,170.9752 197.85083,183.19208 210.07006,195.40893 210.07006,195.40893 213.01277,193.91765 216.38539,192.20851 219.59934,192.02144&#xD;&#xA;222.80052,193.34791 224.34493,193.98787 236.40251,205.63809 262.26097,231.47519 297.40871,266.59387 299.49748,268.79901 299.49748,270.78601 299.49748,272.73248 298.49419,273.89364 286.18315,286.19555 272.86885,299.5 272.86885,299.5 269.57259,299.5 266.27635,299.5 266.27635,299.5 229.41904,262.56259 199.63605,232.71484 192.41959,225.17882 191.82105,223.29967 190.84711,220.24183 191.43077,215.59724 193.08006,213.28102 194.38585,211.44725&#xD;&#xA;194.38585,211.44725 182.18903,199.23881 175.48078,192.52418 169.71622,187.13611 169.37889,187.26533 169.04157,187.39454 166.69141,188.9884 164.15633,190.80725 155.4614,197.04556 141.80219,203.23869 130.32115,206.14819 116.70577,209.59859 98.082247,210.10565 84.471163,207.39657 58.185205,202.16478 34.986361,187.16664 19.216692,165.20933 14.505785,158.64998 7.703352,145.12176 5.1901493,137.31431 1.6701889,126.3793 0.90057564,121.44359 0.57668114,107.72713&#xD;&#xA;0.24999809,93.892408 0.90468407,87.539709 3.7551594,76.885122 13.09421,41.977285 41.974752,13.096739 76.882593,3.7576866 85.578432,1.4312458 91.414232,0.5627327 100.7017,0.50330734 z" />
-                            <TextBlock Text="{Binding UIZoom, StringFormat=P0}" Margin="2, 0, 0, 0" VerticalAlignment="Center" />
+                            <StackPanel.Resources>
+                                <Style x:Key="Map" TargetType="{x:Type Run}">
+                                    <Setter Property="Text" Value="{Binding MasterInfo.AreaID, StringFormat={}{0}-, Mode=OneWay}" />
+
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding IsEventMap}" Value="True">
+                                            <Setter Property="Text" Value="E" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </StackPanel.Resources>
+
+                            <TextBlock>
+                                <Run Text="{rb:StringResource Main.Overview_Fleets_Sortie}" />:
+                            </TextBlock>
+                            <TextBlock DataContext="{Binding Map}" Margin="4, 0, 0, 0">
+                                <Run Style="{StaticResource Map}" /><Run Text="{Binding MasterInfo.AreaSubID, Mode=OneWay}" /><Run Text="{rb:EnumToStringResource Difficulty, Map_Difficulty, TargetNullValue={x:Null}}" />
+                            </TextBlock>
+
+                            <Border Margin="8, 0, 0, 0" Padding="2" Visibility="{rb:CollapsedIfNull DirectionAngle}">
+                                <Path Data="M0,0 L300,150 0,300 65,150 z" Fill="{DynamicResource ForegroundBrushKey}" Stretch="Uniform" RenderTransformOrigin=".5, .5">
+                                    <Path.RenderTransform>
+                                        <RotateTransform Angle="{Binding DirectionAngle, TargetNullValue=0}" CenterX=".5" CenterY=".5" />
+                                    </Path.RenderTransform>
+                                </Path>
+                            </Border>
+
+                            <TextBlock DataContext="{Binding Node}" Margin="4, 0, 0, 0">
+                                <TextBlock.Style>
+                                    <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+                                        <Setter Property="Text" Value="{Binding WikiID, Mode=OneWay}" />
+
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding WikiID}" Value="{x:Null}">
+                                                <Setter Property="Text" Value="{Binding ID, Mode=OneWay}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
                         </StackPanel>
                     </ruic:DropDownButton.Header>
 
-                    <StackPanel>
-                        <StackPanel.Resources>
-                            <Style TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-                                <Setter Property="Background" Value="Transparent" />
-
-                                <Setter Property="Template">
-                                    <Setter.Value>
-                                        <ControlTemplate TargetType="{x:Type Button}">
-                                            <Border Background="{TemplateBinding Background}" Padding="16, 8">
-                                                <ContentPresenter />
-                                            </Border>
-
-                                            <ControlTemplate.Triggers>
-                                                <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter Property="Background" Value="{DynamicResource ActiveBackgroundBrushKey}" />
-                                                </Trigger>
-                                            </ControlTemplate.Triggers>
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                        </StackPanel.Resources>
-
-                        <ListBox Style="{StaticResource MenuListBoxStyle}" ItemsSource="{Binding UIZoomFactors}" MinWidth="120">
-                            <ListBox.ItemTemplate>
-                                <DataTemplate>
-                                    <Button Command="{Binding Command}" CommandParameter="{Binding Zoom}">
-                                        <TextBlock Name="UIZoom" Text="{Binding Zoom, StringFormat=P0}" />
-                                    </Button>
-
-                                    <DataTemplate.Triggers>
-                                        <DataTrigger Binding="{Binding IsSelected}" Value="True">
-                                            <Setter TargetName="UIZoom" Property="FontWeight" Value="Bold" />
-                                        </DataTrigger>
-                                    </DataTemplate.Triggers>
-                                </DataTemplate>
-                            </ListBox.ItemTemplate>
-                        </ListBox>
-
-                        <Rectangle Fill="{DynamicResource HighlightBorderBrushKey}" Height="1" Margin="2" />
-
-                        <Button Command="{Binding UIZoomInCommand}">
-                            <TextBlock Text="{rb:StringResource Main.UIZoom_ZoomIn}" />
-                        </Button>
-                        <Button Command="{Binding UIZoomOutCommand}">
-                            <TextBlock Text="{rb:StringResource Main.UIZoom_ZoomOut}" />
-                        </Button>
-                    </StackPanel>
+                    <TextBlock Text="{rb:StringResource Main.SortieMap_UnderConstruction}" FontWeight="Bold" Margin="16, 8" />
                 </ruic:DropDownButton>
 
                 <ruic:BBCodeBlock BBCode="{Binding Message}" TextWrapping="NoWrap">
diff --git a/HeavenlyWind/Views/TabWindow.xaml b/HeavenlyWind/Views/TabWindow.xaml
index 8af68cbe..f33edd54 100644
--- a/HeavenlyWind/Views/TabWindow.xaml
+++ b/HeavenlyWind/Views/TabWindow.xaml
@@ -33,13 +33,7 @@
         </DockPanel>
 
         <ruic:DockableZone x:Name="DockableZone" Grid.Row="1">
-            <ruic:AdvancedTabControl x:Name="TabControl" ContentTemplateSelector="{StaticResource TabContentTemplateSelector}">
-                <ruic:AdvancedTabControl.ItemTemplate>
-                    <DataTemplate DataType="{x:Type rvm:TabItemViewModel}">
-                        <TextBlock Text="{Binding Name}" FontSize="14" />
-                    </DataTemplate>
-                </ruic:AdvancedTabControl.ItemTemplate>
-            </ruic:AdvancedTabControl>
+            <ruic:AdvancedTabControl x:Name="TabControl" ContentTemplateSelector="{StaticResource TabContentTemplateSelector}" />
         </ruic:DockableZone>
 
         <ruic:ResizeGrip Grid.Row="1" />
diff --git a/HeavenlyWind/Views/ToolCenter.xaml b/HeavenlyWind/Views/ToolCenter.xaml
index 851ce7b2..b9647e19 100644
--- a/HeavenlyWind/Views/ToolCenter.xaml
+++ b/HeavenlyWind/Views/ToolCenter.xaml
@@ -8,32 +8,14 @@
              mc:Ignorable="d"
              d:DesignWidth="300" d:DesignHeight="300">
     <ScrollViewer>
-        <StackPanel MinWidth="200" HorizontalAlignment="Center">
-            <StackPanel.Resources>
-                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-                    <Setter Property="Margin" Value="8" />
-                    <Setter Property="Padding" Value="16, 8" />
-                </Style>
-            </StackPanel.Resources>
-
-            <ItemsControl>
-                <Button Command="{Binding ShowSessionToolCommand}">
-                    <TextBlock Text="{rb:StringResource Main.SessionTool_Title}" />
-                </Button>
-                <Button Command="{Binding ShowExpeditionOverviewCommand}">
-                    <TextBlock Text="{rb:StringResource Main.Tool_ExpeditionOverview}" />
-                </Button>
-            </ItemsControl>
-
-            <ItemsControl ItemsSource="{Binding ToolPanes}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <Button Command="{Binding OpenCommand}" CommandParameter="{Binding}">
-                            <TextBlock Text="{Binding Name}" />
-                        </Button>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </StackPanel>
+        <ItemsControl ItemsSource="{Binding ToolPanes}" MinWidth="200" HorizontalAlignment="Center">
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <Button Command="{Binding OpenCommand}" CommandParameter="{Binding}" Margin="8" Padding="16, 8">
+                        <TextBlock Text="{Binding Name}" />
+                    </Button>
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
     </ScrollViewer>
 </UserControl>
diff --git a/HeavenlyWind/Views/Tools/ScreenshotToolOverlayWindow.cs b/HeavenlyWind/Views/Tools/ScreenshotToolOverlayWindow.cs
index 61eb03fc..b91778d8 100644
--- a/HeavenlyWind/Views/Tools/ScreenshotToolOverlayWindow.cs
+++ b/HeavenlyWind/Views/Tools/ScreenshotToolOverlayWindow.cs
@@ -1,4 +1,6 @@
-using Sakuno.KanColle.Amatsukaze.Services;
+using Sakuno.KanColle.Amatsukaze.Extensibility;
+using Sakuno.KanColle.Amatsukaze.Extensibility.Services;
+using Sakuno.KanColle.Amatsukaze.Services;
 using Sakuno.SystemInterop;
 using Sakuno.UserInterface;
 using System;
@@ -23,12 +25,6 @@ public void Show(Int32Rect rpRect)
         {
             var rMainWindowHandle = new WindowInteropHelper(App.Current.MainWindow).Handle;
 
-            var rZoom = BrowserService.Instance.GameController.Zoom;
-            rpRect.X = (int)(rpRect.X * rZoom * DpiUtil.ScaleX);
-            rpRect.Y = (int)(rpRect.Y * rZoom * DpiUtil.ScaleY);
-            rpRect.Width = (int)(rpRect.Width * rZoom * DpiUtil.ScaleX);
-            rpRect.Height = (int)(rpRect.Height * rZoom * DpiUtil.ScaleY);
-
             if (r_HwndSource == null)
             {
                 var rParam = new HwndSourceParameters(nameof(ScreenshotToolOverlayWindow))
@@ -46,11 +42,18 @@ public void Show(Int32Rect rpRect)
                 r_HwndSource = new HwndSource(rParam) { SizeToContent = SizeToContent.Manual, RootVisual = this };
             }
 
-            var rBrowserWindowHandle = NativeMethods.User32.GetWindow(rMainWindowHandle, NativeConstants.GetWindow.GW_CHILD);
+            var rBrowserWindowHandle = ServiceManager.GetService<IBrowserService>().Handle;
 
             NativeStructs.RECT rBrowserWindowRect;
             NativeMethods.User32.GetWindowRect(rBrowserWindowHandle, out rBrowserWindowRect);
 
+            var rHorizontalRatio = rBrowserWindowRect.Width / GameConstants.GameWidth;
+            var rVerticalRatio = rBrowserWindowRect.Height / GameConstants.GameHeight;
+            rpRect.X = (int)(rpRect.X * rHorizontalRatio);
+            rpRect.Y = (int)(rpRect.Y * rVerticalRatio);
+            rpRect.Width = (int)(rpRect.Width * rHorizontalRatio);
+            rpRect.Height = (int)(rpRect.Height * rVerticalRatio);
+
             NativeMethods.User32.SetWindowPos(r_HwndSource.Handle, IntPtr.Zero, rBrowserWindowRect.Left + rpRect.X, rBrowserWindowRect.Top + rpRect.Y, rpRect.Width, rpRect.Height, NativeEnums.SetWindowPosition.SWP_NOZORDER | NativeEnums.SetWindowPosition.SWP_NOACTIVATE | NativeEnums.SetWindowPosition.SWP_SHOWWINDOW);
         }
 
diff --git a/HeavenlyWind/Views/Tools/SessionToolWindow.xaml b/HeavenlyWind/Views/Tools/SessionToolWindow.xaml
index 4a49ef95..17eaed43 100644
--- a/HeavenlyWind/Views/Tools/SessionToolWindow.xaml
+++ b/HeavenlyWind/Views/Tools/SessionToolWindow.xaml
@@ -10,7 +10,7 @@
                   xmlns:ruic="clr-namespace:Sakuno.UserInterface.Controls;assembly=Sakuno.UserInterface"
                   mc:Ignorable="d"
                   Title="{rb:StringResource Main.SessionTool_Title}"
-                  Width="800" Height="600"
+                  Width="900" Height="600" MinWidth="640"
                   WindowPlacementPreference="{StaticResource WindowPlacementPreference}"
                   UseLayoutRounding="True">
     <ruic:MetroWindow.Resources>
@@ -49,6 +49,11 @@
         </DockPanel>
 
         <Grid Margin="8" Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition MinWidth="640" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition />
@@ -86,7 +91,7 @@
                 </CheckBox>
             </StackPanel>
 
-            <ListView ItemsSource="{Binding Sessions}" Margin="0, 4, 0, 0" Loaded="ListView_Loaded" Grid.Row="1">
+            <ListView Name="Sessions" ItemsSource="{Binding Sessions}" Margin="0, 4, 4, 0" Loaded="ListView_Loaded" Grid.Row="1">
                 <ListView.ItemContainerStyle>
                     <Style TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource {x:Type ListViewItem}}">
                         <Setter Property="Foreground" Value="{DynamicResource ActiveForegroundBrushKey}" />
@@ -107,6 +112,9 @@
                             <DataTrigger Binding="{Binding Source.State}" Value="Error">
                                 <Setter Property="Foreground" Value="Orange" />
                             </DataTrigger>
+                            <DataTrigger Binding="{Binding Source.State}" Value="Blocked">
+                                <Setter Property="Foreground" Value="Red" />
+                            </DataTrigger>
 
                             <DataTrigger Binding="{Binding Source.State}" Value="Cached">
                                 <Setter Property="Foreground" Value="Yellow" />
@@ -148,7 +156,7 @@
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
 
-                        <GridViewColumn Width="500">
+                        <GridViewColumn Width="450">
                             <TextBlock Text="{rb:StringResource Main.SessionTool_URLOrAPI}" />
 
                             <GridViewColumn.CellTemplate>
@@ -166,6 +174,37 @@
                     </GridView>
                 </ListView.View>
             </ListView>
+
+            <GridSplitter DataContext="{Binding SelectedValue.Source, ElementName=Sessions}" Width="8" HorizontalAlignment="Center" Grid.Column="1" Grid.RowSpan="2" />
+
+            <Grid DataContext="{Binding SelectedValue.Source, ElementName=Sessions}" MinWidth="150" Grid.Column="2" Grid.RowSpan="2">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="4" />
+                    <RowDefinition Height="4*" />
+                </Grid.RowDefinitions>
+                <Grid.Resources>
+                    <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
+                        <Setter Property="TextWrapping" Value="Wrap" />
+                        <Setter Property="IsReadOnly" Value="True" />
+                        <Setter Property="VerticalContentAlignment" Value="Top" />
+                        <Setter Property="HorizontalContentAlignment" Value="Left" />
+                        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+                    </Style>
+                </Grid.Resources>
+
+                <DockPanel>
+                    <TextBlock Text="Request" FontSize="14" FontWeight="Bold" Margin="0, 2" DockPanel.Dock="Top" />
+                    <TextBox Text="{Binding RequestBodyString, Mode=OneWay}" />
+                </DockPanel>
+
+                <GridSplitter Height="4" VerticalAlignment="Center" HorizontalAlignment="Stretch" Grid.Row="1" />
+
+                <DockPanel Grid.Row="2">
+                    <TextBlock Text="Response" FontSize="14" FontWeight="Bold" Margin="0, 2" DockPanel.Dock="Top" />
+                    <TextBox Text="{Binding ResponseBodyString, Mode=OneWay}" Grid.Row="4" />
+                </DockPanel>
+            </Grid>
         </Grid>
 
         <ruic:ResizeGrip Grid.Row="1" />
diff --git a/Library b/Library
index e011221c..c78e2ec2 160000
--- a/Library
+++ b/Library
@@ -1 +1 @@
-Subproject commit e011221cf7d84178bd5655ef9c9398fe156bcb86
+Subproject commit c78e2ec285f3d77322487a6b73f73b07817bb8c3