diff --git a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/cart.fxml b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/cart.fxml
index 4091936..80504f2 100644
--- a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/cart.fxml
+++ b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/cart.fxml
@@ -19,8 +19,8 @@
          <children>
             <Label fx:id="mainTitle" onMouseClicked="#handleTitleClick" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
             <Pane HBox.hgrow="ALWAYS" />
-            <Button fx:id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button id="cartBtn" fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
+            <Button id="loginBtn" fx:id="loginBtn" mnemonicParsing="false" onAction="#handleLoginButton" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
diff --git a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/checkOut.fxml b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/checkOut.fxml
index 619c3b2..fba563d 100644
--- a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/checkOut.fxml
+++ b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/checkOut.fxml
@@ -20,8 +20,8 @@
          <children>
             <Label fx:id="mainTitle" onMouseClicked="#handleTitleClick" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
             <Pane fx:id="headerSpacer" HBox.hgrow="ALWAYS" />
-            <Button fx:id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button id="cartBtn" fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
+            <Button id="loginBtn" fx:id="loginBtn" mnemonicParsing="false" onAction="#handleLoginButton" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
diff --git a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/login.fxml b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/login.fxml
index 3287a7a..31b72f5 100644
--- a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/login.fxml
+++ b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/login.fxml
@@ -21,8 +21,8 @@
          <children>
             <Label fx:id="mainTitle" onMouseClicked="#handleTitleClick" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
             <Pane HBox.hgrow="ALWAYS" />
-            <Button fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
-            <Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button id="cartBtn" fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
+            <Button id="loginBtn" fx:id="loginBtn" mnemonicParsing="false" onAction="#handleLoginButton" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
diff --git a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/register.fxml b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/register.fxml
index b72ce57..6c2043a 100644
--- a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/register.fxml
+++ b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/resources/com/example/register.fxml
@@ -23,8 +23,8 @@
             <Pane fx:id="spacerPane" HBox.hgrow="ALWAYS" />
             
             <!-- Buttons -->
-            <Button id="cartBtn" fx:id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button id="loginBtn" fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button id="cartBtn" fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
+            <Button id="loginBtn" fx:id="loginBtn" mnemonicParsing="false" onAction="#handleLoginButton" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
diff --git a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/cart.fxml b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/cart.fxml
index 4091936..80504f2 100644
--- a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/cart.fxml
+++ b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/cart.fxml
@@ -19,8 +19,8 @@
          <children>
             <Label fx:id="mainTitle" onMouseClicked="#handleTitleClick" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
             <Pane HBox.hgrow="ALWAYS" />
-            <Button fx:id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button id="cartBtn" fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
+            <Button id="loginBtn" fx:id="loginBtn" mnemonicParsing="false" onAction="#handleLoginButton" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
diff --git a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/checkOut.fxml b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/checkOut.fxml
index 619c3b2..fba563d 100644
--- a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/checkOut.fxml
+++ b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/checkOut.fxml
@@ -20,8 +20,8 @@
          <children>
             <Label fx:id="mainTitle" onMouseClicked="#handleTitleClick" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
             <Pane fx:id="headerSpacer" HBox.hgrow="ALWAYS" />
-            <Button fx:id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button id="cartBtn" fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
+            <Button id="loginBtn" fx:id="loginBtn" mnemonicParsing="false" onAction="#handleLoginButton" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
diff --git a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/login.fxml b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/login.fxml
index 3287a7a..31b72f5 100644
--- a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/login.fxml
+++ b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/login.fxml
@@ -21,8 +21,8 @@
          <children>
             <Label fx:id="mainTitle" onMouseClicked="#handleTitleClick" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
             <Pane HBox.hgrow="ALWAYS" />
-            <Button fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
-            <Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button id="cartBtn" fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
+            <Button id="loginBtn" fx:id="loginBtn" mnemonicParsing="false" onAction="#handleLoginButton" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
diff --git a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/register.fxml b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/register.fxml
index b72ce57..6c2043a 100644
--- a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/register.fxml
+++ b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/register.fxml
@@ -23,8 +23,8 @@
             <Pane fx:id="spacerPane" HBox.hgrow="ALWAYS" />
             
             <!-- Buttons -->
-            <Button id="cartBtn" fx:id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button id="loginBtn" fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button id="cartBtn" fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
+            <Button id="loginBtn" fx:id="loginBtn" mnemonicParsing="false" onAction="#handleLoginButton" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />