diff --git a/assets b/assets
index 4a7b5c2..3c4d811 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 4a7b5c236d0177881b62cda56cb97300a329a06c
+Subproject commit 3c4d81137f4f3f185080597045ec93e7ab1d6ae9
diff --git a/src/GUI/Frame.h b/src/GUI/Frame.h
index f82095f..a38466a 100644
--- a/src/GUI/Frame.h
+++ b/src/GUI/Frame.h
@@ -82,7 +82,13 @@ public:
 	std::string Name() const { return m_Name; }
 	void SetName(std::string val) { m_Name = val; }
 	int Layer() const { return m_Layer; }
-	bool Hidden() const { return m_Hidden; }
+	bool Hidden() const 
+	{ 
+		if (m_Parent)
+			return m_Parent->Hidden() || m_Hidden;
+		else
+			return m_Hidden; 
+	}
 	void Hide() { m_Hidden = true; }
 	void Show() { m_Hidden = false; }
 
diff --git a/src/GUI/GameFrame.h b/src/GUI/GameFrame.h
index 36235a2..c09239f 100644
--- a/src/GUI/GameFrame.h
+++ b/src/GUI/GameFrame.h
@@ -26,8 +26,7 @@ public:
 			vp1->X = 0;
 			vp1->Width = this->Width / 2.f;
 			//new PlayerHUD(vp1, "PlayerHUD", m_World, 1);
-			new VehicleSelection(vp1, "VehicleSelection", m_World, 1);
-			
+			auto vehicleSelection = new VehicleSelection(vp1, "VehicleSelection", m_World, 1);
 
 			vp2 = new Viewport(worldFrame, "Viewport2", m_World);
 			vp2->X = vp1->Right();
diff --git a/src/Systems/TankSteeringSystem.cpp b/src/Systems/TankSteeringSystem.cpp
index d057079..8c1f9f6 100644
--- a/src/Systems/TankSteeringSystem.cpp
+++ b/src/Systems/TankSteeringSystem.cpp
@@ -281,8 +281,6 @@ bool Systems::TankSteeringSystem::OnSpawnVehicle(const Events::SpawnVehicle &eve
 		else if (event.PlayerID == 2)
 			e.ViewportFrame = "Viewport2";
 		EventBroker->Publish(e);
-		e.ViewportFrame = "Viewport2";
-		EventBroker->Publish(e);
 	}
 
 	return true;