diff --git a/Content/Common/Data/Materials/Red.material b/Content/Common/Data/Materials/Red.material
new file mode 100644
index 0000000..8585b64
--- /dev/null
+++ b/Content/Common/Data/Materials/Red.material
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<material>
+	<technique name="Techniques/UnlitOpaque.xml" quality="0" loddistance="0.000000" />
+	<parameter name="MatEnvMapColor" value="1 1 1" />
+	<parameter name="NormalScale" value="1.000000" />
+	<parameter name="MatDiffColor" value="1 0 0 1" />
+	<parameter name="VOffset" value="0 1 0 0" />
+	<parameter name="DielectricReflectance" value="0.500000" />
+	<parameter name="Metallic" value="1.000000" />
+	<parameter name="MatSpecColor" value="0 0 0 1" />
+	<parameter name="MatEmissiveColor" value="0 0 0" />
+	<parameter name="UOffset" value="1 0 0 0" />
+	<parameter name="AlphaCutoff" value="0.500000" />
+	<parameter name="Roughness" value="1.000000" />
+	<cull value="ccw" />
+	<shadowcull value="ccw" />
+	<fill value="solid" />
+	<depthbias constant="0.000000" slopescaled="0.000000" normaloffset="0.000000" />
+	<alphatocoverage enable="false" />
+	<lineantialias enable="false" />
+	<renderorder value="128" />
+	<occlusion enable="true" />
+</material>
diff --git a/Content/Common/Data/UI/GameScreen.rml b/Content/Common/Data/UI/GameScreen.rml
index 7b5b216..1de28fe 100644
--- a/Content/Common/Data/UI/GameScreen.rml
+++ b/Content/Common/Data/UI/GameScreen.rml
@@ -38,15 +38,24 @@
 	<body data-model="GameRmlUIComponent"  style="width: 100%; height: 100%; margin: 0; nav: auto">
 		<div class="gray-header-panel menu-panel" style="top: 0%; left: 50%; position: absolute; transform: translate(-50%, 0); width: 100%; ">
 			<div style="float: left">
-			<!--<input type="button" class="blue-button" style="display: block">-->
+			<input type="button" class="blue-button" style="display: block" data-event-click="Settings">
 				<img sprite="icon-settings"></img>
-			<!--</input>-->
+			</input>
 			</div>
 			<div style="float: right">
 				<img sprite="icon-diamond"></img> 0
 			</div>
 			<div style="text-align: center">{{Level}}</div>
 		</div>
+		
+		<div data-visible="Victory" class="" style="background: #000000A0; padding:10px; top: 50%; left: 50%; position: absolute; transform: translate(-50%, -50%); width: 50%; max-height: 90%">
+			<div style="text-align: center">Level complete!</div>
+			<img src="../Images/Victory.png" style="margin: 0 auto; max-width: 33%"/>
+			<input type="button" class="blue-button" style="display: block"  data-event-click="Next">
+				Next
+			</input>
+		</div>
+
 		<div class="gray-footer-panel menu-panel" style="top: 100%; left: 50%; position: absolute; transform: translate(-50%, -100%); width: 100%; ">
 			<!--<input type="button" class="blue-button" style="display: block"  data-event-click="Exit">
 				Hint
diff --git a/RbfxTemplate/GameRmlUIComponent.cs b/RbfxTemplate/GameRmlUIComponent.cs
index 0d9baa4..cceb317 100644
--- a/RbfxTemplate/GameRmlUIComponent.cs
+++ b/RbfxTemplate/GameRmlUIComponent.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using Urho3DNet;
+﻿using Urho3DNet;
 
 namespace RbfxTemplate
 {
diff --git a/RbfxTemplate/GameState.cs b/RbfxTemplate/GameState.cs
index a0e40dd..a4f3ea1 100644
--- a/RbfxTemplate/GameState.cs
+++ b/RbfxTemplate/GameState.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using RbfxTemplate.GameStates;
 using Urho3DNet;
-using static System.Net.WebRequestMethods;
 
 namespace RbfxTemplate
 {
@@ -20,13 +19,8 @@ public sealed class GameState : RmlUIStateBase
         private readonly PickState _pickState;
         private readonly DragState _dragState;
         private readonly VictoryState _victoryState;
-        private StateBase _state;
         private readonly Random _random = new Random();
         private readonly List<Tile> _currentTiles = new List<Tile>();
-        private Vector2 _areaSize = new Vector2(1,1);
-
-        private int _levelIndex;
-        private int _hintsLeft = 1;
 
         private readonly Tuple<string, string>[] _pairs =
         {
@@ -54,8 +48,12 @@ public sealed class GameState : RmlUIStateBase
 
         private readonly PhysicsRaycastResult _raycastResult;
         private readonly Material _baseMaterial;
-        private readonly Sprite _victorySprite;
-        private readonly FiniteTimeAction _victoryAction;
+        private StateBase _state;
+        private Vector2 _areaSize = new Vector2(1, 1);
+
+        private int _levelIndex;
+        private int _hintsLeft = 1;
+        private bool _victory;
 
         public GameState(UrhoPluginApplication app) : base(app, "UI/GameScreen.rml")
         {
@@ -64,13 +62,6 @@ public GameState(UrhoPluginApplication app) : base(app, "UI/GameScreen.rml")
 
             _raycastResult = new PhysicsRaycastResult();
 
-            _victorySprite = new Sprite(Context);
-            var victoryTexture = Context.ResourceCache.GetResource<Texture2D>("Images/Victory.png");
-            _victorySprite.Texture = victoryTexture;
-            _victorySprite.IsVisible = false;
-            _victorySprite.HotSpot = new IntVector2(victoryTexture.Size.X / 2, victoryTexture.Size.Y / 2);
-            UIRoot.AddChild(_victorySprite);
-
             _app = app;
             _scene = Context.CreateObject<Scene>();
             _scene.Ptr.LoadXML("Scenes/Scene.scene");
@@ -95,13 +86,7 @@ public GameState(UrhoPluginApplication app) : base(app, "UI/GameScreen.rml")
             _dragState = new DragState(this);
             _victoryState = new VictoryState(this);
 
-            _victoryAction = new ActionBuilder(Context)
-                .ScaleBy(1.0f, new Vector2(10.0f, 10.0f)).ElasticInOut()
-                .DelayTime(0.5f).CallFunc(_=>NextLevel())
-                .Then(new ActionBuilder(Context).ScaleBy(1.0f, new Vector2(0.1f, 0.1f)).ElasticInOut().Build())
-                .Hide().Build();
-
-            NextLevel();
+            NextLevel(null);
 
             Deactivate();
         }
@@ -123,6 +108,14 @@ public StateBase State
         public override void OnDataModelInitialized(GameRmlUIComponent component)
         {
             component.BindDataModelProperty("Level", _ => _.Set("Level " + _levelIndex), _ => { });
+            component.BindDataModelProperty("Victory", _ => _.Set(_victory), _ => { });
+            component.BindDataModelEvent("Next", NextLevel);
+            component.BindDataModelEvent("Settings", Settings);
+        }
+
+        private void Settings(VariantList obj)
+        {
+            _app.HandleBackKey();
         }
 
         public override void Activate(StringVariantMap bundle)
@@ -148,8 +141,8 @@ public override void Update(float timeStep)
             _state.Update(timeStep);
 
             var orthoSizeY = _areaSize.Y;
-            var orthoSizeX = _areaSize.X * (float)UI.Size.Y / (float)UI.Size.X;
-            _camera.OrthoSize =  Math.Max(orthoSizeX, orthoSizeY);
+            var orthoSizeX = _areaSize.X * UI.Size.Y / UI.Size.X;
+            _camera.OrthoSize = Math.Max(orthoSizeX, orthoSizeY);
         }
 
         public override void Deactivate()
@@ -183,13 +176,10 @@ public void AddPairs(int numTiles)
                 visited.Add(pair.Item1);
                 visited.Add(pair.Item2);
 
-                Tile t1 = CreateTile(pair.Item1);
-                Tile t2 = CreateTile(pair.Item2);
+                var t1 = CreateTile(pair.Item1);
+                var t2 = CreateTile(pair.Item2);
 
-                if (_random.Next(2) == 0)
-                {
-                    (t1, t2) = (t2, t1);
-                }
+                if (_random.Next(2) == 0) (t1, t2) = (t2, t1);
 
                 leftTiles.Add(t1.Node);
                 rightTiles.Add(t2.Node);
@@ -205,20 +195,20 @@ public void AddPairs(int numTiles)
 
             var d = 1.5f;
 
-            var pos = new Vector3(0, 0, (-leftTiles.Count * 0.5f+0.5f)* d);
+            var pos = new Vector3(0, 0, (-leftTiles.Count * 0.5f + 0.5f) * d);
             for (var index = 0; index < leftTiles.Count; index++)
             {
-                leftTiles[index].Position = pos + new Vector3(-d, 0, index*d);
-                rightTiles[index].Position = pos + new Vector3(d, 0, index*d);
+                leftTiles[index].Position = pos + new Vector3(-d, 0, index * d);
+                rightTiles[index].Position = pos + new Vector3(d, 0, index * d);
             }
 
-            _areaSize = new Vector2(5, (leftTiles.Count+1)*d);
+            _areaSize = new Vector2(5, (leftTiles.Count + 1) * d);
         }
 
         public Tile CreateTile(string imageName)
         {
             var m = _baseMaterial.Clone();
-            var tex = Context.ResourceCache.GetResource<Texture2D>("Images/Emoji/" + imageName+".png");
+            var tex = Context.ResourceCache.GetResource<Texture2D>("Images/Emoji/" + imageName + ".png");
             m.SetTexture("Albedo", tex);
 
             var tile = _scene.Ptr.InstantiatePrefab(_tilePrefab);
@@ -252,32 +242,57 @@ public void DragTile(Tile tile, int? touchId)
         public void StartPicking()
         {
             State = _pickState;
+
+            var isComplete = true;
+            var isCorrect = true;
+            Tile hint = null;
+
             foreach (var tile in _currentTiles)
+            {
+                if (tile.LinkedTile == null) isComplete = false;
                 if (tile.LinkedTile != tile.ValidLink)
                 {
-                    if (_hintsLeft > 0)
-                    {
-                        _pickState.ShowHint(tile);
-                        --_hintsLeft;
-                    }
+                    isCorrect = false;
+                    hint = tile;
+                }
+            }
+
+            if (isComplete)
+            {
+                if (isCorrect)
+                {
+                    Victory();
+                }
+                else
+                {
+                    var material = Context.ResourceCache.GetResource<Material>("Materials/Red.material");
+                    foreach (var tile in _currentTiles)
+                        if (tile.LinkedTile != tile.ValidLink)
+                            tile.Link.GetComponent<AnimatedModel>().SetMaterial(material);
 
                     return;
                 }
+            }
 
-            Victory();
+            if (_hintsLeft > 0 && hint != null)
+            {
+                _pickState.ShowHint(hint);
+                --_hintsLeft;
+            }
         }
 
-        private void Victory()
+        public void NextLevel(VariantList args)
         {
-            State = _victoryState;
-            var size = UI.Size;
-            var s = Math.Min(size.X, size.Y) * 0.9f;
-            var imgSize = new Vector2(s, s);
-            _victorySprite.Position = size.ToVector2() *0.5f;
-            _victorySprite.Size = imgSize.ToIntVector2();
-            _victorySprite.IsVisible = true;
-            _victorySprite.Scale = new Vector2(0.1f, 0.1f);
-            ActionManager.AddAction(_victoryAction, _victorySprite);
+            _victory = false;
+            RmlUiComponent.UpdateProperties();
+
+            ++_levelIndex;
+            RmlUiComponent.UpdateProperties();
+            foreach (var tile in _currentTiles) tile.Node.Remove();
+
+            AddPairs(Math.Min(4, _levelIndex));
+
+            StartPicking();
         }
 
         protected override void Dispose(bool disposing)
@@ -287,6 +302,13 @@ protected override void Dispose(bool disposing)
             base.Dispose(disposing);
         }
 
+        private void Victory()
+        {
+            State = _victoryState;
+            _victory = true;
+            RmlUiComponent.UpdateProperties();
+        }
+
         private void Randomize(List<Node> rightTiles)
         {
             for (var index = 0; index < rightTiles.Count; index++)
@@ -356,18 +378,5 @@ private void HandleKeyUp(VariantMap args)
                     return;
             }
         }
-
-        public void NextLevel()
-        {
-            //_victorySprite.IsVisible = false;
-
-            ++_levelIndex;
-            RmlUiComponent.UpdateProperties();
-            foreach (var tile in _currentTiles) tile.Node.Remove();
-
-            AddPairs(Math.Min(4, _levelIndex));
-
-            StartPicking();
-        }
     }
 }
\ No newline at end of file
diff --git a/RbfxTemplate/GameStates/DragState.cs b/RbfxTemplate/GameStates/DragState.cs
index b85879b..28c319f 100644
--- a/RbfxTemplate/GameStates/DragState.cs
+++ b/RbfxTemplate/GameStates/DragState.cs
@@ -11,13 +11,6 @@ public DragState(GameState game) : base(game)
         {
         }
 
-        public void TrackTile(Tile tile, int? touchId)
-        {
-            _tile = tile;
-            _touchId = touchId;
-            tile.LinkTo(null);
-        }
-
         public override void Activate()
         {
             _tile.Link.IsEnabled = true;
@@ -31,48 +24,57 @@ public override void Deactivate()
 
         public override void HandleMouseMove(IntVector2 intVector2, int buttons, int qualifiers)
         {
-            if (_touchId.HasValue) { return; }
+            if (_touchId.HasValue) return;
 
             MoveLink(intVector2);
         }
 
-        private void MoveLink(IntVector2 intVector2)
-        {
-            var ray = Game.GetScreenRay(intVector2);
-            var normal = Vector3.Up;
-            var d = normal.DotProduct(ray.Direction);
-            float t = -(normal.DotProduct(ray.Origin) - _tile.Link.Position.Y) / d;
-            _tile.LinkTarget.WorldPosition = ray.Origin + ray.Direction * t;
-            _tile.LinkSource.LookAt(_tile.LinkTarget.WorldPosition);
-            _tile.LinkTarget.LookAt(_tile.LinkSource.WorldPosition);
-        }
-
         public override void HandleMouseUp(int button, IntVector2 inputMousePosition, int buttons, int qualifiers)
         {
-            if (_touchId.HasValue) { return; }
+            if (_touchId.HasValue) return;
 
             CompleteLink(inputMousePosition);
         }
 
-        private void CompleteLink(IntVector2 inputMousePosition)
-        {
-            var link = Game.PickTile(inputMousePosition);
-            _tile.LinkTo(link);
-            Game.StartPicking();
-        }
-
         public override void HandleTouchMove(int touchId, IntVector2 intVector2)
         {
-            if (_touchId != touchId) { return; }
+            if (_touchId != touchId) return;
 
             MoveLink(intVector2);
         }
 
         public override void HandleTouchEnd(int touchId, IntVector2 intVector2)
         {
-            if (_touchId != touchId) { return; }
+            if (_touchId != touchId) return;
 
             CompleteLink(intVector2);
         }
+
+        public void TrackTile(Tile tile, int? touchId)
+        {
+            _tile = tile;
+            _touchId = touchId;
+            tile.LinkTo(null);
+            var material = Context.ResourceCache.GetResource<Material>("Materials/White.material");
+            tile.Link.GetComponent<AnimatedModel>(true).SetMaterial(material);
+        }
+
+        private void MoveLink(IntVector2 intVector2)
+        {
+            var ray = Game.GetScreenRay(intVector2);
+            var normal = Vector3.Up;
+            var d = normal.DotProduct(ray.Direction);
+            var t = -(normal.DotProduct(ray.Origin) - _tile.Link.Position.Y) / d;
+            _tile.LinkTarget.WorldPosition = ray.Origin + ray.Direction * t;
+            _tile.LinkSource.LookAt(_tile.LinkTarget.WorldPosition);
+            _tile.LinkTarget.LookAt(_tile.LinkSource.WorldPosition);
+        }
+
+        private void CompleteLink(IntVector2 inputMousePosition)
+        {
+            var link = Game.PickTile(inputMousePosition);
+            _tile.LinkTo(link);
+            Game.StartPicking();
+        }
     }
 }
\ No newline at end of file
diff --git a/RbfxTemplate/GameStates/PickState.cs b/RbfxTemplate/GameStates/PickState.cs
index e68196d..1d1465a 100644
--- a/RbfxTemplate/GameStates/PickState.cs
+++ b/RbfxTemplate/GameStates/PickState.cs
@@ -2,10 +2,10 @@
 
 namespace RbfxTemplate.GameStates
 {
-    public class PickState: StateBase
+    public class PickState : StateBase
     {
         private readonly Node _pointer;
-        private Tile _hintTile = null;
+        private Tile _hintTile;
         private float _hintTime;
 
         public PickState(GameState game, Node pointer) : base(game)
@@ -16,10 +16,7 @@ public PickState(GameState game, Node pointer) : base(game)
 
         public override void HandleMouseDown(int button, IntVector2 inputMousePosition, int buttons, int qualifiers)
         {
-            if (button != 1)
-            {
-                return;
-            }
+            if (button != 1) return;
 
             var tile = Game.PickTile(inputMousePosition);
             if (tile != null)
@@ -34,13 +31,13 @@ public override void Update(float timeStep)
         {
             if (_hintTile != null)
             {
-                _hintTime += timeStep*0.5f;
+                _hintTime += timeStep * 0.5f;
                 if (_hintTime >= 1.0f)
                     _hintTime = 0;
 
                 var a = _hintTile.Node.WorldPosition;
                 var b = _hintTile.ValidLink.Node.WorldPosition;
-                _pointer.WorldPosition = a.Lerp(b,_hintTime);
+                _pointer.WorldPosition = a.Lerp(b, _hintTime);
             }
         }
 
diff --git a/RbfxTemplate/GameStates/StateBase.cs b/RbfxTemplate/GameStates/StateBase.cs
index 2f44ac7..bfd6fa0 100644
--- a/RbfxTemplate/GameStates/StateBase.cs
+++ b/RbfxTemplate/GameStates/StateBase.cs
@@ -4,57 +4,49 @@ namespace RbfxTemplate.GameStates
 {
     public abstract class StateBase
     {
-        private readonly GameState _game;
-
-        public GameState Game => _game;
-
         public StateBase(GameState game)
         {
-            _game = game;
+            Game = game;
         }
 
+        public GameState Game { get; }
+
+        public Context Context => Game.Context;
+
         public virtual void HandleTouchBegin(int touchId, IntVector2 intVector2)
         {
-            
         }
 
         public virtual void HandleTouchMove(int touchId, IntVector2 intVector2)
         {
-            
         }
 
         public virtual void HandleTouchEnd(int touchId, IntVector2 intVector2)
         {
-            
         }
 
         public virtual void HandleMouseMove(IntVector2 intVector2, int buttons, int qualifiers)
         {
-            
         }
 
         public virtual void HandleMouseDown(int button, IntVector2 inputMousePosition, int buttons, int qualifiers)
         {
-            
         }
 
         public virtual void HandleMouseUp(int button, IntVector2 inputMousePosition, int buttons, int qualifiers)
         {
-            
         }
 
         public virtual void Activate()
         {
-            
         }
 
         public virtual void Deactivate()
         {
-            
         }
 
         public virtual void Update(float timeStep)
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/RbfxTemplate/RmlUIStateBase.cs b/RbfxTemplate/RmlUIStateBase.cs
index 8ccd943..cf7077b 100644
--- a/RbfxTemplate/RmlUIStateBase.cs
+++ b/RbfxTemplate/RmlUIStateBase.cs
@@ -3,15 +3,14 @@
 namespace RbfxTemplate
 {
     /// <summary>
-    /// Base class for a game state with RmlUI document.
+    ///     Base class for a game state with RmlUI document.
     /// </summary>
     public abstract class RmlUIStateBase : ApplicationState
     {
         private readonly SharedPtr<Scene> _scene;
-        private readonly GameRmlUIComponent _uiComponent;
 
         /// <summary>
-        /// Construct RmlUIStateBase.
+        ///     Construct RmlUIStateBase.
         /// </summary>
         /// <param name="app">Application instance.</param>
         /// <param name="rmlResource">Path to RmlUI document resource.</param>
@@ -22,53 +21,53 @@ public RmlUIStateBase(UrhoPluginApplication app, string rmlResource) : base(app.
             Application = app;
 
             _scene = Context.CreateObject<Scene>();
-            _uiComponent = _scene.Ptr.CreateComponent<GameRmlUIComponent>();
-            _uiComponent.IsEnabled = false;
-            _uiComponent.State = this;
-            _uiComponent.SetResource(rmlResource);
-            _uiComponent.IsEnabled = false;
+            RmlUiComponent = _scene.Ptr.CreateComponent<GameRmlUIComponent>();
+            RmlUiComponent.IsEnabled = false;
+            RmlUiComponent.State = this;
+            RmlUiComponent.SetResource(rmlResource);
+            RmlUiComponent.IsEnabled = false;
         }
 
         /// <summary>
-        /// RmlUI Component for the game state.
+        ///     RmlUI Component for the game state.
         /// </summary>
-        public GameRmlUIComponent RmlUiComponent => _uiComponent;
+        public GameRmlUIComponent RmlUiComponent { get; }
 
         /// <summary>
-        /// Application instance.
+        ///     Application instance.
         /// </summary>
         public UrhoPluginApplication Application { get; }
 
         /// <summary>
-        /// Data model initializer.
+        ///     Data model initializer.
         /// </summary>
         /// <param name="component">RmlUIComponent to initialize.</param>
         public abstract void OnDataModelInitialized(GameRmlUIComponent component);
 
         /// <summary>
-        /// Game state activation handler.
+        ///     Game state activation handler.
         /// </summary>
         /// <param name="bundle">Game state parameters.</param>
         public override void Activate(StringVariantMap bundle)
         {
-            _uiComponent.IsEnabled = true;
-            _uiComponent.UpdateProperties();
+            RmlUiComponent.IsEnabled = true;
+            RmlUiComponent.UpdateProperties();
             SubscribeToEvent(E.KeyUp, HandleKeyUp);
             base.Activate(bundle);
         }
 
         /// <summary>
-        /// Game state deactivation handler.
+        ///     Game state deactivation handler.
         /// </summary>
         public override void Deactivate()
         {
-            _uiComponent.IsEnabled = false;
+            RmlUiComponent.IsEnabled = false;
             UnsubscribeFromEvent(E.KeyUp);
             base.Deactivate();
         }
 
         /// <summary>
-        /// Key up handler to navigate back in the game state hierarchy.
+        ///     Key up handler to navigate back in the game state hierarchy.
         /// </summary>
         /// <param name="args"></param>
         private void HandleKeyUp(VariantMap args)
diff --git a/RbfxTemplate/Tile.cs b/RbfxTemplate/Tile.cs
index 7abedc1..5574ec9 100644
--- a/RbfxTemplate/Tile.cs
+++ b/RbfxTemplate/Tile.cs
@@ -6,15 +6,19 @@ namespace RbfxTemplate
     [Preserve(AllMembers = true)]
     public sealed class Tile : Component
     {
-        [Urho3DNet.SerializeField(Mode = AttributeMode.AmDefault | AttributeMode.AmNodeid, Name = "Link")]
+        [SerializeField(Mode = AttributeMode.AmDefault | AttributeMode.AmNodeid, Name = "Link")]
         private int _linkId;
 
-        [Urho3DNet.SerializeField(Mode = AttributeMode.AmDefault | AttributeMode.AmNodeid, Name = "LinkSource")]
+        [SerializeField(Mode = AttributeMode.AmDefault | AttributeMode.AmNodeid, Name = "LinkSource")]
         private int _linkSource;
 
-        [Urho3DNet.SerializeField(Mode = AttributeMode.AmDefault | AttributeMode.AmNodeid, Name = "LinkTarget")]
+        [SerializeField(Mode = AttributeMode.AmDefault | AttributeMode.AmNodeid, Name = "LinkTarget")]
         private int _linkTarget;
 
+        public Tile(Context context) : base(context)
+        {
+        }
+
         public Node Link { get; set; }
 
         public Node LinkSource { get; set; }
@@ -25,8 +29,12 @@ public sealed class Tile : Component
 
         public Tile LinkedTile { get; set; }
 
-        public Tile(Context context) : base(context)
+        public override void ApplyAttributes()
         {
+            Link = Scene.GetNode((uint)_linkId);
+            LinkSource = Scene.GetNode((uint)_linkSource);
+            LinkTarget = Scene.GetNode((uint)_linkTarget);
+            base.ApplyAttributes();
         }
 
         public void LinkTo(Tile tile)
@@ -39,14 +47,13 @@ public void LinkTo(Tile tile)
             {
                 var linkedTile = LinkedTile;
                 LinkedTile = null;
-                if (linkedTile != null)
-                {
-                    linkedTile.LinkTo(null);
-                }
+                if (linkedTile != null) linkedTile.LinkTo(null);
             }
 
             if (tile != null)
             {
+                var material = Context.ResourceCache.GetResource<Material>("Materials/White.material");
+                tile.Link.GetComponent<AnimatedModel>().SetMaterial(material);
                 LinkedTile = tile;
                 Link.IsEnabled = true;
                 LinkedTile.LinkTo(this);
@@ -57,13 +64,5 @@ public void LinkTo(Tile tile)
                 LinkTarget.LookAt(Node.WorldPosition);
             }
         }
-
-        public override void ApplyAttributes()
-        {
-            Link = Scene.GetNode((uint)_linkId);
-            LinkSource = Scene.GetNode((uint)_linkSource);
-            LinkTarget = Scene.GetNode((uint)_linkTarget);
-            base.ApplyAttributes();
-        }
     }
 }
\ No newline at end of file
diff --git a/RbfxTemplate/UrhoPluginApplication.cs b/RbfxTemplate/UrhoPluginApplication.cs
index 353e70c..ae9785e 100644
--- a/RbfxTemplate/UrhoPluginApplication.cs
+++ b/RbfxTemplate/UrhoPluginApplication.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Globalization;
-using System.IO;
 using Urho3DNet;
 
 namespace RbfxTemplate
@@ -13,9 +12,10 @@ namespace RbfxTemplate
     public class UrhoPluginApplication : PluginApplication
     {
         /// <summary>
-        /// PrivacyPolicyAccepted identifier
+        ///     PrivacyPolicyAccepted identifier
         /// </summary>
-        static readonly FileIdentifier privacyPolicyAcceptedFileId_ = new FileIdentifier("conf","PrivacyPolicyAccepted");
+        private static readonly FileIdentifier privacyPolicyAcceptedFileId_ =
+            new FileIdentifier("conf", "PrivacyPolicyAccepted");
 
         /// <summary>
         ///     Safe pointer to game screen.
@@ -41,6 +41,65 @@ public UrhoPluginApplication(Context context) : base(context)
         /// </summary>
         public bool IsGameRunning => _gameState;
 
+        public override bool IsMain()
+        {
+            return true;
+        }
+
+
+        /// <summary>
+        ///     Transition to game
+        /// </summary>
+        public void ToNewGame()
+        {
+            _gameState?.Dispose();
+            _gameState = new GameState(this);
+            _stateStack.Push(_gameState);
+        }
+
+        /// <summary>
+        ///     Transition to game
+        /// </summary>
+        public void ContinueGame()
+        {
+            if (_gameState) _stateStack.Push(_gameState);
+            ;
+        }
+
+        public void Quit()
+        {
+            Context.Engine.Exit();
+        }
+
+        public void HandleBackKey()
+        {
+            if (_stateStack.State == _mainMenuState.Ptr)
+            {
+                if (IsGameRunning)
+                    ContinueGame();
+                else
+                    Quit();
+            }
+            else
+            {
+                _stateStack.Pop();
+            }
+        }
+
+        /// <summary>
+        ///     Mark privacy policy as accepted and go to main menu.
+        /// </summary>
+        public void AcceptPrivacyPolicy()
+        {
+            // Create file marker that privacy policy was accepted.
+            Context.VirtualFileSystem.WriteAllText(privacyPolicyAcceptedFileId_,
+                DateTime.Now.ToString(CultureInfo.InvariantCulture));
+
+            // Crate end enqueue main menu screen.
+            _mainMenuState = _mainMenuState ?? new MainMenuState(this);
+            _stateStack.Switch(_mainMenuState);
+        }
+
 
         protected override void Load()
         {
@@ -52,11 +111,6 @@ protected override void Unload()
             Context.RemoveFactories(GetType().Assembly);
         }
 
-        public override bool IsMain()
-        {
-            return true;
-        }
-
         protected override void Start(bool isMain)
         {
             _stateStack = new StateStack(Context.GetSubsystem<StateManager>());
@@ -113,59 +167,5 @@ protected override void Resume(Archive input, bool differentVersion)
         {
             base.Resume(input, differentVersion);
         }
-
-
-        /// <summary>
-        ///     Transition to game
-        /// </summary>
-        public void ToNewGame()
-        {
-            _gameState?.Dispose();
-            _gameState = new GameState(this);
-            _stateStack.Push(_gameState);
-        }
-
-        /// <summary>
-        ///     Transition to game
-        /// </summary>
-        public void ContinueGame()
-        {
-            if (_gameState) _stateStack.Push(_gameState);
-            ;
-        }
-
-        public void Quit()
-        {
-            Context.Engine.Exit();
-        }
-
-        public void HandleBackKey()
-        {
-            if (_stateStack.State == _mainMenuState.Ptr)
-            {
-                if (IsGameRunning)
-                    ContinueGame();
-                else
-                    Quit();
-            }
-            else
-            {
-                _stateStack.Pop();
-            }
-        }
-
-        /// <summary>
-        /// Mark privacy policy as accepted and go to main menu.
-        /// </summary>
-        public void AcceptPrivacyPolicy()
-        {
-            // Create file marker that privacy policy was accepted.
-            Context.VirtualFileSystem.WriteAllText(privacyPolicyAcceptedFileId_,
-                DateTime.Now.ToString(CultureInfo.InvariantCulture));
-
-            // Crate end enqueue main menu screen.
-            _mainMenuState = _mainMenuState ?? new MainMenuState(this);
-            _stateStack.Switch(_mainMenuState);
-        }
     }
 }
\ No newline at end of file
