diff --git a/Assets/RenderAssets/URP Asset Renderer.asset b/Assets/RenderAssets/URP Asset Renderer.asset
index 544af25..46f5669 100644
--- a/Assets/RenderAssets/URP Asset Renderer.asset	
+++ b/Assets/RenderAssets/URP Asset Renderer.asset	
@@ -34,7 +34,7 @@ MonoBehaviour:
   - name: Additive with Mask
     maskTextureChannel: 1
     blendMode: 0
-  m_UseDepthStencilBuffer: 1
+  m_UseDepthStencilBuffer: 0
   m_UseCameraSortingLayersTexture: 0
   m_CameraSortingLayersTextureBound: -1
   m_CameraSortingLayerDownsamplingMethod: 0
diff --git a/Assets/RenderAssets/URP Asset.asset b/Assets/RenderAssets/URP Asset.asset
index 6f58113..ec51328 100644
--- a/Assets/RenderAssets/URP Asset.asset	
+++ b/Assets/RenderAssets/URP Asset.asset	
@@ -61,7 +61,7 @@ MonoBehaviour:
   m_MixedLightingSupported: 1
   m_SupportsLightLayers: 0
   m_DebugLevel: 0
-  m_UseAdaptivePerformance: 1
+  m_UseAdaptivePerformance: 0
   m_ColorGradingMode: 0
   m_ColorGradingLutSize: 32
   m_UseFastSRGBLinearConversion: 0
diff --git a/Assets/Scripts/Dimensions.cs b/Assets/Scripts/Dimensions.cs
index 658a3b3..93746f4 100644
--- a/Assets/Scripts/Dimensions.cs
+++ b/Assets/Scripts/Dimensions.cs
@@ -1,7 +1,6 @@
 using System;
 using UnityEngine;
 
-[ExecuteInEditMode]
 public class Dimensions : MonoBehaviour {
 	[Tooltip("How much height for player panels")]
 	public float panelHeightPercentage;
@@ -18,8 +17,18 @@ public class Dimensions : MonoBehaviour {
 	public SpriteRenderer background;
 
 	public static Dimensions Singleton;
-	private void OnEnable() {
+	private void Awake() {
 		Singleton = this;
+		GetComponents();
+	}
+
+	private void OnValidate() {
+		GetComponents();
+	}
+
+	private void GetComponents() {
+		topL = topC.GetComponent<LineRenderer>();
+		bottomL = bottomC.GetComponent<LineRenderer>();
 	}
 
 	public float top, bottom, left, right;
@@ -30,11 +39,6 @@ public class Dimensions : MonoBehaviour {
 
 	private LineRenderer topL, bottomL;
 
-	private void OnValidate() {
-		topL = topC.GetComponent<LineRenderer>();
-		bottomL = bottomC.GetComponent<LineRenderer>();
-	}
-
 	private void Update() {
 		float height = mainCamera.orthographicSize * 2;
 		float panelHeight = height * panelHeightPercentage / 100f;
diff --git a/Assets/Scripts/Dimensions.cs.meta b/Assets/Scripts/Dimensions.cs.meta
index 0a5ff89..990e77d 100644
--- a/Assets/Scripts/Dimensions.cs.meta
+++ b/Assets/Scripts/Dimensions.cs.meta
@@ -1,3 +1,11 @@
 fileFormatVersion: 2
 guid: 572c5b8dd6a94b3585befaa50a883755
-timeCreated: 1680781703
\ No newline at end of file
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: -10
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Game/GameManager.cs b/Assets/Scripts/Game/GameManager.cs
index 903832b..89cf81c 100644
--- a/Assets/Scripts/Game/GameManager.cs
+++ b/Assets/Scripts/Game/GameManager.cs
@@ -16,6 +16,10 @@ namespace Game {
 
 		private void OnEnable() {
 			Singleton = this;
+			
+			// Move this to settings
+			Application.targetFrameRate = 144;
+			QualitySettings.vSyncCount = 0;
 		}
 
 		public Object ballPrefab;
diff --git a/Assets/Scripts/Game/Player.cs b/Assets/Scripts/Game/Player.cs
index 3c3bd77..c83f0d9 100644
--- a/Assets/Scripts/Game/Player.cs
+++ b/Assets/Scripts/Game/Player.cs
@@ -1,14 +1,9 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Transactions;
 using Unity.Netcode;
-using UnityEditor;
-using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.InputSystem;
-using UnityEngine.Serialization;
 using UnityEngine.UIElements;
 
 namespace Game {
@@ -42,8 +37,8 @@ namespace Game {
 		}
 
 		// Unit distance from zero
-		private readonly float baseBorder = Dimensions.Singleton.Width / 2 * 0.8f;
-		private readonly float borderSummand = Dimensions.Singleton.Width / 2 * 0.2f;
+		private readonly float baseBorder = Dimensions.Singleton.Width / 2 * 0.9f;
+		private readonly float borderSummand = Dimensions.Singleton.Width / 2 * 0.1f;
 		protected float Border {
 			get {
 				return Mathf.Min(Modifications.Where(m => m.Properties.effect == ModEffect.Border)
diff --git a/Assets/Scripts/GameUI.cs b/Assets/Scripts/GameUI.cs
index 72944eb..0db1e40 100644
--- a/Assets/Scripts/GameUI.cs
+++ b/Assets/Scripts/GameUI.cs
@@ -2,9 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Game;
-using UnityEditor.UIElements;
 using UnityEngine;
-using UnityEngine.Assertions;
 using UnityEngine.UIElements;
 
 public class GameUI : MonoBehaviour {
@@ -52,24 +50,25 @@ public class GameUI : MonoBehaviour {
 		float heightPercentage = Dimensions.Singleton.panelHeightPercentage;
 		PlayerPanel(Side.Top).style.height = PlayerPanel(Side.Bottom).style.height = Length.Percent(heightPercentage);
 		
-		SetupButtons(Side.Top);
-		SetupButtons(Side.Bottom);
+		SetupGoButton(Side.Top, "left");
+		SetupGoButton(Side.Top, "right");
+		SetupGoButton(Side.Bottom, "left");
+		SetupGoButton(Side.Bottom, "right");
 	}
 	
-	public delegate void ButtonDown(Side side, string direction);
+	public delegate void ButtonDown(Side verticalSide, string horizontalSide);
 	public delegate void ButtonUp(Side side, string direction);
 	public ButtonDown buttonDown;
 	public ButtonUp buttonUp;
 
-	private void SetupButtons(Side side) {
-		Button btnLeft = PlayerPanel(side).Q<Button>("btn_left");
-		btnLeft.clickable.activators.Clear();
-		btnLeft.RegisterCallback<MouseDownEvent>(_ => buttonDown(side, "left"));
-		btnLeft.RegisterCallback<MouseUpEvent>(_ => buttonUp(side, "left"));
-
-		Button btnRight = PlayerPanel(side).Q<Button>("btn_right");
-		btnRight.clickable.activators.Clear();
-		btnRight.RegisterCallback<MouseDownEvent>(_ => buttonDown(side, "right"));
-		btnRight.RegisterCallback<MouseUpEvent>(_ => buttonUp(side, "right"));
+	private Label GetGoButton(Side sideVertical, string sideHorizontal) {
+		return PlayerPanel(sideVertical).Q<Label>("go_" + sideHorizontal);
+	}
+	
+	private void SetupGoButton(Side sideVertical, string sideHorizontal) {
+		var element = GetGoButton(sideVertical, sideHorizontal);
+		element.RegisterCallback<PointerDownEvent>(_ => buttonDown(sideVertical, sideHorizontal));
+		element.RegisterCallback<PointerUpEvent>(_ => buttonUp(sideVertical, sideHorizontal));
+		element.RegisterCallback<PointerLeaveEvent>(_ => buttonUp(sideVertical, sideHorizontal));
 	}
 }
diff --git a/Assets/UI Toolkit/PlayerUI.uxml b/Assets/UI Toolkit/PlayerUI.uxml
index a0a17c1..2e7fe2a 100644
--- a/Assets/UI Toolkit/PlayerUI.uxml	
+++ b/Assets/UI Toolkit/PlayerUI.uxml	
@@ -1,9 +1,9 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
     <Style src="project://database/Assets/UI%20Toolkit/styles.uss?fileID=7433441132597879392&amp;guid=a6abab2f6d20ba823bad41d2081810e9&amp;type=3#styles" />
     <Style src="project://database/Assets/UI%20Toolkit/player_panel.uss?fileID=7433441132597879392&amp;guid=102b2cb1b84d8883abde9356b92d807e&amp;type=3#player_panel" />
-    <ui:Button display-tooltip-when-elided="true" name="btn_left" text="←" />
+    <ui:Label text="←" display-tooltip-when-elided="true" name="go_left" class="go" />
     <ui:VisualElement class="mods_list" />
     <ui:Label display-tooltip-when-elided="true" name="score" binding-path="m_Score" />
     <ui:VisualElement class="mods_list" />
-    <ui:Button display-tooltip-when-elided="true" name="btn_right" text="→" />
+    <ui:Label text="→" display-tooltip-when-elided="true" name="go_right" class="go" />
 </ui:UXML>
diff --git a/Assets/UI Toolkit/game.uss b/Assets/UI Toolkit/game.uss
index 18a50d2..d9faf3f 100644
--- a/Assets/UI Toolkit/game.uss	
+++ b/Assets/UI Toolkit/game.uss	
@@ -2,6 +2,6 @@
     width: 100%;
     position: absolute;
     flex-direction: row;
-    align-items: center;
+    align-items: stretch;
     justify-content: space-between;
 }
diff --git a/Assets/UI Toolkit/player_panel.uss b/Assets/UI Toolkit/player_panel.uss
index 73d8226..ecbc187 100644
--- a/Assets/UI Toolkit/player_panel.uss	
+++ b/Assets/UI Toolkit/player_panel.uss	
@@ -1,8 +1,26 @@
-Button {
-    flex-grow: 0;
-    height: auto;
-    width: 50px;
-    font-size: 30px;
+.go {
+    flex-shrink: 1;
+    width: auto;
+    font-size: 50px;
+    -unity-text-align: middle-center;
+    border-left-color: rgb(141, 157, 255);
+    border-right-color: rgb(141, 157, 255);
+    border-top-color: rgb(141, 157, 255);
+    border-bottom-color: rgb(141, 157, 255);
+    border-left-width: 3px;
+    border-right-width: 3px;
+    border-top-width: 3px;
+    border-bottom-width: 3px;
+    border-top-left-radius: 5px;
+    border-bottom-left-radius: 5px;
+    border-top-right-radius: 5px;
+    border-bottom-right-radius: 5px;
+    margin-left: 10px;
+    margin-right: 10px;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    background-color: rgba(91, 91, 91, 255);
+    flex-grow: 1;
 }
 
 .mods_list {
@@ -23,10 +41,16 @@ Button {
 .mods_list > VisualElement {
     width: 100%;
     flex-grow: 1;
-    background-image: url('project://database/Packages/com.unity.2d.sprite/Editor/ObjectMenuCreation/DefaultAssets/Textures/HexagonFlat-Top.png?fileID=2747690628134850419&guid=16037dbd798344f57a526d53d48f5ead&type=3#Hexagon Flat-Top');
     -unity-background-scale-mode: scale-to-fit;
     margin-right: 0;
     margin-bottom: 5px;
     margin-top: 5px;
     max-height: 50%;
 }
+
+.go:hover {
+    border-left-color: rgba(64, 72, 255, 255);
+    border-right-color: rgba(64, 72, 255, 255);
+    border-top-color: rgba(64, 72, 255, 255);
+    border-bottom-color: rgba(64, 72, 255, 255);
+}
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 9377f69..88c7af7 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -2,7 +2,6 @@
   "dependencies": {
     "com.unity.adaptiveperformance.samsung.android": "4.0.2",
     "com.unity.collab-proxy": "2.0.0",
-    "com.unity.feature.2d": "1.0.0",
     "com.unity.feature.mobile": "1.0.0",
     "com.unity.ide.rider": "3.0.18",
     "com.unity.ide.visualstudio": "2.0.17",
@@ -33,7 +32,6 @@
     "com.unity.modules.terrainphysics": "1.0.0",
     "com.unity.modules.tilemap": "1.0.0",
     "com.unity.modules.ui": "1.0.0",
-    "com.unity.modules.uielements": "1.0.0",
     "com.unity.modules.umbra": "1.0.0",
     "com.unity.modules.unityanalytics": "1.0.0",
     "com.unity.modules.unitywebrequest": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 003ed3c..5cdddb9 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,90 +1,5 @@
 {
   "dependencies": {
-    "com.unity.2d.animation": {
-      "version": "7.0.9",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.2d.common": "6.0.6",
-        "com.unity.2d.sprite": "1.0.0",
-        "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.uielements": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.2d.common": {
-      "version": "6.0.6",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.2d.sprite": "1.0.0",
-        "com.unity.mathematics": "1.1.0",
-        "com.unity.modules.uielements": "1.0.0",
-        "com.unity.burst": "1.5.1"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.2d.path": {
-      "version": "5.0.2",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.2d.pixel-perfect": {
-      "version": "5.0.3",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.2d.psdimporter": {
-      "version": "6.0.7",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.2d.animation": "7.0.9",
-        "com.unity.2d.common": "6.0.6",
-        "com.unity.2d.sprite": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.2d.sprite": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.2d.spriteshape": {
-      "version": "7.0.6",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.mathematics": "1.1.0",
-        "com.unity.2d.common": "6.0.4",
-        "com.unity.2d.path": "5.0.2",
-        "com.unity.modules.physics2d": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.2d.tilemap": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.2d.tilemap.extras": {
-      "version": "2.2.4",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.tilemap": "1.0.0",
-        "com.unity.2d.tilemap": "1.0.0",
-        "com.unity.ugui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.adaptiveperformance": {
       "version": "4.0.1",
       "depth": 1,
@@ -137,20 +52,6 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
-    "com.unity.feature.2d": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.2d.animation": "7.0.9",
-        "com.unity.2d.pixel-perfect": "5.0.3",
-        "com.unity.2d.psdimporter": "6.0.7",
-        "com.unity.2d.sprite": "1.0.0",
-        "com.unity.2d.spriteshape": "7.0.6",
-        "com.unity.2d.tilemap": "1.0.0",
-        "com.unity.2d.tilemap.extras": "2.2.4"
-      }
-    },
     "com.unity.feature.mobile": {
       "version": "1.0.0",
       "depth": 0,
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index b1c8b22..ffcf985 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -167,15 +167,15 @@ PlayerSettings:
     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 0
-  AndroidBundleVersionCode: 3
+  AndroidBundleVersionCode: 4
   AndroidMinSdkVersion: 22
-  AndroidTargetSdkVersion: 0
+  AndroidTargetSdkVersion: 33
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   stripEngineCode: 1
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  ForceInternetPermission: 0
+  ForceInternetPermission: 1
   ForceSDCardPermission: 0
   CreateWallpaper: 0
   APKExpansionFiles: 0
@@ -677,8 +677,10 @@ PlayerSettings:
   platformArchitecture: {}
   scriptingBackend:
     Android: 1
-  il2cppCompilerConfiguration: {}
-  managedStrippingLevel: {}
+  il2cppCompilerConfiguration:
+    Android: 2
+  managedStrippingLevel:
+    Android: 3
   incrementalIl2cppBuild: {}
   suppressCommonWarnings: 1
   allowUnsafeCode: 0