diff --git a/PokemonGo-UWP/App.xaml b/PokemonGo-UWP/App.xaml
index 7a2fe5464..3fdf6445d 100644
--- a/PokemonGo-UWP/App.xaml
+++ b/PokemonGo-UWP/App.xaml
@@ -93,10 +93,15 @@
             <utils:AchievementDescriptionTranslationConverter x:Key="AchievementDescriptionTranslationConverter" />
             <utils:WidthConverter x:Key="WidthConverter" />
             <utils:IntToBooleanConverter x:Key="IntToBooleanConverter" />
-            <utils:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
             <utils:PokemonLastHoursVisibiltyConverter x:Key="PokemonLastHoursVisibiltyConverter" />
+            <utils:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+            <utils:NegateBooleanToVisibilityConverter x:Key="NegateBooleanToVisibilityConverter"/>
+            <utils:AttackTypeTrainToVisibilityConverter x:Key="AttackTypeTrainToVisibilityConverter"/>
+            <utils:AttackTypeAttackToVisibilityConverter x:Key="AttackTypeAttackToVisibilityConverter"/>
+            <utils:PokeTypeToAsset x:Key="PokeTypeToAsset"/>
+            <utils:PokeTypeKingToVisibility x:Key="PokeTypeKingToVisibility"/>
+            <utils:PokeTypeSelectedToTeamColor x:Key="PokeTypeSelectedToTeamColor"/>
             <utils:IsIncenseActiveToPlayerIconConverter x:Key="IsIncenseActiveToPlayerIconConverter" />
-
         </ResourceDictionary>
     </Application.Resources>
 
diff --git a/PokemonGo-UWP/App.xaml.cs b/PokemonGo-UWP/App.xaml.cs
index 54fdf40f2..7dd1d9cb1 100644
--- a/PokemonGo-UWP/App.xaml.cs
+++ b/PokemonGo-UWP/App.xaml.cs
@@ -176,10 +176,10 @@ private void CatchablePokemons_CollectionChanged(object sender, NotifyCollection
         /// <param name="prelaunchActivated"></param>
         /// <returns></returns>
         public override Task OnSuspendingAsync(object s, SuspendingEventArgs e, bool prelaunchActivated)
-        {                        
+        {
             GameClient.PokemonsInventory.CollectionChanged -= PokemonsInventory_CollectionChanged;
             GameClient.CatchablePokemons.CollectionChanged -= CatchablePokemons_CollectionChanged;
-            NetworkInformation.NetworkStatusChanged -= NetworkInformationOnNetworkStatusChanged;            
+            NetworkInformation.NetworkStatusChanged -= NetworkInformationOnNetworkStatusChanged;
 
             if (SettingsService.Instance.IsBatterySaverEnabled)
                 _proximityHelper.EnableDisplayAutoOff(false);
@@ -207,7 +207,7 @@ public override async Task OnInitializeAsync(IActivatedEventArgs args)
 #if DEBUG
             // Init logger
             Logger.SetLogger(new ConsoleLogger(LogLevel.Info));
-#endif            
+#endif
             // If we have a phone contract, hide the status bar
             if (ApiInformation.IsTypePresent("Windows.UI.ViewManagement.StatusBar"))
             {
@@ -218,7 +218,7 @@ public override async Task OnInitializeAsync(IActivatedEventArgs args)
             // Enter into full screen mode
             ApplicationView.GetForCurrentView().TryEnterFullScreenMode();
             ApplicationView.GetForCurrentView().SetDesiredBoundsMode(ApplicationViewBoundsMode.UseCoreWindow);
-            ApplicationView.GetForCurrentView().FullScreenSystemOverlayMode = FullScreenSystemOverlayMode.Standard;            
+            ApplicationView.GetForCurrentView().FullScreenSystemOverlayMode = FullScreenSystemOverlayMode.Standard;
 
             // Forces the display to stay on while we play
             //_displayRequest.RequestActive();
@@ -247,10 +247,10 @@ public override async Task OnInitializeAsync(IActivatedEventArgs args)
 
             // Respond to changes in inventory and Pokemon in the immediate viscinity.
             GameClient.PokemonsInventory.CollectionChanged += PokemonsInventory_CollectionChanged;
-            GameClient.CatchablePokemons.CollectionChanged += CatchablePokemons_CollectionChanged;         
+            GameClient.CatchablePokemons.CollectionChanged += CatchablePokemons_CollectionChanged;
 
             await Task.CompletedTask;
-        }        
+        }
 
         /// <summary>
         ///
@@ -351,7 +351,7 @@ private void WindowOnVisibilityChanged(object sender, VisibilityChangedEventArgs
         #region Helpers
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="pokemonList"></param>
         /// <remarks>
diff --git a/PokemonGo-UWP/Assets/Icons/crown.png b/PokemonGo-UWP/Assets/Icons/crown.png
deleted file mode 100644
index da84a155e..000000000
Binary files a/PokemonGo-UWP/Assets/Icons/crown.png and /dev/null differ
diff --git a/PokemonGo-UWP/Assets/Icons/indicator_crown.png b/PokemonGo-UWP/Assets/Icons/indicator_crown.png
new file mode 100644
index 000000000..c30fc565c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Icons/indicator_crown.png differ
diff --git a/PokemonGo-UWP/Assets/Icons/indicator_empty.png b/PokemonGo-UWP/Assets/Icons/indicator_empty.png
new file mode 100644
index 000000000..bcc56379a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Icons/indicator_empty.png differ
diff --git a/PokemonGo-UWP/Assets/Icons/indicator_normal.png b/PokemonGo-UWP/Assets/Icons/indicator_normal.png
new file mode 100644
index 000000000..8198b8142
Binary files /dev/null and b/PokemonGo-UWP/Assets/Icons/indicator_normal.png differ
diff --git a/PokemonGo-UWP/Controls/MessageDialog/PoGoTeamSelectDialog.xaml b/PokemonGo-UWP/Controls/MessageDialog/PoGoTeamSelectDialog.xaml
new file mode 100644
index 000000000..9173bfb31
--- /dev/null
+++ b/PokemonGo-UWP/Controls/MessageDialog/PoGoTeamSelectDialog.xaml
@@ -0,0 +1,168 @@
+<UserControl
+    x:Class="PokemonGo_UWP.Controls.PoGoTeamSelectionDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:PokemonGo_UWP.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:utils="using:PokemonGo_UWP.Utils"
+    mc:Ignorable="d"
+    d:DesignHeight="300"
+    d:DesignWidth="400">
+    <UserControl.Resources>
+
+        <!--ANIMATIONS-->
+
+        <!--Fade-->
+        <Storyboard x:Name="ShowMDFadeStoryboard">
+            <DoubleAnimation
+                Storyboard.TargetName="CoverGrid"
+                Storyboard.TargetProperty="Opacity"
+                From="0"
+                To="1"
+                BeginTime="0:0:0.05"
+                Duration="0:0:0.1" />
+            <DoubleAnimation
+                Storyboard.TargetName="BackgroundRect"
+                Storyboard.TargetProperty="Opacity"
+                From="0"
+                To="0.6"
+                Duration="0:0:0.15" />
+        </Storyboard>
+
+        <Storyboard x:Name="HideMDFadeStoryboard">
+            <DoubleAnimation
+                Storyboard.TargetName="CoverGrid"
+                Storyboard.TargetProperty="Opacity"
+                From="1"
+                To="0"
+                BeginTime="0:0:0.05"
+                Duration="0:0:0.1" />
+            <DoubleAnimation
+                Storyboard.TargetName="BackgroundRect"
+                Storyboard.TargetProperty="Opacity"
+                From="0.6"
+                To="0"
+                Duration="0:0:0.15" />
+        </Storyboard>
+
+        <!--Bottom-->
+        <Storyboard x:Name="ShowMDBottomStoryboard">
+            <DoubleAnimation
+                Storyboard.TargetName="CoverGrid"
+                Storyboard.TargetProperty="Opacity"
+                From="0"
+                To="1"
+                Duration="0:0:0.1" />
+            <DoubleAnimation
+                Storyboard.TargetName="BackgroundRect"
+                Storyboard.TargetProperty="Opacity"
+                From="0"
+                To="0.6"
+                Duration="0:0:0.15" />
+            <DoubleAnimation Storyboard.TargetName="DownwardsTranslation"
+                             Storyboard.TargetProperty="Y"
+                             From="{x:Bind DownwardsTranslationRange, Mode=OneWay}"
+                             To="0"
+                             BeginTime="0:0:0.1"
+                             Duration="0:0:0.3">
+                <DoubleAnimation.EasingFunction>
+                    <CubicEase EasingMode="EaseOut" />
+                </DoubleAnimation.EasingFunction>
+            </DoubleAnimation>
+        </Storyboard>
+
+        <Storyboard x:Name="HideMDBottomStoryboard">
+            <DoubleAnimation
+                Storyboard.TargetName="CoverGrid"
+                Storyboard.TargetProperty="Opacity"
+                From="1"
+                To="0"
+                Duration="0:0:0.05"
+                BeginTime="0:0:0.25"/>
+            <DoubleAnimation
+                Storyboard.TargetName="BackgroundRect"
+                Storyboard.TargetProperty="Opacity"
+                From="0.6"
+                To="0"
+                Duration="0:0:0.15"
+                BeginTime="0:0:0.15"/>
+            <DoubleAnimation Storyboard.TargetName="DownwardsTranslation"
+                             Storyboard.TargetProperty="Y"
+                             From="0"
+                             To="{x:Bind DownwardsTranslationRange, Mode=OneWay}"
+                             Duration="0:0:0.3">
+                <DoubleAnimation.EasingFunction>
+                    <CubicEase EasingMode="EaseIn" />
+                </DoubleAnimation.EasingFunction>
+            </DoubleAnimation>
+        </Storyboard>
+    </UserControl.Resources>
+
+    <Grid x:Name="CoverGrid"
+          VerticalAlignment="Stretch"
+          HorizontalAlignment="Stretch"
+          Background="Transparent"
+          Opacity="1">
+        <Rectangle x:Name="BackgroundRect"
+                   Fill="{StaticResource PageBackgroundGradient}"
+                   Opacity="0"
+                   Visibility="{x:Bind CoverBackground, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"
+                   Tapped="Background_Tapped" />
+        <Grid x:Name="ContentGrid"
+              Style="{StaticResource GridContainer}"
+              Background="{StaticResource LightPageBackgroundGradient}"
+              HorizontalAlignment="Center"
+              VerticalAlignment="Center"
+              MaxWidth="800"
+              MinWidth="250"
+              Padding="25,25,25,0">
+            <Grid.RenderTransform>
+                <TranslateTransform Y="0" x:Name="DownwardsTranslation" />
+            </Grid.RenderTransform>
+            <StackPanel Orientation="Vertical">
+                <TextBlock Foreground="{StaticResource TitleTextColor}"
+                               Margin="0,0,0,15"
+                               Text="Pokemon Team Selection"
+                               TextAlignment="Center"
+                               TextWrapping="Wrap"
+                               FontSize="17"
+                               FontFamily="{StaticResource LatoBoldFont}"/>
+                <StackPanel Orientation="Horizontal">
+                    <StackPanel Orientation="Vertical">
+                        <Image Source="ms-appx:///Assets/Icons/ic_arena_yellow.png" Width="80" />
+                        <Button x:Name="YellowButton"
+                                Style="{StaticResource ButtonSubmit}"
+                                HorizontalAlignment="Stretch"
+                                Content="Yellow"
+                                MinWidth="80"
+                                Margin="0,25,0,0" />
+                    </StackPanel>
+                    <StackPanel Orientation="Vertical">
+                        <Image Source="ms-appx:///Assets/Icons/ic_arena_blue.png" Width="80" />
+                        <Button x:Name="BlueButton"
+                                Style="{StaticResource ButtonSubmit}"
+                                HorizontalAlignment="Stretch"
+                                Content="Blue"
+                                MinWidth="80"
+                                Margin="0,25,0,0" />
+                    </StackPanel>
+                    <StackPanel Orientation="Vertical">
+                        <Image Source="ms-appx:///Assets/Icons/ic_arena_red.png" Width="80" />
+                        <Button x:Name="RedButton"
+                                Style="{StaticResource ButtonSubmit}"
+                                HorizontalAlignment="Stretch"
+                                Content="Red"
+                                MinWidth="80"
+                                Margin="0,25,0,0" />
+                    </StackPanel>
+                </StackPanel>
+                <Button x:Name="CancelButton"
+                        Style="{StaticResource ButtonCancel}"
+                        Content="Cancel"/>
+            </StackPanel>
+
+        </Grid>
+
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/PokemonGo-UWP/Controls/MessageDialog/PoGoTeamSelectDialog.xaml.cs b/PokemonGo-UWP/Controls/MessageDialog/PoGoTeamSelectDialog.xaml.cs
new file mode 100644
index 000000000..f0ab93dee
--- /dev/null
+++ b/PokemonGo-UWP/Controls/MessageDialog/PoGoTeamSelectDialog.xaml.cs
@@ -0,0 +1,251 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Template10.Common;
+using Template10.Controls;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI;
+using Windows.UI.ViewManagement;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Automation.Peers;
+using Windows.UI.Xaml.Automation.Provider;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Markup;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Media.Animation;
+using Windows.UI.Xaml.Navigation;
+
+
+namespace PokemonGo_UWP.Controls
+{
+    public enum PoGoTeamSelectionDialogAnimation
+    {
+        None,
+        Bottom,
+        Fade
+    }
+
+    public sealed partial class PoGoTeamSelectionDialog : UserControl
+    {
+        public PoGoTeamSelectionDialog()
+        {
+            this.InitializeComponent();
+
+            YellowButton.Click += TerminalButtonClick;
+            BlueButton.Click += TerminalButtonClick;
+            RedButton.Click += TerminalButtonClick;
+            CancelButton.Click += TerminalButtonClick;
+        }
+
+        public void Show()
+        {
+            WindowWrapper.Current().Dispatcher.Dispatch(() =>
+            {
+                var modal = Window.Current.Content as ModalDialog;
+                if (modal == null)
+                {
+                    return;
+                }
+
+                _formerModalBrush = modal.ModalBackground;
+                modal.ModalBackground = new SolidColorBrush(Color.FromArgb(0, 0, 0, 0));
+                modal.ModalContent = this;
+                modal.IsModal = true;
+
+                // Subscribe to keyboard events
+                InputPane.GetForCurrentView().Showing += OnKeyboardShowing;
+                InputPane.GetForCurrentView().Hiding += OnKeyboardHiding;
+
+                // Start the animation
+                if (AnimationType == PoGoMessageDialogAnimation.Bottom)
+                {
+                    // preconditions
+                    double Ytranslation = (modal.ActualHeight / 2) + 300;
+                    DownwardsTranslationRange = Ytranslation;
+                    DownwardsTranslation.Y = Ytranslation;
+
+                    // animate
+                    Storyboard sb = this.Resources["ShowMDBottomStoryboard"] as Storyboard;
+                    sb.Begin();
+                    sb.Completed += AppearCompleted;
+                }
+                else if (AnimationType == PoGoMessageDialogAnimation.Fade)
+                {
+                    // animate
+                    Storyboard sb = this.Resources["ShowMDFadeStoryboard"] as Storyboard;
+                    sb.Begin();
+                    sb.Completed += AppearCompleted;
+                }
+            });
+        }
+
+        #region Propertys
+
+        // Internal
+        private bool _keyboardVisible = false;
+        private Brush _formerModalBrush = null;
+
+        public static readonly DependencyProperty DownwardsTranslationRangeProperty =
+            DependencyProperty.Register(nameof(DownwardsTranslationRange), typeof(Double?), typeof(PoGoMessageDialog),
+                new PropertyMetadata(0.0));
+
+        public Double? DownwardsTranslationRange
+        {
+            get { return (Double?)GetValue(DownwardsTranslationRangeProperty); }
+            set { SetValue(DownwardsTranslationRangeProperty, value); }
+        }
+
+        // Public
+
+        public static readonly DependencyProperty DialogContentProperty =
+            DependencyProperty.Register(nameof(DialogContent), typeof(Object), typeof(PoGoMessageDialog),
+                new PropertyMetadata(null));
+
+        public static readonly DependencyProperty CoverBackgroundProperty =
+            DependencyProperty.Register(nameof(CoverBackground), typeof(bool), typeof(PoGoMessageDialog), new PropertyMetadata(false));
+
+        public Object DialogContent
+        {
+            get { return (Object)GetValue(DialogContentProperty); }
+            set { SetValue(DialogContentProperty, value); }
+        }
+
+        public bool CoverBackground
+        {
+            get { return (bool)GetValue(CoverBackgroundProperty); }
+            set {
+                if(value)
+                {
+                    CoverGrid.Background = new SolidColorBrush((Color)XamlBindingHelper.ConvertValue(typeof(Windows.UI.Color), "#55000000"));
+                } else
+                {
+                    CoverGrid.Background = new SolidColorBrush((Color)XamlBindingHelper.ConvertValue(typeof(Windows.UI.Color), "Transparent"));
+                }
+                SetValue(CoverBackgroundProperty, value);
+            }
+        }
+
+        private bool _backgroundTapInvokesCancel;
+        public bool BackgroundTapInvokesCancel
+        {
+            get { return _backgroundTapInvokesCancel; }
+            set { _backgroundTapInvokesCancel = value; }
+        }
+
+        public PoGoMessageDialogAnimation AnimationType { get; set; }
+
+        #endregion
+
+        #region Events
+
+        public event RoutedEventHandler YellowInvoked
+        {
+            add { YellowButton.Click += value; }
+            remove { YellowButton.Click -= value; }
+        }
+
+        public event RoutedEventHandler BlueInvoked
+        {
+            add { BlueButton.Click += value; }
+            remove { BlueButton.Click -= value; }
+        }
+
+        public event RoutedEventHandler RedInvoked
+        {
+            add { RedButton.Click += value; }
+            remove { RedButton.Click -= value; }
+        }
+
+        public event RoutedEventHandler CancelInvoked
+        {
+            add { CancelButton.Click += value; }
+            remove { CancelButton.Click -= value; }
+        }
+
+        public event EventHandler<object> AppearCompleted;
+        public event EventHandler<object> DisappearCompleted;
+
+        private void Background_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            if(_backgroundTapInvokesCancel && !_keyboardVisible)
+            {
+                ButtonAutomationPeer peer = new ButtonAutomationPeer(CancelButton);
+                IInvokeProvider invokeProv = peer.GetPattern(PatternInterface.Invoke) as IInvokeProvider;
+                invokeProv.Invoke();
+            }
+        }
+
+        private void TerminalButtonClick(object sender, RoutedEventArgs e)
+        {
+            WindowWrapper.Current().Dispatcher.Dispatch(() =>
+            {
+                var modal = Window.Current.Content as ModalDialog;
+                if (modal == null)
+                {
+                    return;
+                }
+
+                // Start the animation
+                if (AnimationType == PoGoMessageDialogAnimation.Bottom)
+                {
+                    // preconditions
+                    double Ytranslation = (modal.ActualHeight / 2) + 300;
+                    DownwardsTranslationRange = Ytranslation;
+                    DownwardsTranslation.Y = Ytranslation;
+
+                    // animate
+                    Storyboard sb = this.Resources["HideMDBottomStoryboard"] as Storyboard;
+                    sb.Begin();
+                    sb.Completed += Cleanup;
+                    sb.Completed += DisappearCompleted;
+                }
+                else if (AnimationType == PoGoMessageDialogAnimation.Fade)
+                {
+                    // animate
+                    Storyboard sb = this.Resources["HideMDFadeStoryboard"] as Storyboard;
+                    sb.Begin();
+                    sb.Completed += Cleanup;
+                    sb.Completed += DisappearCompleted;
+                } else
+                {
+                    Cleanup(this, this);
+                }
+            });
+        }
+
+        private void OnKeyboardShowing(InputPane sender, InputPaneVisibilityEventArgs args)
+        {
+            _keyboardVisible = true;
+        }
+
+        private void OnKeyboardHiding(InputPane sender, InputPaneVisibilityEventArgs args)
+        {
+            _keyboardVisible = false;
+        }
+
+        private void Cleanup(object sender, object e)
+        {
+            // Unsubscribe from keyboard events
+            InputPane.GetForCurrentView().Showing -= OnKeyboardShowing;
+            InputPane.GetForCurrentView().Hiding -= OnKeyboardHiding;
+
+            var modal = Window.Current.Content as ModalDialog;
+            if (modal == null)
+            {
+                return;
+            }
+
+            modal.ModalBackground = _formerModalBrush;
+            modal.ModalContent = null;
+            modal.IsModal = false;
+        }
+
+        #endregion
+    }
+}
diff --git a/PokemonGo-UWP/Controls/OutdoorBackground.xaml.cs b/PokemonGo-UWP/Controls/OutdoorBackground.xaml.cs
index ec75891fe..5bbb43bbf 100644
--- a/PokemonGo-UWP/Controls/OutdoorBackground.xaml.cs
+++ b/PokemonGo-UWP/Controls/OutdoorBackground.xaml.cs
@@ -36,8 +36,8 @@ public OutdoorBackground()
                 DayPic.Visibility = Visibility.Collapsed;
                 NightPic.Visibility =  Visibility.Visible;
             }
-            
         }
+
         private Windows.UI.Color ColorFromString(string hex)
         {
             hex = hex.Replace("#", string.Empty);
diff --git a/PokemonGo-UWP/Entities/FortDataWrapper.cs b/PokemonGo-UWP/Entities/FortDataWrapper.cs
index 3fab2ce18..43f30ee19 100644
--- a/PokemonGo-UWP/Entities/FortDataWrapper.cs
+++ b/PokemonGo-UWP/Entities/FortDataWrapper.cs
@@ -18,7 +18,7 @@
 using POGOProtos.Inventory.Item;
 
 namespace PokemonGo_UWP.Entities
-{    
+{
     public class FortDataWrapper : IUpdatable<FortData>, INotifyPropertyChanged
     {
         [JsonProperty, JsonConverter(typeof(ProtobufJsonNetConverter))]
@@ -93,6 +93,10 @@ public void Update(FortData update)
         {
             _fortData = update;
 
+            Update();
+        }
+        public void Update()
+        {
             OnPropertyChanged(nameof(FortDataStatus));
             OnPropertyChanged(nameof(Id));
             OnPropertyChanged(nameof(Type));
@@ -134,6 +138,60 @@ public void UpdateCooldown(long newCooldownTimestampMs)
 
         public long GymPoints => _fortData.GymPoints;
 
+        public int GymMaxPoints
+        {
+            get
+            {
+                var gp = GymPoints;
+                if (gp < 2000)
+                    return 2000;
+                else if (gp < 4000)
+                    return 4000;
+                else if (gp < 8000)
+                    return 8000;
+                else if (gp < 12000)
+                    return 12000;
+                else if (gp < 16000)
+                    return 16000;
+                else if (gp < 20000)
+                    return 20000;
+                else if (gp < 30000)
+                    return 30000;
+                else if (gp < 40000)
+                    return 40000;
+                else
+                    return 50000;
+            }
+        }
+
+        public int GymLevel
+        {
+            get
+            {
+                var gp = GymPoints;
+                if (gp < 2000)
+                    return 1;
+                else if (gp < 4000)
+                    return 2;
+                else if (gp < 8000)
+                    return 3;
+                else if (gp < 12000)
+                    return 4;
+                else if (gp < 16000)
+                    return 5;
+                else if (gp < 20000)
+                    return 6;
+                else if (gp < 30000)
+                    return 7;
+                else if (gp < 40000)
+                    return 8;
+                else if (gp < 50000)
+                    return 9;
+                else
+                    return 10;
+            }
+        }
+
         public string Id => _fortData.Id;
 
         public bool IsInBattle => _fortData.IsInBattle;
diff --git a/PokemonGo-UWP/Entities/GymMembershipWrapper.cs b/PokemonGo-UWP/Entities/GymMembershipWrapper.cs
new file mode 100644
index 000000000..fc71d9072
--- /dev/null
+++ b/PokemonGo-UWP/Entities/GymMembershipWrapper.cs
@@ -0,0 +1,88 @@
+using System;
+using System.ComponentModel;
+using Windows.Devices.Geolocation;
+using Windows.Foundation;
+using Windows.Storage;
+using Google.Protobuf;
+using PokemonGo.RocketAPI.Extensions;
+using PokemonGo_UWP.Utils;
+using PokemonGo_UWP.Utils.Game;
+using PokemonGo_UWP.Utils.Helpers;
+using PokemonGo_UWP.Views;
+using POGOProtos.Enums;
+using POGOProtos.Map.Fort;
+using Template10.Common;
+using Template10.Mvvm;
+using Google.Protobuf.Collections;
+using Newtonsoft.Json;
+using POGOProtos.Inventory.Item;
+using POGOProtos.Data.Gym;
+using POGOProtos.Data.Player;
+
+namespace PokemonGo_UWP.Entities
+{
+    [Flags]
+    public enum GymPokeType
+    {
+       Empty = 1,
+       Normal = 2,
+       King = 4
+    }
+
+    public class GymMembershipWrapper : INotifyPropertyChanged
+    {
+        [JsonProperty, JsonConverter(typeof(ProtobufJsonNetConverter))]
+        private GymMembership _gymMembership;
+        private PokemonDataWrapper _pokemonData;
+        private bool _selected;
+
+        public GymMembershipWrapper()
+        {
+        }
+
+
+        public GymMembershipWrapper(GymMembership gymMembership)
+        {
+            _gymMembership = gymMembership;
+            _pokemonData = new PokemonDataWrapper(_gymMembership.PokemonData);
+        }
+
+        #region Wrapped Properties
+
+        public PokemonId PokemonId => _pokemonData.PokemonId;
+        public int PokemonCp => _pokemonData.Cp;
+        public string PokemonName => _pokemonData.Name;
+        public int PokemonDefendedCount => _pokemonData.BattlesDefended;
+
+
+        public string PlayerName => _gymMembership.TrainerPublicProfile.Name;
+        public int PlayerLevel => _gymMembership.TrainerPublicProfile.Level;
+        public PlayerAvatar PlayerAvatar => _gymMembership.TrainerPublicProfile.Avatar;
+
+
+        public GymPokeType PokeType { get; set; }
+
+        public bool Selected {
+            get { return _selected; }
+            set
+            {
+                _selected = value;
+                OnPropertyChanged(nameof(Selected));
+            }
+        }
+
+        #endregion
+
+
+        #region INotifyPropertyChanged
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void OnPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PokemonGo-UWP/PokemonGo-UWP.csproj b/PokemonGo-UWP/PokemonGo-UWP.csproj
index 7a70bc9ba..0ab566446 100644
--- a/PokemonGo-UWP/PokemonGo-UWP.csproj
+++ b/PokemonGo-UWP/PokemonGo-UWP.csproj
@@ -214,7 +214,6 @@
     <Content Include="Assets\Candy\Water.png" />
     <Content Include="Assets\Icons\circle_255_filled_01.png" />
     <Content Include="Assets\Icons\CompassIcon.png" />
-    <Content Include="Assets\Icons\crown.png" />
     <Content Include="Assets\Icons\Footprint_Far.png" />
     <Content Include="Assets\Icons\Footprint_Mid.png" />
     <Content Include="Assets\Icons\Footprint_Near.png" />
@@ -237,6 +236,9 @@
     <Content Include="Assets\Icons\ic_name.png" />
     <Content Include="Assets\Icons\ic_number.png" />
     <Content Include="Assets\Icons\ic_store.png" />
+    <Content Include="Assets\Icons\indicator_crown.png" />
+    <Content Include="Assets\Icons\indicator_empty.png" />
+    <Content Include="Assets\Icons\indicator_normal.png" />
     <Content Include="Assets\Icons\pokestop_far.png" />
     <Content Include="Assets\Icons\pokestop_far_inactive.png" />
     <Content Include="Assets\Icons\pokestop_far_inactive_lured.png" />
@@ -749,6 +751,9 @@
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\ArcProgressBar.cs" />
+    <Compile Include="Controls\MessageDialog\PoGoTeamSelectDialog.xaml.cs">
+      <DependentUpon>PoGoTeamSelectDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\MessageDialog\PoGoMessageDialog.xaml.cs">
       <DependentUpon>PoGoMessageDialog.xaml</DependentUpon>
     </Compile>
@@ -768,6 +773,7 @@
       <DependentUpon>PoGoPivotHeader.xaml</DependentUpon>
     </Compile>
     <Compile Include="Entities\FortDataWrapper.cs" />
+    <Compile Include="Entities\GymMembershipWrapper.cs" />
     <Compile Include="Entities\IMapPokemon.cs" />
     <Compile Include="Entities\AppliedItemWrapper.cs" />
     <Compile Include="Entities\IncensePokemon.cs" />
@@ -946,6 +952,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Page Include="Controls\MessageDialog\PoGoTeamSelectDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Controls\MessageDialog\PoGoMessageDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/PokemonGo-UWP/Utils/Game/Converters.cs b/PokemonGo-UWP/Utils/Game/Converters.cs
index 9b299ecba..4dde9fe5a 100644
--- a/PokemonGo-UWP/Utils/Game/Converters.cs
+++ b/PokemonGo-UWP/Utils/Game/Converters.cs
@@ -28,6 +28,9 @@
 using Windows.Foundation;
 using Windows.Services.Maps;
 using System.Threading.Tasks;
+using PokemonGo_UWP.ViewModels;
+using Cimbalino.Toolkit.Converters;
+using System.Globalization;
 
 namespace PokemonGo_UWP.Utils
 {
@@ -790,9 +793,36 @@ public class PlayerTeamToTeamColorBrushConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, string language)
         {
             var teamColor = (TeamColor)value;
-            return new SolidColorBrush(teamColor == TeamColor.Neutral
-                ? Color.FromArgb(255, 26, 237, 213)
-                : teamColor == TeamColor.Blue ? Color.FromArgb(255, 40, 89, 237) : teamColor == TeamColor.Red ? Color.FromArgb(255, 237, 90, 90) : Color.FromArgb(255, 254, 196, 50));
+            Color color;
+            switch (teamColor)
+            {
+                case TeamColor.Neutral:
+                    color = Color.FromArgb(255, 26, 237, 213);
+                    break;
+                case TeamColor.Blue:
+                    color = Color.FromArgb(255, 40, 89, 237);
+                    break;
+                case TeamColor.Red:
+                    color = Color.FromArgb(255, 237, 90, 90);
+                    break;
+                case TeamColor.Yellow:
+                    color = Color.FromArgb(255, 254, 196, 50);
+                    break;
+                default:
+                    color = Color.FromArgb(255, 0, 0, 0);
+                    break;
+            }
+            if ("light".Equals(parameter))
+            {
+                if (teamColor == TeamColor.Blue)
+                {
+                    color.R = (byte)Math.Min(255, color.R * 2.4);
+                    color.G = (byte)Math.Min(255, color.G * 2);
+                    color.B = (byte)Math.Min(255, color.B * 2.4);
+                }
+                // No problem for other colors
+            }
+            return new SolidColorBrush(color);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language)
@@ -1587,7 +1617,7 @@ public object Convert(object value, Type targetType, object parameter, string la
                 case TeamColor.Blue:
                     return new Uri(resourceUriString + "_blue.png");
                 case TeamColor.Neutral:
-                    return new Uri(resourceUriString + ".png");
+                    return new Uri(resourceUriString + "_neutral.png");
                 default:
                     throw new ArgumentOutOfRangeException();
             }
@@ -1949,7 +1979,7 @@ public object Convert(object value, Type targetType, object parameter, string la
             var res = ((size.Width - externalMargin) / minColumns) - internalMargin;
 
             //https://msdn.microsoft.com/en-us/windows/uwp/layout/design-and-ui-intro#effective-pixels-and-scaling
-            var width = ((int)res / 4) * 4; //round to 4 - win 10 optimized 
+            var width = ((int)res / 4) * 4; //round to 4 - win 10 optimized
             return width;
         }
 
@@ -2035,23 +2065,94 @@ public class BooleanToVisibilityConverter : IValueConverter
     {
         #region Implementation of IValueConverter
 
-        private object GetVisibility(object value, bool invert)
+        private object GetVisibility(object value)
         {
             if (!(value is bool))
                 return Visibility.Collapsed;
             bool objValue = (bool)value;
-            if (objValue ^ invert)
+            if (!objValue)
             {
+                return Visibility.Collapsed;
+            }
+            return Visibility.Visible;
+        }
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            return GetVisibility(value);
+        }
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+    }
+
+
+    public class NegateBooleanToVisibilityConverter : IValueConverter
+    {
+        #region Implementation of IValueConverter
+
+        private object GetVisibility(object value)
+        {
+            if (!(value is bool))
                 return Visibility.Visible;
+            bool objValue = (bool)value;
+            if (objValue)
+            {
+                return Visibility.Collapsed;
             }
-            return Visibility.Collapsed;
+            return Visibility.Visible;
         }
         public object Convert(object value, Type targetType, object parameter, string language)
         {
-            bool invert = false;
-            Boolean.TryParse((string)parameter, out invert);
+            return GetVisibility(value);
+        }
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+    }
+
+    public class AttackTypeTrainToVisibilityConverter : IValueConverter
+    {
+        #region Implementation of IValueConverter
+
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (!(value is AttackType))
+                return Visibility.Collapsed;
+
+            AttackType objValue = (AttackType)value;
+            if (objValue == AttackType.Train)
+                return Visibility.Visible;
+            else
+                return Visibility.Collapsed;
+        }
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+    }
 
-            return GetVisibility(value, invert);
+    public class AttackTypeAttackToVisibilityConverter : IValueConverter
+    {
+        #region Implementation of IValueConverter
+
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (!(value is AttackType))
+                return Visibility.Collapsed;
+
+            AttackType objValue = (AttackType)value;
+            if (objValue == AttackType.Attack)
+                return Visibility.Visible;
+            else
+                return Visibility.Collapsed;
         }
         public object ConvertBack(object value, Type targetType, object parameter, string language)
         {
@@ -2102,4 +2203,100 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
 
         #endregion
     }
-}
+    public class PokeTypeToAsset : IValueConverter
+    {
+        #region Implementation of IValueConverter
+
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var poketype = (GymPokeType)value;
+
+            if (poketype.HasFlag(GymPokeType.Empty))
+                return new Uri("ms-appx:///Assets/Icons/indicator_empty.png");
+            else if (poketype.HasFlag(GymPokeType.Normal))
+                return new Uri("ms-appx:///Assets/Icons/indicator_normal.png");
+            else if (poketype.HasFlag(GymPokeType.King))
+                return new Uri("ms-appx:///Assets/Icons/indicator_crown.png");
+            else
+                return new Uri("");
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+        #endregion
+    }
+
+    public class PokeTypeKingToVisibility : IValueConverter
+    {
+        #region Implementation of IValueConverter
+
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var poketype = (GymPokeType)value;
+            if (poketype.HasFlag(GymPokeType.King))
+                return Visibility.Visible;
+            else
+                return Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+        #endregion
+    }
+
+    public class PokeTypeSelectedToTeamColor : MultiValueConverterBase
+    {
+        public override object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values == null)
+                return Colors.White;
+
+            bool selected;
+            if (values[0] == null)
+                selected = false;
+            else
+                selected = (bool)values[0];
+
+            TeamColor teamcolor;
+            if (values[1] == null)
+                teamcolor = TeamColor.Neutral;
+            else
+                teamcolor = (TeamColor)values[1];
+
+            Color color;
+            if (selected)
+            {
+                switch (teamcolor)
+                {
+                    case TeamColor.Neutral:
+                        color = Color.FromArgb(255, 26, 237, 213);
+                        break;
+                    case TeamColor.Blue:
+                        color = Color.FromArgb(255, 40, 89, 237);
+                        break;
+                    case TeamColor.Red:
+                        color = Color.FromArgb(255, 237, 90, 90);
+                        break;
+                    case TeamColor.Yellow:
+                        color = Color.FromArgb(255, 254, 196, 50);
+                        break;
+                    default:
+                        color = Color.FromArgb(255, 0, 0, 0);
+                        break;
+                }
+                return new SolidColorBrush(color);
+            }
+            else
+                return new SolidColorBrush(Colors.White);
+        }
+
+        public override object[] ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PokemonGo-UWP/Utils/GameClient.cs b/PokemonGo-UWP/Utils/GameClient.cs
index 65a319f73..65bfd1213 100644
--- a/PokemonGo-UWP/Utils/GameClient.cs
+++ b/PokemonGo-UWP/Utils/GameClient.cs
@@ -724,7 +724,7 @@ private static async Task UpdateMapObjects()
                 .ToArray();
             Logger.Write($"Found {newGyms.Length} nearby Gyms");
             // For now, we do not show the gyms on the map, as they are not complete yet. Code remains, so we can still work on it.
-            //NearbyGyms.UpdateWith(newGyms, x => new FortDataWrapper(x), (x, y) => x.Id == y.Id);
+            NearbyGyms.UpdateWith(newGyms, x => new FortDataWrapper(x), (x, y) => x.Id == y.Id);
 
             // Update LuredPokemon
             var newLuredPokemon = newPokeStops.Where(item => item.LureInfo != null).Select(item => new LuredPokemon(item.LureInfo, item.Latitude, item.Longitude)).ToArray();
@@ -896,6 +896,15 @@ public static async Task<GetInventoryResponse> GetInventory()
             return await _client.Inventory.GetInventory();
         }
 
+        /// <summary>
+        ///     Gets player's inventoryDelta
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<SetPlayerTeamResponse> SetPlayerTeam(TeamColor color)
+        {
+            return await _client.Player.SetPlayerTeam(color);
+        }
+
         /// <summary>
         ///     Gets the rewards after leveling up
         /// </summary>
@@ -1180,7 +1189,7 @@ public static async Task<AddFortModifierResponse> AddFortModifier(string pokesto
         #region Gym Handling
 
         /// <summary>
-        ///     Gets the details for the given Gym
+        /// Gets the details for the given Gym
         /// </summary>
         /// <param name="gymid"></param>
         /// <param name="latitude"></param>
@@ -1191,11 +1200,52 @@ public static async Task<GetGymDetailsResponse> GetGymDetails(string gymid, doub
             return await _client.Fort.GetGymDetails(gymid, latitude, longitude);
         }
 
-        /// The following _client.Fort methods need implementation:
-        /// FortDeployPokemon
-        /// FortRecallPokemon
-        /// StartGymBattle
-        /// AttackGym
+        /// <summary>
+        /// Deploy Pokemon to stay in the gym for its defending
+        /// </summary>
+        /// <param name="gymid"></param>
+        /// <param name="pokemonId"></param>
+        /// <returns></returns>
+        public static async Task<FortDeployPokemonResponse> FortDeployPokemon(string gymid, ulong pokemonId)
+        {
+            return await _client.Fort.FortDeployPokemon(gymid, pokemonId);
+        }
+
+        /// <summary>
+        /// Recall pokemon from the battle in the gym
+        /// </summary>
+        /// <param name="gymid"></param>
+        /// <param name="pokemonId"></param>
+        /// <returns></returns>
+        public static async Task<FortRecallPokemonResponse> FortRecallPokemon(string gymid, ulong pokemonId)
+        {
+            return await _client.Fort.FortRecallPokemon(gymid, pokemonId);
+        }
+
+        /// <summary>
+        /// Start the Gym Battle
+        /// </summary>
+        /// <param name="gymid"></param>
+        /// <param name="defendingPokemonId"></param>
+        /// <param name="attackingPokemonIds"></param>
+        /// <returns></returns>
+        public static async Task<StartGymBattleResponse> StartGymBattle(string gymid, ulong defendingPokemonId, IEnumerable<ulong> attackingPokemonIds)
+        {
+            return await _client.Fort.StartGymBattle(gymid, defendingPokemonId, attackingPokemonIds);
+        }
+
+        /// <summary>
+        /// Attacks the Gym (sends list of BattleAction to get processed in the fight)
+        /// </summary>
+        /// <param name="gymid"></param>
+        /// <param name="battleId"></param>
+        /// <param name="battleActions"></param>
+        /// <param name="lastRetrievedAction"></param>
+        /// <returns></returns>
+        public static async Task<AttackGymResponse> AttackGym(string gymid, string battleId, List<POGOProtos.Data.Battle.BattleAction> battleActions, POGOProtos.Data.Battle.BattleAction lastRetrievedAction)
+        {
+            return await _client.Fort.AttackGym(gymid, battleId, battleActions, lastRetrievedAction);
+        }
 
         #endregion
 
@@ -1278,4 +1328,4 @@ public static async Task<VerifyChallengeResponse> VerifyChallenge(string token)
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/PokemonGo-UWP/ViewModels/EnterGymPageViewModel.cs b/PokemonGo-UWP/ViewModels/EnterGymPageViewModel.cs
index 835926352..543e8fb91 100644
--- a/PokemonGo-UWP/ViewModels/EnterGymPageViewModel.cs
+++ b/PokemonGo-UWP/ViewModels/EnterGymPageViewModel.cs
@@ -15,9 +15,20 @@
 using Template10.Services.NavigationService;
 using Newtonsoft.Json;
 using Google.Protobuf;
+using POGOProtos.Data.Gym;
+using Windows.UI.Popups;
+using POGOProtos.Enums;
+using PokemonGo_UWP.Controls;
 
 namespace PokemonGo_UWP.ViewModels
 {
+    public enum AttackType
+    {
+        None,
+        Train,
+        Attack
+    }
+
     public class EnterGymPageViewModel : ViewModelBase
     {
         #region Lifecycle Handlers
@@ -36,18 +47,19 @@ public override async Task OnNavigatedToAsync(object parameter, NavigationMode m
                 // Recovering the state
                 CurrentGym = JsonConvert.DeserializeObject<FortDataWrapper>((string)suspensionState[nameof(CurrentGym)]);
                 CurrentGymInfo = JsonConvert.DeserializeObject<GetGymDetailsResponse>((string)suspensionState[nameof(CurrentGymInfo)]);
-                CurrentEnterResponse = JsonConvert.DeserializeObject<GetGymDetailsResponse>((string)suspensionState[nameof(CurrentEnterResponse)]);
+                CurrentMembers = GetCurrentMembers(CurrentGymInfo);
+                CurrentMembersIndicators = SetCurrentMembersIndicators(CurrentMembers);
+                SelectedMember = CurrentMembers.FirstOrDefault();
+                UpdateBindableData();
             }
             else
             {
-                // Navigating from game page, so we need to actually load the Gym
-                Busy.SetBusy(true, "Loading Gym");
                 CurrentGym = (FortDataWrapper)NavigationHelper.NavigationState[nameof(CurrentGym)];
                 NavigationHelper.NavigationState.Remove(nameof(CurrentGym));
-                Logger.Write($"Entering {CurrentGym.Id}");
-                CurrentGymInfo =
-                    await GameClient.GetGymDetails(CurrentGym.Id, CurrentGym.Latitude, CurrentGym.Longitude);
-                Busy.SetBusy(false);
+
+                await CalculateGymData(CurrentGym);
+
+                CheckPlayerTeamSelection();
             }
         }
 
@@ -63,7 +75,6 @@ public override async Task OnNavigatedFromAsync(IDictionary<string, object> susp
             {
                 suspensionState[nameof(CurrentGym)] = JsonConvert.SerializeObject(CurrentGym);
                 suspensionState[nameof(CurrentGymInfo)] = JsonConvert.SerializeObject(CurrentGymInfo);
-                suspensionState[nameof(CurrentEnterResponse)] = JsonConvert.SerializeObject(CurrentEnterResponse);
             }
             await Task.CompletedTask;
         }
@@ -78,20 +89,20 @@ public override async Task OnNavigatingFromAsync(NavigatingEventArgs args)
 
         #region Game Management Vars
 
-        /// <summary>
-        ///     Gym that the user is visiting
-        /// </summary>
         private FortDataWrapper _currentGym;
 
-        /// <summary>
-        ///     Infos on the current Gym
-        /// </summary>
         private GetGymDetailsResponse _currentGymInfo;
 
-        /// <summary>
-        ///     Results of the current Gym enter
-        /// </summary>
-        private GetGymDetailsResponse _currentEnterResponse;
+        private ObservableCollection<GymMembershipWrapper> _currentMembers;
+        private ObservableCollection<GymMembershipWrapper> _currentMembersIndicators;
+        private GymMembershipWrapper _selectedMember;
+
+        private AttackType _AtckType = AttackType.None;
+        private bool _notLvl5Yet = true;
+        private bool _canDeploy = false;
+        private bool _notInRange = true;
+        private bool _isEnabled = false;
+
 
         #endregion
 
@@ -115,107 +126,269 @@ public GetGymDetailsResponse CurrentGymInfo
             set { Set(ref _currentGymInfo, value); }
         }
 
-        /// <summary>
-        ///     Results of the current Gym enter
-        /// </summary>
-        public GetGymDetailsResponse CurrentEnterResponse
+        public ObservableCollection<GymMembershipWrapper> CurrentMembers
+        {
+            get { return _currentMembers; }
+            set { Set(ref _currentMembers, value); }
+        }
+
+        public ObservableCollection<GymMembershipWrapper> CurrentMembersIndicators
+        {
+            get { return _currentMembersIndicators; }
+            set { Set(ref _currentMembersIndicators, value); }
+        }
+
+        public GymMembershipWrapper SelectedMember
         {
-            get { return _currentEnterResponse; }
-            set { Set(ref _currentEnterResponse, value); }
+            get { return _selectedMember; }
+            set { Set(ref _selectedMember, value); }
+        }
+
+        public AttackType AtckType
+        {
+            get { return _AtckType; }
+            set { Set(ref _AtckType, value); }
+        }
+
+        public bool NotLvl5Yet
+        {
+            get { return _notLvl5Yet; }
+            set { Set(ref _notLvl5Yet, value); }
+        }
+
+        public bool CanDeploy
+        {
+            get { return _canDeploy; }
+            set { Set(ref _canDeploy, value); }
+        }
+
+        public bool NotInRange
+        {
+            get { return _notInRange; }
+            set { Set(ref _notInRange, value); }
+        }
+
+        public bool IsEnabled
+        {
+            get { return _isEnabled; }
+            set { Set(ref _isEnabled, value); }
         }
 
         #endregion
 
         #region Game Logic
 
-        #region Shared Logic
-
         private DelegateCommand _returnToGameScreen;
 
-        /// <summary>
-        ///     Going back to map page
-        /// </summary>
-        public DelegateCommand ReturnToGameScreen => _returnToGameScreen ?? (
-            _returnToGameScreen =
-                new DelegateCommand(
-                    () => { NavigationService.Navigate(typeof(GameMapPage), GameMapNavigationModes.GymUpdate); },
-                    () => true)
-            );
+        public DelegateCommand ReturnToGameScreen =>
+            _returnToGameScreen ?? ( _returnToGameScreen = new DelegateCommand( () =>
+            {
+                NavigationService.Navigate(typeof(GameMapPage), GameMapNavigationModes.GymUpdate);
+            },() => true));
 
-        private DelegateCommand _abandonGym;
+        private ObservableCollection<GymMembershipWrapper> GetCurrentMembers(GetGymDetailsResponse currentGymInfo) =>
+            new ObservableCollection<GymMembershipWrapper>(
+                currentGymInfo.GymState.Memberships.Select(m => new GymMembershipWrapper(m)));
 
-        /// <summary>
-        ///     Going back to map page
-        /// </summary>
-        public DelegateCommand AbandonGym => _abandonGym ?? (
-            _abandonGym = new DelegateCommand(() =>
+        private ObservableCollection<GymMembershipWrapper> SetCurrentMembersIndicators(ObservableCollection<GymMembershipWrapper> members)
+        {
+            //Set empty slots
+            var emptyCount = CurrentGym.GymLevel - members.Count;
+            List<GymMembershipWrapper> indicators =
+                Enumerable.Repeat<GymMembershipWrapper>(
+                    new GymMembershipWrapper() { PokeType = GymPokeType.Empty }, emptyCount).ToList();
+
+            //Set members as normal
+            foreach(var member in members)
+                member.PokeType = GymPokeType.Normal;
+
+            if (members.Count > 0)
             {
-                // Re-enable update timer
-                GameClient.ToggleUpdateTimer();
-                NavigationService.GoBack();
-            }, () => true)
-            );
+                //Rewrite last as king
+                members[members.Count - 1].PokeType = GymPokeType.King;
+                //Set first member as selected
+                members[0].Selected = true; //set
+            }
 
-        #endregion
+            indicators.AddRange(members);
 
-        #region Gym Handling
+            return new ObservableCollection<GymMembershipWrapper>(indicators);
+        }
 
-        #region Gym Events
+        private async Task CalculateGymData(FortDataWrapper currentGym)
+        {
+            // Navigating from game page, so we need to actually load the Gym
+            Busy.SetBusy(true, "Loading Gym");
+            var response = await GameClient.GetGymDetails(currentGym.Id, currentGym.Latitude, currentGym.Longitude);
+            Logger.Write($"Entering {response.Name} [ID = {CurrentGym.Id}]");
+            Busy.SetBusy(false);
+            switch (response.Result)
+            {
+                case GetGymDetailsResponse.Types.Result.Unset:
+                    Logger.Write("Entering Gym Unset", LogLevel.Warning);
+                    ReturnToGameScreen.Execute();
+                    break;
+                case GetGymDetailsResponse.Types.Result.Success:
+                    // Success, we play the animation and update inventory
+                    Logger.Write("Entering Gym success");
+                    CurrentGym = new FortDataWrapper(response.GymState.FortData);
+                    CurrentGymInfo = response;
+                    await GameClient.UpdateInventory();
+                    CurrentMembers = GetCurrentMembers(CurrentGymInfo);
+                    CurrentMembersIndicators = SetCurrentMembersIndicators(CurrentMembers);
+                    SelectedMember = CurrentMembers.FirstOrDefault();
+                    UpdateBindableData();
+                    break;
+                case GetGymDetailsResponse.Types.Result.ErrorNotInRange:
+                    Logger.Write("Entering Gym out of range");
+                    var dialog2 = new MessageDialog("Gym is completely out of range");
+                    await dialog2.ShowAsync();
+                    ReturnToGameScreen.Execute();
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(response.Result), "GetGymDetails result enum had something undefined");
+            }
+        }
 
-        /// <summary>
-        ///     Event fired if the user was able to enter the Gym
-        /// </summary>
-        public event EventHandler EnterSuccess;
+        private void UpdateBindableData()
+        {
+            var AmIPresent = CurrentMembers.Where(cm => cm.PlayerName == GameClient.PlayerProfile.Username).FirstOrDefault() != null;
+            var AmINeutralTeam = GameClient.PlayerProfile.Team == TeamColor.Neutral;
+            var HasSpace = CurrentGym.GymLevel > CurrentMembers.Count;
+            var IsTeamOk = CurrentGym.OwnedByTeam == TeamColor.Neutral ? true : CurrentGym.OwnedByTeam == GameClient.PlayerProfile.Team;
+
+            NotLvl5Yet = GameClient.PlayerStats?.Level < 5;
+            CanDeploy = !AmINeutralTeam && IsTeamOk && HasSpace && !AmIPresent;
+            NotInRange = CurrentGym.FortDataStatus == Utils.Game.FortDataStatus.Closed;
+            IsEnabled = !NotInRange && !NotLvl5Yet;
+
+            if (CurrentGym.OwnedByTeam == TeamColor.Neutral)
+                AtckType = AttackType.None;
+            else if (CurrentGym.OwnedByTeam == GameClient.PlayerProfile.Team)
+                AtckType = AttackType.Train;
+            else
+                AtckType = AttackType.Attack;
 
-        /// <summary>
-        ///     Event fired if the user tried to enter a Gym which is out of range
-        /// </summary>
-        public event EventHandler EnterOutOfRange;
+            DeployPokemon.RaiseCanExecuteChanged();
+            StartBattle.RaiseCanExecuteChanged();
+        }
 
-        /// <summary>
-        /// <summary>
-        ///     Event fired if the Player's inventory is full and he can't get items from the Pokestop
-        /// </summary>
-        public event EventHandler EnterInventoryFull;
+        private void CheckPlayerTeamSelection()
+        {
+            if (GameClient.PlayerStats.Level >= 5 && GameClient.PlayerProfile.Team == TeamColor.Neutral)
+            {
+                var tsdiag = new PoGoTeamSelectionDialog()
+                {
+                    CoverBackground = true,
+                    AnimationType = PoGoMessageDialogAnimation.Fade
+                };
 
-        #endregion
+                tsdiag.YellowInvoked += async (sender, e) => { await SelectTeam(TeamColor.Yellow); };
+                tsdiag.BlueInvoked += async (sender, e) => { await SelectTeam(TeamColor.Blue); };
+                tsdiag.RedInvoked += async (sender, e) => { await SelectTeam(TeamColor.Red); };
 
-        private DelegateCommand _enterCurrentGym;
+                tsdiag.Show();
+            }
+        }
 
-        /// <summary>
-        ///     Enters the current Gym, don't know what to do then
-        /// </summary>
-        public DelegateCommand EnterCurrentGym => _enterCurrentGym ?? (
-            _enterCurrentGym = new DelegateCommand(async () =>
+        private async Task SelectTeam(TeamColor color)
+        {
+            await Task.Delay(500);
+            var confirmDiag = new PoGoMessageDialog("Confirmation", $"Are you sure, you want {color}?")
+            {
+                AcceptText = Utils.Resources.CodeResources.GetString("YesText"),
+                CancelText = Utils.Resources.CodeResources.GetString("NoText"),
+                CoverBackground = true,
+                AnimationType = PoGoMessageDialogAnimation.Fade
+            };
+            confirmDiag.AcceptInvoked += async (sender, e) =>
             {
-                Busy.SetBusy(true, "Entering Gym");
-                Logger.Write($"Entering {CurrentGymInfo.Name} [ID = {CurrentGym.Id}]");
-                CurrentEnterResponse =
-                    await GameClient.GetGymDetails(CurrentGym.Id, CurrentGym.Latitude, CurrentGym.Longitude);
-                Busy.SetBusy(false);
-                switch (CurrentEnterResponse.Result)
+                var response = await GameClient.SetPlayerTeam(color);
+                switch (response.Status)
                 {
-                    case GetGymDetailsResponse.Types.Result.Unset:
+                    case SetPlayerTeamResponse.Types.Status.Unset:
+                        Logger.Write("SetPlayerTeam Unset", LogLevel.Warning);
                         break;
-                    case GetGymDetailsResponse.Types.Result.Success:
-                        // Success, we play the animation and update inventory
-                        Logger.Write("Entering Gym success");
+                    case SetPlayerTeamResponse.Types.Status.Failure:
+                        Logger.Write("SetPlayerTeam Failure", LogLevel.Error);
+                        break;
+                    case SetPlayerTeamResponse.Types.Status.TeamAlreadySet:
+                        Logger.Write("SetPlayerTeam TeamAlreadySet");
+                        var d2 = new MessageDialog("Your team is already set!");
+                        await d2.ShowAsync();
+                        break;
+                    case SetPlayerTeamResponse.Types.Status.Success:
+                        GameClient.PlayerProfile.Team = response.PlayerData.Team;
+                        break;
+                    default:
+                        break;
+                }
+            };
+
+            confirmDiag.Show();
+        }
+
+
+        private DelegateCommand _deployPokemon;
+        public DelegateCommand DeployPokemon =>
+            _deployPokemon ?? (_deployPokemon = new DelegateCommand( async() =>
+            {
+                //TODO make pokemon selection, now gets highest CP of favorites
+                var pokemon = GameClient.PokemonsInventory
+                    .OrderByDescending(p => Convert.ToBoolean(p.Favorite))
+                    .ThenByDescending(p => p.Cp)
+                    .Where(p=>string.IsNullOrEmpty(p.DeployedFortId) && p.Stamina == p.StaminaMax)
+                    .FirstOrDefault();
+
+                if (pokemon == null)
+                {
+                    var dialog = new MessageDialog("No pokemon", "You don't have any pokemon to deploy!");
+                    await dialog.ShowAsync();
+                    ReturnToGameScreen.Execute();
+                }
 
-                        // What to do when we are in the Gym?
-                        EnterSuccess?.Invoke(this, null);
-                        await GameClient.UpdateInventory();
+                var response = await GameClient.FortDeployPokemon(CurrentGym.Id, pokemon.Id);
+                switch (response.Result)
+                {
+                    case FortDeployPokemonResponse.Types.Result.NoResultSet:
+                        Logger.Write("Deploy to Gym NoResultSet", LogLevel.Warning);
+                        break;
+                    case FortDeployPokemonResponse.Types.Result.Success:
+                        await CalculateGymData(CurrentGym);
+                        CurrentGym.Update();
+                        ReturnToGameScreen.Execute();
                         break;
-                    case GetGymDetailsResponse.Types.Result.ErrorNotInRange:
-                        // Gym can't be used because it's out of range, there's nothing that we can do
-                        Logger.Write("Entering Gym out of range");
-                        EnterOutOfRange?.Invoke(this, null);
+                    case FortDeployPokemonResponse.Types.Result.ErrorAlreadyHasPokemonOnFort:
+                    case FortDeployPokemonResponse.Types.Result.ErrorOpposingTeamOwnsFort:
+                    case FortDeployPokemonResponse.Types.Result.ErrorFortIsFull:
+                    case FortDeployPokemonResponse.Types.Result.ErrorNotInRange:
+                        await CalculateGymData(CurrentGym);
+                        CurrentGym.Update();
+                        break;
+                    case FortDeployPokemonResponse.Types.Result.ErrorPlayerHasNoTeam:
+                    case FortDeployPokemonResponse.Types.Result.ErrorPokemonNotFullHp:
+                    case FortDeployPokemonResponse.Types.Result.ErrorPlayerBelowMinimumLevel:
+                    case FortDeployPokemonResponse.Types.Result.ErrorPokemonIsBuddy:
+                        Logger.Write($"Deploy to Gym NoResultSet, Should have never happened: {response.Result}", LogLevel.Error);
                         break;
                     default:
-                        throw new ArgumentOutOfRangeException();
+                        break;
                 }
-            }, () => true));
+            }, () => IsEnabled));
+
+
+
+
+
+        private DelegateCommand _startBattle;
+        public DelegateCommand StartBattle =>
+            _startBattle ?? (_startBattle = new DelegateCommand(async () =>
+            {
+                //TODO implement Gym battles
+                var dialog = new MessageDialog("Sorry, check back later ;)", "Not yet implemented");
+                await dialog.ShowAsync();
+            }, () => IsEnabled));
 
-        #endregion
 
         #endregion
     }
diff --git a/PokemonGo-UWP/ViewModels/GameMapPageViewModel.cs b/PokemonGo-UWP/ViewModels/GameMapPageViewModel.cs
index e7ba4323f..55f1170e2 100644
--- a/PokemonGo-UWP/ViewModels/GameMapPageViewModel.cs
+++ b/PokemonGo-UWP/ViewModels/GameMapPageViewModel.cs
@@ -129,6 +129,11 @@ public override async Task OnNavigatedToAsync(object parameter, NavigationMode m
                     GameClient.ToggleUpdateTimer();
                     await UpdatePlayerData(true);
                     break;
+                case GameMapNavigationModes.GymUpdate:
+                    // As above
+                    GameClient.ToggleUpdateTimer();
+                    await UpdatePlayerData(true);
+                    break;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
diff --git a/PokemonGo-UWP/Views/EnterGymPage.xaml b/PokemonGo-UWP/Views/EnterGymPage.xaml
index 5c99b358e..5009e8ed2 100644
--- a/PokemonGo-UWP/Views/EnterGymPage.xaml
+++ b/PokemonGo-UWP/Views/EnterGymPage.xaml
@@ -1,4 +1,4 @@
-<Page xmlns:control="using:PokemonGo_UWP.Controls" 
+<Page xmlns:control="using:PokemonGo_UWP.Controls"
     x:Class="PokemonGo_UWP.Views.EnterGymPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,7 +7,10 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:gif="using:XamlAnimatedGif"
     xmlns:viewModels="using:PokemonGo_UWP.ViewModels"
-    mc:Ignorable="d">
+    xmlns:cimbalinoBehaviors="using:Cimbalino.Toolkit.Behaviors"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+    mc:Ignorable="d"
+    x:Name="gymPage">
 
     <Page.DataContext>
         <viewModels:EnterGymPageViewModel x:Name="ViewModel" />
@@ -21,77 +24,81 @@
     <Grid>
         <control:OutdoorBackground />
 
-        <!--Base & Back Screen -->
-        <Grid>
-            <Border HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,80,0,50"
-                    Background="#88333333" BorderThickness="0,3,0,4"
-                    BorderBrush="{Binding CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamColorBrushConverter}}">
-                <Border.RenderTransform>
-                    <SkewTransform CenterX="300" AngleY="-10"></SkewTransform>
-                </Border.RenderTransform>
-            </Border>
-            <Image Source="{Binding CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamBaseImageConverter}}" 
-                   Width="360" Margin="0,250,0,0"></Image>
-            <!--<Image Source="/Assets/Teams/gym_base_empty.png" 
-                   Width="360" Margin="0,250,0,0"></Image>-->
-        </Grid>
+        <!-- Back Screen -->
+        <Border HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,80,0,50"
+                Background="#88333333" BorderThickness="0,3,0,4"
+                BorderBrush="{Binding CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamColorBrushConverter}}">
+            <Border.RenderTransform>
+                <SkewTransform CenterX="300" AngleY="-10"></SkewTransform>
+            </Border.RenderTransform>
+        </Border>
 
         <!--Guard-->
-        <!--TODO This part should be wrapped in some kind of items control -->
-        <Grid Width="360">
-            <!--Trainer-->
-            <Grid VerticalAlignment="Center" HorizontalAlignment="Right" 
-                  Width="Auto" Height="320" Margin="0,0,0,120">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="80"></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                </Grid.RowDefinitions>
-                <Image Grid.RowSpan="2" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,0,-20"
-                       gif:AnimationBehavior.SourceUri="/Assets/UI/avatar.gif" Height="270"></Image>
-                <!--TODO Missing binding vars-->
-                <!--<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
-                           Foreground="{Binding CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamColorBrushConverter}}" 
-                           FontSize="80" Opacity="0.3" Text="{Binding TrainerLevel}"></TextBlock>
-                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10"
-                           Foreground="{Binding CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamColorBrushConverter}}" 
-                           FontSize="28" Text="{Binding TrainerName}"></TextBlock>-->
-                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
-                           Foreground="{Binding CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamColorBrushConverter}}"
-                           FontSize="80" Opacity="0.3" Text="00"></TextBlock>
-                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10"
-                           Foreground="{Binding CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamColorBrushConverter}}" 
-                           FontSize="28" Text="TrainerName"></TextBlock>
-            </Grid>
-            <!--Pokemon-->
-            <Image Width="200" Height="200" Margin="0,60,0,0" 
-                   Source="{Binding CurrentGym.GuardPokemonId, Converter={StaticResource PokemonIdToPokemonSpriteConverter}}"></Image>
-            <Grid HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,240" >
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                </Grid.RowDefinitions>
-                <Grid HorizontalAlignment="Left" Width="100">
-                    <!--TODO Crown should appear only if this is ultimate pokemon-->
-                    <Image Source="/Assets/Icons/crown.png" Height="36" Stretch="Uniform"></Image>
-                </Grid>
-                <!--TODO Missing binding vars-->
-                <!--<TextBlock Grid.Row="1" HorizontalAlignment="Left"
-                           Foreground="#DDDDDD" FontSize="26" 
-                           Text="{Binding PokemonName}"></TextBlock>-->
-                <TextBlock Grid.Row="1" HorizontalAlignment="Left"
-                           Foreground="#DDDDDD" FontSize="26" 
-                           Text="PokemonName"></TextBlock>
-                <Rectangle Grid.Row="2" Fill="#DDDDDD" Width="100" Height="3" HorizontalAlignment="Left" ></Rectangle>
-                <StackPanel Orientation="Horizontal" Grid.Row="3" HorizontalAlignment="Left">
-                    <TextBlock VerticalAlignment="Bottom" Foreground="#DDDDDD" FontSize="20" 
-                               Text="CP"></TextBlock>
-                    <TextBlock Foreground="#DDDDDD" FontSize="26" Margin="4,0,0,0" 
-                               Text="{Binding CurrentGym.GuardPokemonCp}"></TextBlock>
-                </StackPanel>
+        <Viewbox Stretch="Uniform" MaxWidth="420" Margin="0,40,0,0">
+            <Grid Width="360">
+                <!--Base-->
+                <Image Source="{Binding CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamBaseImageConverter}}"
+                       Margin="0,250,0,0" />
+                <FlipView x:Name="GymDefendersFlip" Width="360"
+                          ItemsSource="{Binding CurrentMembers, Mode=OneWay}"
+                          SelectedItem="{Binding SelectedMember, Mode=TwoWay}"
+                          Loaded="GymDefendersFlip_Loaded">
+                    <FlipView.ItemTemplate>
+                        <DataTemplate>
+                            <Grid>
+                                <!--Trainer-->
+                                <Grid VerticalAlignment="Center" HorizontalAlignment="Right"
+                                      Width="Auto" Height="320" Margin="0,0,0,120">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="80"></RowDefinition>
+                                        <RowDefinition></RowDefinition>
+                                    </Grid.RowDefinitions>
+                                    <Image Grid.RowSpan="2" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,0,-20"
+                                           gif:AnimationBehavior.SourceUri="/Assets/UI/avatar.gif" Height="270"></Image>
+                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
+                                           Foreground="{Binding ElementName=gymPage, Path=DataContext.CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamColorBrushConverter}, ConverterParameter=light}"
+                                           FontSize="80" Opacity="0.3" Text="{Binding PlayerLevel}"></TextBlock>
+                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10"
+                                           Foreground="{Binding ElementName=gymPage, Path=DataContext.CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamColorBrushConverter}, ConverterParameter=light}"
+                                           FontSize="28" Text="{Binding PlayerName}"></TextBlock>
+                                </Grid>
+                                <!--Pokemon-->
+                                <Image Width="200" Height="200" Margin="0,60,0,0"
+                                       Source="{Binding PokemonId, Converter={StaticResource PokemonIdToPokemonSpriteConverter}}"></Image>
+                                <Grid HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,240" >
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"></RowDefinition>
+                                        <RowDefinition></RowDefinition>
+                                        <RowDefinition></RowDefinition>
+                                        <RowDefinition></RowDefinition>
+                                    </Grid.RowDefinitions>
+                                    <Grid HorizontalAlignment="Left" Width="100">
+                                        <Image Source="/Assets/Icons/indicator_crown.png"
+                                               Height="24" Stretch="Uniform"
+                                               Visibility="{Binding PokeType, Converter={StaticResource PokeTypeKingToVisibility}}"/>
+                                    </Grid>
+                                    <TextBlock Grid.Row="1" HorizontalAlignment="Left"
+                                               Foreground="#DDDDDD" FontSize="26"
+                                               Text="{Binding PokemonName}"></TextBlock>
+                                    <Rectangle Grid.Row="2" Fill="#DDDDDD" Width="100" Height="2" HorizontalAlignment="Left" ></Rectangle>
+                                    <StackPanel Orientation="Horizontal" Grid.Row="3" HorizontalAlignment="Left">
+                                        <TextBlock VerticalAlignment="Bottom" Foreground="#DDDDDD" FontSize="20"
+                                                   Text="CP"></TextBlock>
+                                        <TextBlock Foreground="#DDDDDD" FontSize="26" Margin="4,0,0,0"
+                                                   Text="{Binding PokemonCp}"></TextBlock>
+                                    </StackPanel>
+                                </Grid>
+                                <TextBlock VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,350,10,0"
+                                           Foreground="#cccccc" FontSize="18" >
+                                    <Run Text="BATTLES WON "></Run>
+                                    <Run Text="{Binding PokemonDefendedCount}"></Run>
+                                </TextBlock>
+                            </Grid>
+                        </DataTemplate>
+                    </FlipView.ItemTemplate>
+                </FlipView>
             </Grid>
-        </Grid>
+        </Viewbox>
 
         <!--Label-->
         <Grid VerticalAlignment="Top">
@@ -100,7 +107,7 @@
                 <RowDefinition></RowDefinition>
             </Grid.RowDefinitions>
             <!--Location-->
-            <Border Background="#88333333" BorderBrush="Gray" BorderThickness="1" 
+            <Border Background="#88333333" BorderBrush="Gray" BorderThickness="1"
                 Height="70" Margin="40,10,10,10" CornerRadius="15">
                 <Grid Margin="56,0,0,0">
                     <Grid.RowDefinitions>
@@ -108,16 +115,39 @@
                         <RowDefinition Height="2*"></RowDefinition>
                         <RowDefinition  Height="1*"></RowDefinition>
                     </Grid.RowDefinitions>
-                    <TextBlock Grid.Row="0" VerticalAlignment="Bottom" Foreground="#DDDDDD" FontSize="12" 
+                    <TextBlock Grid.Row="0" VerticalAlignment="Bottom" Foreground="#DDDDDD" FontSize="12"
                                Text="{Binding CurrentGymInfo.Name}"></TextBlock>
                     <TextBlock Grid.Row="1" VerticalAlignment="Center"
                                Foreground="#DDDDDD" FontSize="16" >
-                        <Run Text="Gym level"></Run>
-                        <!--TODO Missing binding vars-->
-                        <!--<Run Text="{Binding GymLevel}"></Run>-->
-                        <Run Text="1"></Run>
+                        <Run Text="Gym level "></Run>
+                        <Run Text="{Binding CurrentGym.GymLevel}"></Run>
                     </TextBlock>
-                    <!--TODO List of Gym's members-->
+                    <ItemsControl Grid.Row="2" x:Name="FlipIndicators" ItemsSource="{Binding CurrentMembersIndicators, Mode=OneWay}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Orientation="Horizontal" />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Grid Margin="0,0,0,3">
+                                    <BitmapIcon
+                                        UriSource="{Binding PokeType, Converter={StaticResource PokeTypeToAsset}}">
+
+                                        <interactivity:Interaction.Behaviors>
+                                            <cimbalinoBehaviors:MultiBindingBehavior
+                                                    Converter="{StaticResource PokeTypeSelectedToTeamColor}"
+                                                    Mode="OneWay"
+                                                    PropertyName="Foreground">
+                                                <cimbalinoBehaviors:MultiBindingItem Value="{Binding Selected}"/>
+                                                <cimbalinoBehaviors:MultiBindingItem Value="{Binding ElementName=gymPage, Path=DataContext.CurrentGym.OwnedByTeam}" />
+                                            </cimbalinoBehaviors:MultiBindingBehavior>
+                                        </interactivity:Interaction.Behaviors>
+                                    </BitmapIcon>
+                                </Grid>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
                 </Grid>
             </Border>
             <Grid HorizontalAlignment="Left" Width="82" Height="82" Margin="4,0,0,0">
@@ -132,74 +162,72 @@
             </Grid>
             <!--TODO In official app, there is a gauge behind gym's picture. Don't know what is it-->
             <!--Prestige-->
-            <Border Grid.Row="1" 
-                    BorderBrush="{Binding CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamColorBrushConverter}}" 
+            <Border Grid.Row="1"
+                    BorderBrush="{Binding CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamColorBrushConverter}}"
                     BorderThickness="0,0,0,6" CornerRadius="5"
                     HorizontalAlignment="Left" Margin="-5">
                 <Border Background="#88333333" CornerRadius="5" >
                     <TextBlock Margin="16,2,10,2" FontSize="16" Opacity="0.8"
-                               Foreground="{Binding CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamColorBrushConverter}}">
+                               Foreground="{Binding CurrentGym.OwnedByTeam, Converter={StaticResource PlayerTeamToTeamColorBrushConverter}, ConverterParameter=light}">
                         <Run Text="{Binding CurrentGym.GymPoints}"></Run>
                         <Run Text=" / "></Run>
-                        <!--TODO Missing binding vars-->
-                        <!--<Run Text="{Binding GymPrestigeFull}"></Run>-->
-                        <Run Text="8000"></Run>
+                        <Run Text="{Binding CurrentGym.GymMaxPoints}"></Run>
                     </TextBlock>
                 </Border>
             </Border>
         </Grid>
 
         <!--Buttons & Message-->
-        <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="100,0,0,0"
-                   Foreground="#cccccc" FontSize="24" >
-            <Run Text="BATTLES WON"></Run>
-            <!--TODO Missing binding vars-->
-            <!--<Run Text="{Binding GymBattleWon}"></Run>-->
-            <Run Text="1"></Run>
-        </TextBlock>
         <Grid VerticalAlignment="Bottom" Margin="0,0,0,8">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition></ColumnDefinition>
                 <ColumnDefinition></ColumnDefinition>
                 <ColumnDefinition></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <!--TODO Button Command and Visibility-->
-            <Button HorizontalAlignment="Center" VerticalAlignment="Center" 
-                    Width="80" Height="80" Grid.Column="0" 
-                    Style="{ThemeResource ImageButtonStyle}">
+            <Button HorizontalAlignment="Center" VerticalAlignment="Center"
+                    Width="80" Height="80" Grid.Column="0"
+                    Visibility="{Binding CanDeploy, Converter={StaticResource BooleanToVisibilityConverter}}"
+                    Style="{ThemeResource ImageButtonStyle}"
+                    Command="{Binding DeployPokemon}">
                 <Image Source="/Assets/Buttons/btn_claim.png"></Image>
             </Button>
-            <Button HorizontalAlignment="Center" VerticalAlignment="Center" 
+            <Button HorizontalAlignment="Center" VerticalAlignment="Center"
                     Width="60" Height="60" Grid.Column="1"
-                    Command="{Binding AbandonGym}"
-                    Style="{ThemeResource ImageButtonStyle}">
+                    Style="{ThemeResource ImageButtonStyle}"
+                    Command="{Binding ReturnToGameScreen}">
                 <Image Source="/Assets/Buttons/btn_close_normal.png" />
             </Button>
-            <Button HorizontalAlignment="Center" VerticalAlignment="Center" 
-                    Width="80" Height="80" Grid.Column="2" 
-                    Style="{ThemeResource ImageButtonStyle}">
-                    <Image Source="/Assets/Buttons/btn_train.png"></Image>
-            </Button>
-            <Button HorizontalAlignment="Center" VerticalAlignment="Center" 
-                    Width="80" Height="80" Grid.Column="2" Visibility="Collapsed"
-                    Style="{ThemeResource ImageButtonStyle}">
+            <Button HorizontalAlignment="Center" VerticalAlignment="Center"
+                    Width="80" Height="80" Grid.Column="2"
+                    Visibility="{Binding AtckType, Converter={StaticResource AttackTypeTrainToVisibilityConverter}}"
+                    Style="{ThemeResource ImageButtonStyle}"
+                    Command="{Binding StartBattle}">
                 <Image Source="/Assets/Buttons/btn_train.png"></Image>
             </Button>
+            <Button HorizontalAlignment="Center" VerticalAlignment="Center"
+                    Width="80" Height="80" Grid.Column="2"
+                    Visibility="{Binding AtckType, Converter={StaticResource AttackTypeAttackToVisibilityConverter}}"
+                    Style="{ThemeResource ImageButtonStyle}"
+                    Command="{Binding StartBattle}">
+                <Image Source="/Assets/Buttons/btn_attack.png"></Image>
+            </Button>
         </Grid>
         <Border x:Name="ErrorMessageBorder"
-                VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,410,0,0"
+                VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,80"
                 Background="#E780B6" CornerRadius="12" BorderBrush="#44000000" BorderThickness="1"
-                Visibility="Visible">
+                Visibility="{Binding IsEnabled, Converter={StaticResource NegateBooleanToVisibilityConverter}}">
             <StackPanel>
-                <TextBlock x:Name="OutOfRangeTextBlock" Visibility="Visible"
-                           Text="This Gym is too far away." 
-                           FontSize="12" Foreground="White" Margin="8,4,8,4"></TextBlock>
+                <TextBlock x:Name="OutOfRangeTextBlock"
+                           FontSize="12" Foreground="White" Margin="8,4,8,4"
+                           Text="This Gym is too far away."
+                           Visibility="{Binding NotInRange, Converter={StaticResource BooleanToVisibilityConverter}}" />
                 <TextBlock x:Name="NotYetLevelFiveTextBlock"
-                       Text="Not yet level five." Visibility="Collapsed"
-                       FontSize="12" Foreground="White" Margin="8,4,8,4"></TextBlock>
+                       FontSize="12" Foreground="White" Margin="8,4,8,4"
+                       Text="Not yet level five."
+                       Visibility="{Binding NotLvl5Yet, Converter={StaticResource BooleanToVisibilityConverter}}" />
             </StackPanel>
         </Border>
-        
+
         <!--TODO Dialog to choose pokemon and GO-->
 
     </Grid>
diff --git a/PokemonGo-UWP/Views/EnterGymPage.xaml.cs b/PokemonGo-UWP/Views/EnterGymPage.xaml.cs
index 0a6ca005c..657564db6 100644
--- a/PokemonGo-UWP/Views/EnterGymPage.xaml.cs
+++ b/PokemonGo-UWP/Views/EnterGymPage.xaml.cs
@@ -1,6 +1,11 @@
-using System;
+using PokemonGo.RocketAPI;
+using PokemonGo_UWP.Entities;
+using PokemonGo_UWP.Utils;
+using System;
+using System.Linq;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
 
 // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
@@ -12,6 +17,9 @@ namespace PokemonGo_UWP.Views
     /// </summary>
     public sealed partial class EnterGymPage : Page
     {
+        private ScrollViewer _scroller;
+        private int _lastMemberIndex = 0;
+
         public EnterGymPage()
         {
             InitializeComponent();
@@ -26,41 +34,50 @@ public EnterGymPage()
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             base.OnNavigatedTo(e);
-            SubscribeToEnterEvents();
         }
 
 
         protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
         {
             base.OnNavigatingFrom(e);
-            UnsubscribeToEnterEvents();
         }
 
         #endregion
 
-        #region Handlers
-
-        private void SubscribeToEnterEvents()
+        private void GymDefendersFlip_Loaded(object sender, RoutedEventArgs e)
         {
-            ViewModel.EnterOutOfRange += GameManagerViewModelOnEnterOutOfRange;
-            ViewModel.EnterSuccess += GameManagerViewModelOnEnterSuccess;
+            _scroller = GetScrollViewer(GymDefendersFlip);
+            _scroller.ViewChanged += Scroller_ViewChanged;
         }
 
-        private void UnsubscribeToEnterEvents()
+        private void Scroller_ViewChanged(object sender, ScrollViewerViewChangedEventArgs e)
         {
-            ViewModel.EnterOutOfRange -= GameManagerViewModelOnEnterOutOfRange;
-            ViewModel.EnterSuccess -= GameManagerViewModelOnEnterSuccess;
-        }
+            var index = (int)Math.Round(_scroller.HorizontalOffset - 2);
+            var capIndex = Utilities.EnsureRange(index, 0, ViewModel.CurrentMembers.Count - 1);
+            if (capIndex != _lastMemberIndex && ViewModel.CurrentMembers[capIndex] != null)
+            {
+                foreach (var item in ViewModel.CurrentMembers)
+                    item.Selected = false;
 
-        private void GameManagerViewModelOnEnterOutOfRange(object sender, EventArgs eventArgs)
-        {            
-            OutOfRangeTextBlock.Visibility = ErrorMessageBorder.Visibility = Visibility.Visible;
+                ViewModel.CurrentMembers[capIndex].Selected = true;
+                _lastMemberIndex = capIndex;
+            }
         }
 
-        private void GameManagerViewModelOnEnterSuccess(object sender, EventArgs eventArgs)
+        // method to pull out a ScrollViewer from FlipView
+        public static ScrollViewer GetScrollViewer(DependencyObject depObj)
         {
+            if (depObj is ScrollViewer) return depObj as ScrollViewer;
+
+            for (int i = 0; i < VisualTreeHelper.GetChildrenCount(depObj); i++)
+            {
+                var child = VisualTreeHelper.GetChild(depObj, i);
+
+                var result = GetScrollViewer(child);
+                if (result != null) return result;
+            }
+            return null;
         }
 
-        #endregion
     }
 }
\ No newline at end of file
diff --git a/PokemonGo-UWP/project.json b/PokemonGo-UWP/project.json
index 9ac771b08..83ca13845 100644
--- a/PokemonGo-UWP/project.json
+++ b/PokemonGo-UWP/project.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "HockeySDK.UWP": "4.1.5",
+    "Cimbalino.Toolkit": "2.3.0",
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
     "Newtonsoft.Json": "9.0.1",
     "NotificationsExtensions.Win10": "14332.0.2",