diff --git a/binaries/data/mods/public/gui/session/hotkeys/misc.xml b/binaries/data/mods/public/gui/session/hotkeys/misc.xml
index fd6539d479..e846075095 100644
--- a/binaries/data/mods/public/gui/session/hotkeys/misc.xml
+++ b/binaries/data/mods/public/gui/session/hotkeys/misc.xml
@@ -9,7 +9,7 @@
 	</object>
 
 	<object hotkey="session.gui.tutorial.toggle">
-		<action on="Press">toggleTutorial();</action>
+		<action on="Press">g_Tutorial?.toggle();</action>
 	</object>
 
 	<object hotkey="silhouettes">
diff --git a/binaries/data/mods/public/gui/session/messages.js b/binaries/data/mods/public/gui/session/messages.js
index 77f2c28615..fae1a0c1a7 100644
--- a/binaries/data/mods/public/gui/session/messages.js
+++ b/binaries/data/mods/public/gui/session/messages.js
@@ -1,13 +1,3 @@
-/**
- * All tutorial messages received so far.
- */
-var g_TutorialMessages = [];
-
-/**
- * GUI tags applied to the most recent tutorial message.
- */
-var g_TutorialNewMessageTags = { "color": "255 226 149" };
-
 /**
  * The number of seconds we monitor to rate limit flares.
  */
@@ -174,7 +164,7 @@ var g_NotificationsTypes =
 		},
 		"tutorial": function(notification, player)
 		{
-			updateTutorial(notification);
+			g_Tutorial.update(notification);
 		},
 		"tribute": function(notification, player)
 		{
@@ -335,7 +325,7 @@ function findGuidForPlayerID(playerID)
 /**
  * Processes all pending notifications sent from the GUIInterface simulation component.
  */
-function handleNotifications(closePageCallback)
+function handleNotifications()
 {
 	for (const notification of Engine.GuiInterfaceCall("GetNotifications"))
 	{
@@ -346,7 +336,7 @@ function handleNotifications(closePageCallback)
 		}
 
 		for (const player of notification.players)
-			g_NotificationsTypes[notification.type](notification, player, closePageCallback);
+			g_NotificationsTypes[notification.type](notification, player);
 	}
 }
 
@@ -365,57 +355,6 @@ function focusAttack(attack)
 	}
 }
 
-function toggleTutorial()
-{
-	const tutorialPanel = Engine.GetGUIObjectByName("tutorialPanel");
-	tutorialPanel.hidden = !tutorialPanel.hidden || !Engine.GetGUIObjectByName("tutorialText").caption;
-}
-
-/**
- * Updates the tutorial panel when a new goal.
- */
-function updateTutorial(notification, closePageCallback)
-{
-	// Show the tutorial panel if not yet done
-	Engine.GetGUIObjectByName("tutorialPanel").hidden = false;
-
-	if (notification.warning)
-	{
-		Engine.GetGUIObjectByName("tutorialWarning").caption = coloredText(translate(notification.warning), "orange");
-		return;
-	}
-
-	const notificationText =
-		notification.instructions.reduce((instructions, item) =>
-			instructions + (typeof item === "string" ? translate(item) : colorizeHotkey(translate(item.text), item.hotkey)),
-		"");
-
-	Engine.GetGUIObjectByName("tutorialText").caption = g_TutorialMessages.concat(setStringTags(notificationText, g_TutorialNewMessageTags)).join("\n");
-	g_TutorialMessages.push(notificationText);
-
-	if (notification.readyButton)
-	{
-		Engine.GetGUIObjectByName("tutorialReady").hidden = false;
-		if (notification.leave)
-		{
-			Engine.GetGUIObjectByName("tutorialWarning").caption = translate("Click to quit this tutorial.");
-			Engine.GetGUIObjectByName("tutorialReady").caption = translate("Quit");
-
-			Engine.GetGUIObjectByName("tutorialReady").onPress = () =>
-			{
-				closePageCallback({ [Engine.openRequest]: endGame(true) });
-			};
-		}
-		else
-			Engine.GetGUIObjectByName("tutorialWarning").caption = translate("Click when ready.");
-	}
-	else
-	{
-		Engine.GetGUIObjectByName("tutorialWarning").caption = translate("Follow the instructions.");
-		Engine.GetGUIObjectByName("tutorialReady").hidden = true;
-	}
-}
-
 /**
  * Process every CNetMessage (see NetMessage.h, NetMessages.h) sent by the CNetServer.
  * Saves the received object to mainlog.html.
diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js
index 2176ce05b2..90ef75f54a 100644
--- a/binaries/data/mods/public/gui/session/session.js
+++ b/binaries/data/mods/public/gui/session/session.js
@@ -35,6 +35,7 @@ var g_ResearchProgress;
 var g_TimeNotificationOverlay;
 var g_TopPanel;
 var g_TradeDialog;
+var g_Tutorial;
 
 /**
  * Map, player and match settings set in game setup.
@@ -284,6 +285,7 @@ async function init(initData, hotloadData)
 	g_DiplomacyColors = new DiplomacyColors();
 	g_PlayerViewControl = new PlayerViewControl();
 	g_PlayerViewControl.registerViewedPlayerChangeHandler(g_DiplomacyColors.updateDisplayedPlayerColors.bind(g_DiplomacyColors));
+	g_PlayerViewControl.registerViewedPlayerChangeHandler(resetTemplates);
 	g_DiplomacyColors.registerDiplomacyColorsChangeHandler(g_PlayerViewControl.rebuild.bind(g_PlayerViewControl));
 	g_DiplomacyColors.registerDiplomacyColorsChangeHandler(updateGUIObjects);
 	g_PauseControl = new PauseControl();
@@ -339,18 +341,17 @@ async function init(initData, hotloadData)
 			handleNetMessages().catch(reject);
 	}), new Promise(closePageCallback =>
 	{
-		g_PlayerViewControl.registerViewedPlayerChangeHandler(resetTemplates.bind(undefined,
-			closePageCallback));
 		g_Menu = new Menu(g_PauseControl, g_PlayerViewControl, g_Chat, closePageCallback);
 		g_NetworkStatusOverlay = new NetworkStatusOverlay(closePageCallback);
 		g_QuitConfirmationDefeat = new QuitConfirmationDefeat(closePageCallback);
 		g_QuitConfirmationReplay = new QuitConfirmationReplay(closePageCallback);
-		// TODO: use event instead
-		onSimulationUpdate(closePageCallback);
-		Engine.GetGUIObjectByName("session").onSimulationUpdate =
-			onSimulationUpdate.bind(undefined, closePageCallback);
+		g_Tutorial = new Tutorial(closePageCallback);
 	})]);
 
+	// TODO: use event instead
+	onSimulationUpdate();
+	Engine.GetGUIObjectByName("session").onSimulationUpdate = onSimulationUpdate;
+
 	for (const handler of g_PlayersInitHandlers)
 		handler();
 
@@ -472,14 +473,14 @@ function initializeMusic()
 	global.music.setState(global.music.states.PEACE);
 }
 
-function resetTemplates(closePageCallback)
+function resetTemplates()
 {
 	// Update GUI and clear player-dependent cache
 	g_TemplateData = {};
 	Engine.GuiInterfaceCall("ResetTemplateModified");
 
 	// TODO: do this more selectively
-	onSimulationUpdate(closePageCallback);
+	onSimulationUpdate();
 }
 
 /**
@@ -677,7 +678,7 @@ function onTick()
 	Engine.GuiInterfaceCall("ClearRenamedEntities");
 }
 
-function onSimulationUpdate(closePageCallback)
+function onSimulationUpdate()
 {
 	// Templates change depending on technologies and auras, so they have to be reloaded after such a change.
 	// g_TechnologyData data never changes, so it shouldn't be deleted.
@@ -705,7 +706,7 @@ function onSimulationUpdate(closePageCallback)
 		handler();
 
 	// TODO: Move to handlers
-	handleNotifications(closePageCallback);
+	handleNotifications();
 	updateGUIObjects();
 }
 
diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml
index 3a7fdc8f35..8687b30664 100644
--- a/binaries/data/mods/public/gui/session/session.xml
+++ b/binaries/data/mods/public/gui/session/session.xml
@@ -20,6 +20,7 @@
 <script directory="gui/session/top_panel/"/>
 <script directory="gui/session/top_panel/IconButtons/"/>
 <script directory="gui/session/trade/"/>
+<script directory="gui/session/tutorial/"/>
 
 <object name="session">
 
@@ -52,7 +53,7 @@
 		<include file="gui/session/TimeNotificationOverlay.xml"/>
 		<include file="gui/session/TopPanel.xml"/>
 		<include file="gui/session/trade/TradeDialog.xml"/>
-		<include file="gui/session/tutorial_panel.xml"/>
+		<include file="gui/session/tutorial/Tutorial.xml"/>
 		<include file="gui/session/Menu.xml"/>
 
 		<!-- Contains miscellanious objects s.a.: the technology research -->
diff --git a/binaries/data/mods/public/gui/session/tutorial/Tutorial.js b/binaries/data/mods/public/gui/session/tutorial/Tutorial.js
new file mode 100644
index 0000000000..92350878b3
--- /dev/null
+++ b/binaries/data/mods/public/gui/session/tutorial/Tutorial.js
@@ -0,0 +1,62 @@
+class Tutorial
+{
+	panel = Engine.GetGUIObjectByName("tutorialPanel");
+	text = Engine.GetGUIObjectByName("tutorialText");
+	warning = Engine.GetGUIObjectByName("tutorialWarning");
+	readyButton = Engine.GetGUIObjectByName("tutorialReady");
+	instructions = [];
+	closePageCallback;
+
+	constructor(closePageCallback)
+	{
+		this.closePageCallback = closePageCallback;
+	}
+
+	toggle()
+	{
+		this.panel.hidden = !this.panel.hidden || !this.text.caption;
+	}
+
+	update(notification)
+	{
+		this.panel.hidden = false;
+
+		if (notification.warning)
+		{
+			this.warning.caption = coloredText(translate(notification.warning), "orange");
+			return;
+		}
+
+		const notificationText =
+			notification.instructions.reduce((instructions, item) =>
+				instructions + (typeof item === "string" ? translate(item) : colorizeHotkey(translate(item.text), item.hotkey)),
+			"");
+
+		this.text.caption = this.instructions.concat(setStringTags(notificationText, this.NewInstructionTags)).join("\n");
+		this.instructions.push(notificationText);
+
+		if (notification.readyButton)
+		{
+			this.readyButton.hidden = false;
+			if (notification.leave)
+			{
+				this.warning.caption = translate("Click to quit this tutorial.");
+				this.readyButton.caption = translate("Quit");
+				this.readyButton.onPress = () => { this.closePageCallback({ [Engine.openRequest]: endGame(true) }); };
+			}
+			else
+				this.warning.caption = translate("Click when ready.");
+		}
+		else
+		{
+			this.warning.caption = translate("Follow the instructions.");
+			this.readyButton.hidden = true;
+		}
+	}
+}
+
+/**
+ * GUI tags applied to the most recent instruction.
+ */
+Tutorial.prototype.NewInstructionTags = { "color": "255 226 149" };
+
diff --git a/binaries/data/mods/public/gui/session/tutorial_panel.xml b/binaries/data/mods/public/gui/session/tutorial/Tutorial.xml
similarity index 100%
rename from binaries/data/mods/public/gui/session/tutorial_panel.xml
rename to binaries/data/mods/public/gui/session/tutorial/Tutorial.xml