diff --git a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/java/com/example/CartController.java b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/java/com/example/CartController.java
index 0b3ec89..3fc19d1 100644
--- a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/java/com/example/CartController.java
+++ b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/java/com/example/CartController.java
@@ -1,5 +1,7 @@
 package com.example;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -42,25 +44,29 @@ public class CartController {
     @FXML
     private Label mainTitle;
 
+    // Observable list to hold cart items
+    private final ObservableList<Item> cartItems = FXCollections.observableArrayList();
+
     // Initialize method to set up the TableView
     @FXML
     public void initialize() {
+        // Set up columns to match Item properties
         nameColumn.setCellValueFactory(new PropertyValueFactory<>("name"));
         descriptionColumn.setCellValueFactory(new PropertyValueFactory<>("description"));
         quantityColumn.setCellValueFactory(new PropertyValueFactory<>("quantity"));
         priceColumn.setCellValueFactory(new PropertyValueFactory<>("price"));
 
-        // Populate the table with some sample data (replace with actual logic later)
-        cartContent.getItems().addAll(
+        // Populate the cart table with sample data for demonstration
+        cartItems.addAll(
                 new Item("Book A", "A fascinating fantasy novel.", 1, 12.99),
                 new Item("Book B", "A thrilling sequel.", 2, 10.50));
+        cartContent.setItems(cartItems);
     }
 
     @FXML
     private void handleCartButton(ActionEvent event) {
         System.out.println("Cart button clicked!");
         try {
-            // Navigate to the cart page (using the setRoot method from App)
             App.setRoot("cart");
         } catch (IOException e) {
             e.printStackTrace();
@@ -71,7 +77,6 @@ public class CartController {
     private void handleLoginButton(ActionEvent event) {
         System.out.println("Login button clicked!");
         try {
-            // Navigate to the login page
             App.setRoot("login");
         } catch (IOException e) {
             e.printStackTrace();
@@ -80,10 +85,13 @@ public class CartController {
 
     @FXML
     private void handleCheckOutButton(ActionEvent event) {
-        System.out.println("Checkout button clicked!");
-        // Add logic to proceed to checkout
+        if (cartItems.isEmpty()) {
+            System.out.println("Cart is empty. Cannot proceed to checkout.");
+            return;
+        }
+
+        System.out.println("Proceeding to checkout...");
         try {
-            // Navigate to the checkout page
             App.setRoot("checkout");
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/java/com/example/ShopController.java b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/java/com/example/ShopController.java
index 37e3a6c..392882c 100644
--- a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/java/com/example/ShopController.java
+++ b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/src/main/java/com/example/ShopController.java
@@ -78,9 +78,8 @@ public class ShopController {
     }
 
     @FXML
-    private void handleLoginButton() {
-        System.out.println("Login button clicked!");
-        // Logic for handling login.
+    private void handleLoginButton() throws IOException {
+        App.setRoot("login");
     }
 
     @FXML
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 ffb567b..142f89f 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
@@ -15,17 +15,17 @@
 
 <fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" type="BorderPane" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.CartController">
    <top>
-      <HBox id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
+      <HBox fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
          <children>
             <!-- Main Title -->
-            <Label id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
+            <Label fx:id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
             
             <!-- Spacer for alignment -->
             <Pane HBox.hgrow="ALWAYS" />
             
             <!-- Buttons -->
-            <Button id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button fx:id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
+            <Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
@@ -33,7 +33,7 @@
       </HBox>
    </top>
    <center>
-      <GridPane id="main" styleClass="main" BorderPane.alignment="CENTER">
+      <GridPane fx:id="main" styleClass="main" BorderPane.alignment="CENTER">
          <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" minWidth="100.0" prefWidth="100.0" />
          </columnConstraints>
@@ -46,52 +46,52 @@
             <Insets />
          </BorderPane.margin>
          <children>
-            <Button id="btnCheckOut" mnemonicParsing="false" styleClass="btnCheckOut" text="Check out" GridPane.rowIndex="2" />
-            <Label id="cartTitle" styleClass="cartTitle" text="Your cart" />
-            <TableView id="cartContent" prefHeight="0.0" prefWidth="364.0" GridPane.rowIndex="1">
+            <Button fx:id="btnCheckOut" mnemonicParsing="false" styleClass="btnCheckOut" text="Check out" GridPane.rowIndex="2" />
+            <Label fx:id="cartTitle" styleClass="cartTitle" text="Your cart" />
+            <TableView fx:id="cartContent" prefHeight="0.0" prefWidth="364.0" GridPane.rowIndex="1">
                <columns>
-                     <TableColumn id="nameColumn" prefWidth="243.0" text="Name" />
-                     <TableColumn id="descriptionColumn" prefWidth="615.0" text="Description" />
-                     <TableColumn id="quantityColumn" minWidth="0.0" prefWidth="154.0" text="Quantity" />
-                     <TableColumn id="priceColumn" minWidth="0.0" prefWidth="147.0" text="Price" />
+                  <TableColumn fx:id="nameColumn" prefWidth="243.0" text="Name" />
+                  <TableColumn fx:id="descriptionColumn" prefWidth="615.0" text="Description" />
+                  <TableColumn fx:id="quantityColumn" minWidth="0.0" prefWidth="154.0" text="Quantity" />
+                  <TableColumn fx:id="priceColumn" minWidth="0.0" prefWidth="147.0" text="Price" />
                </columns>
             </TableView>
          </children>
       </GridPane>
    </center>
    <bottom>
-      <VBox id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
+      <VBox fx:id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
          <children>
-            <HBox id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
+            <HBox fx:id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
                <children>
-                  <VBox id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
+                  <VBox fx:id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
                      <children>
-                        <Label id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
-                        <Label id="footerHome" styleClass="footerText" text="Home" />
-                        <Label id="footerAbout" styleClass="footerText" text="About Us" />
-                        <Label id="footerContact" styleClass="footerText" text="Contact" />
+                        <Label fx:id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
+                        <Label fx:id="footerHome" styleClass="footerText" text="Home" />
+                        <Label fx:id="footerAbout" styleClass="footerText" text="About Us" />
+                        <Label fx:id="footerContact" styleClass="footerText" text="Contact" />
                      </children>
                   </VBox>
-                  <VBox id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
+                  <VBox fx:id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
                      <children>
-                        <Label id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
-                        <Label id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
-                        <Label id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
+                        <Label fx:id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
+                        <Label fx:id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
+                        <Label fx:id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
                      </children>
                   </VBox>
-                  <VBox id="followUs" alignment="TOP_RIGHT" spacing="10.0">
+                  <VBox fx:id="followUs" alignment="TOP_RIGHT" spacing="10.0">
                      <children>
-                        <Label id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
-                        <Label id="footerFacebook" styleClass="footerLink" text="Facebook" />
-                        <Label id="footerBluesky" styleClass="footerLink" text="Bluesky" />
-                        <Label id="footerInstagram" styleClass="footerLink" text="Instagram" />
+                        <Label fx:id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
+                        <Label fx:id="footerFacebook" styleClass="footerLink" text="Facebook" />
+                        <Label fx:id="footerBluesky" styleClass="footerLink" text="Bluesky" />
+                        <Label fx:id="footerInstagram" styleClass="footerLink" text="Instagram" />
                      </children>
                   </VBox>
                </children>
             </HBox>
-            <VBox id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
+            <VBox fx:id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
                <children>
-                  <Label id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
+                  <Label fx:id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
                </children>
             </VBox>
          </children>
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 2d977d2..eab69f7 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
@@ -16,12 +16,12 @@
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.CheckOutController">
    <top>
-      <HBox id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
+      <HBox fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
          <children>
-            <Label id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
-            <Pane id="headerSpacer" HBox.hgrow="ALWAYS" />
-            <Button id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Label fx:id="mainTitle" 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" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
@@ -29,91 +29,91 @@
       </HBox>
    </top>
    <bottom>
-      <VBox id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
+      <VBox fx:id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
          <children>
-            <HBox id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
+            <HBox fx:id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
                <children>
-                  <VBox id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
+                  <VBox fx:id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
                      <children>
-                        <Label id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
-                        <Label id="footerHome" styleClass="footerText" text="Home" />
-                        <Label id="footerAbout" styleClass="footerText" text="About Us" />
-                        <Label id="footerContact" styleClass="footerText" text="Contact" />
+                        <Label fx:id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
+                        <Label fx:id="footerHome" styleClass="footerText" text="Home" />
+                        <Label fx:id="footerAbout" styleClass="footerText" text="About Us" />
+                        <Label fx:id="footerContact" styleClass="footerText" text="Contact" />
                      </children>
                   </VBox>
-                  <VBox id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
+                  <VBox fx:id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
                      <children>
-                        <Label id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
-                        <Label id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
-                        <Label id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
+                        <Label fx:id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
+                        <Label fx:id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
+                        <Label fx:id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
                      </children>
                   </VBox>
-                  <VBox id="followUs" alignment="TOP_RIGHT" spacing="10.0">
+                  <VBox fx:id="followUs" alignment="TOP_RIGHT" spacing="10.0">
                      <children>
-                        <Label id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
-                        <Label id="footerFacebook" styleClass="footerLink" text="Facebook" />
-                        <Label id="footerBluesky" styleClass="footerLink" text="Bluesky" />
-                        <Label id="footerInstagram" styleClass="footerLink" text="Instagram" />
+                        <Label fx:id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
+                        <Label fx:id="footerFacebook" styleClass="footerLink" text="Facebook" />
+                        <Label fx:id="footerBluesky" styleClass="footerLink" text="Bluesky" />
+                        <Label fx:id="footerInstagram" styleClass="footerLink" text="Instagram" />
                      </children>
                   </VBox>
                </children>
             </HBox>
-            <VBox id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
+            <VBox fx:id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
                <children>
-                  <Label id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
+                  <Label fx:id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
                </children>
             </VBox>
          </children>
       </VBox>
    </bottom>
    <center>
-      <GridPane id="main" alignment="TOP_CENTER" styleClass="main" BorderPane.alignment="CENTER">
+      <GridPane fx:id="main" alignment="TOP_CENTER" styleClass="main" BorderPane.alignment="CENTER">
          <children>
-            <GridPane id="billingForm" alignment="TOP_CENTER" hgap="10" prefHeight="600.0" prefWidth="800.0" style="-fx-background-color: rgba(238, 130, 238, 0.8);" vgap="20">
+            <GridPane fx:id="billingForm" alignment="TOP_CENTER" hgap="10" prefHeight="600.0" prefWidth="800.0" style="-fx-background-color: rgba(238, 130, 238, 0.8);" vgap="20">
                <children>
-                  <Label id="checkoutHeader" style="-fx-font-size: 24px; -fx-font-weight: bold;" text="Check out" textFill="WHITE" GridPane.columnSpan="2" GridPane.rowIndex="0" />
-                  <Label id="paymentTitle" style="-fx-font-size: 30px; -fx-font-weight: bold;" text="Payment" textFill="WHITE" GridPane.columnSpan="2" GridPane.rowIndex="1" />
-                  <Label id="paymentSubtitle" style="-fx-font-size: 14px;" text="Choose payment method below" textFill="WHITE" GridPane.columnSpan="2" GridPane.rowIndex="2" />
-                  <HBox id="paymentMethods" alignment="CENTER" spacing="20" GridPane.columnSpan="2" GridPane.rowIndex="3">
-                     <Button id="creditCard" mnemonicParsing="false" styleClass="creditCard" />
-                     <Button id="bill" mnemonicParsing="false" styleClass="bill" />
-                     <Button id="paypal" mnemonicParsing="false" styleClass="paypal" />
+                  <Label fx:id="checkoutHeader" style="-fx-font-size: 24px; -fx-font-weight: bold;" text="Check out" textFill="WHITE" GridPane.columnSpan="2" GridPane.rowIndex="0" />
+                  <Label fx:id="paymentTitle" style="-fx-font-size: 30px; -fx-font-weight: bold;" text="Payment" textFill="WHITE" GridPane.columnSpan="2" GridPane.rowIndex="1" />
+                  <Label fx:id="paymentSubtitle" style="-fx-font-size: 14px;" text="Choose payment method below" textFill="WHITE" GridPane.columnSpan="2" GridPane.rowIndex="2" />
+                  <HBox fx:id="paymentMethods" alignment="CENTER" spacing="20" GridPane.columnSpan="2" GridPane.rowIndex="3">
+                     <Button fx:id="creditCard" mnemonicParsing="false" styleClass="creditCard" />
+                     <Button fx:id="bill" mnemonicParsing="false" styleClass="bill" />
+                     <Button fx:id="paypal" mnemonicParsing="false" styleClass="paypal" />
                   </HBox>
-                  <Label id="billingInfoTitle" style="-fx-font-size: 18px; -fx-font-weight: bold;" text="Billing Info" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="4" />
-                  <HBox id="billingName" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="5">
-                     <Label id="fullNameLabel" text="Full Name:" textFill="WHITE" />
-                     <TextField id="fullNameField" fx:id="addressField1" prefWidth="200" promptText="Jon Doe" />
+                  <Label fx:id="billingInfoTitle" style="-fx-font-size: 18px; -fx-font-weight: bold;" text="Billing Info" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="4" />
+                  <HBox fx:id="billingName" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="5">
+                     <Label fx:id="fullNameLabel" text="Full Name:" textFill="WHITE" />
+                     <TextField fx:id="fullNameField" prefWidth="200" promptText="Jon Doe" />
                   </HBox>
-                  <HBox id="billingAddress" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="6">
-                     <Label id="addressLabel" text="Address:" textFill="WHITE" />
-                     <TextField id="addressField" fx:id="addressField" prefWidth="200" promptText="497 Evergreen Rd." />
+                  <HBox fx:id="billingAddress" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="6">
+                     <Label fx:id="addressLabel" text="Address:" textFill="WHITE" />
+                     <TextField fx:id="addressField" prefWidth="200" promptText="497 Evergreen Rd." />
                   </HBox>
-                  <HBox id="billingCityZip" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="7">
-                     <Label id="cityLabel" text="City:" textFill="WHITE" />
-                     <TextField id="cityField" fx:id="cityField" prefWidth="100" promptText="Roseville" />
-                     <Label id="zipLabel" text="ZIP Code:" textFill="WHITE" />
-                     <TextField id="zipField" fx:id="zipField" prefWidth="80" promptText="95673" />
+                  <HBox fx:id="billingCityZip" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="7">
+                     <Label fx:id="cityLabel" text="City:" textFill="WHITE" />
+                     <TextField fx:id="cityField" prefWidth="100" promptText="Roseville" />
+                     <Label fx:id="zipLabel" text="ZIP Code:" textFill="WHITE" />
+                     <TextField fx:id="zipField" prefWidth="80" promptText="95673" />
                   </HBox>
-                  <HBox id="billingCountry" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="8">
-                     <Label id="countryLabel" text="Country:" textFill="WHITE" />
-                     <ComboBox id="countryComboBox" fx:id="countryComboBox" prefWidth="150.0" />
+                  <HBox fx:id="billingCountry" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="8">
+                     <Label fx:id="countryLabel" text="Country:" textFill="WHITE" />
+                     <ComboBox fx:id="countryComboBox" prefWidth="150.0" />
                   </HBox>
-                  <Label id="creditCardInfoTitle" style="-fx-font-size: 18px; -fx-font-weight: bold;" text="Credit Card Info" textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-                  <HBox id="creditCardNumber" spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="5">
-                     <Label id="cardNumberLabel" text="Card Number:" textFill="WHITE" />
-                     <TextField id="cardNumberField" fx:id="cardNumberField" prefWidth="200" promptText="1234 5678 3456 2456" />
+                  <Label fx:id="creditCardInfoTitle" style="-fx-font-size: 18px; -fx-font-weight: bold;" text="Credit Card Info" textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                  <HBox fx:id="creditCardNumber" spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="5">
+                     <Label fx:id="cardNumberLabel" text="Card Number:" textFill="WHITE" />
+                     <TextField fx:id="cardNumberField" prefWidth="200" promptText="1234 5678 3456 2456" />
                   </HBox>
-                  <HBox id="creditCardHolder" spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="6">
-                     <Label id="cardHolderNameLabel" text="Cardholder Name:" textFill="WHITE" />
-                     <TextField id="cardHolderNameField" fx:id="cardHolderNameField" prefWidth="200" promptText="John Doe" />
+                  <HBox fx:id="creditCardHolder" spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="6">
+                     <Label fx:id="cardHolderNameLabel" text="Cardholder Name:" textFill="WHITE" />
+                     <TextField fx:id="cardHolderNameField" prefWidth="200" promptText="John Doe" />
                   </HBox>
-                  <HBox id="creditCardExpiry" spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="7">
-                     <Label id="expiryDateLabel" text="Expire Date:" textFill="WHITE" />
-                     <TextField id="expiryDateField" fx:id="expiryDateField" prefWidth="80" promptText="MM / YY" />
-                     <Label id="cvvLabel" text="CVV:" textFill="WHITE" />
-                     <PasswordField id="cvvField" fx:id="cvvField" />
+                  <HBox fx:id="creditCardExpiry" spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="7">
+                     <Label fx:id="expiryDateLabel" text="Expire Date:" textFill="WHITE" />
+                     <TextField fx:id="expiryDateField" prefWidth="80" promptText="MM / YY" />
+                     <Label fx:id="cvvLabel" text="CVV:" textFill="WHITE" />
+                     <PasswordField fx:id="cvvField" />
                   </HBox>
-                  <Button id="submitBtn" fx:id="submitButton" alignment="CENTER" contentDisplay="CENTER" prefWidth="150" style="-fx-alignment: #4CAF50; -fx-text-fill: white; -fx-font-size: 16px; -fx-font-weight: bold;" styleClass="cartBtn" text="Submit" GridPane.columnSpan="2" GridPane.rowIndex="9" />
+                  <Button fx:id="submitButton" alignment="CENTER" contentDisplay="CENTER" prefWidth="150" style="-fx-alignment: #4CAF50; -fx-text-fill: white; -fx-font-size: 16px; -fx-font-weight: bold;" styleClass="cartBtn" text="Submit" GridPane.columnSpan="2" GridPane.rowIndex="9" />
                </children>
                <columnConstraints>
                   <ColumnConstraints />
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 def302c..5973a9e 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
@@ -14,88 +14,88 @@
 <?import javafx.scene.layout.VBox?>
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.LoginController">
+
+   <!-- Header Section -->
    <top>
-      <HBox id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
+      <HBox fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
          <children>
-            <!-- Main Title -->
-            <Label id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
-            
-            <!-- Spacer for alignment -->
+            <Label fx:id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
             <Pane HBox.hgrow="ALWAYS" />
-            
-            <!-- Buttons -->
-            <Button id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button fx:id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
+            <Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
          </padding>
       </HBox>
    </top>
+
+   <!-- Footer Section -->
    <bottom>
-      <VBox id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
+      <VBox fx:id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
          <children>
-            <HBox id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
+            <HBox fx:id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
                <children>
-                  <VBox id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
+                  <VBox fx:id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
                      <children>
-                        <Label id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
-                        <Label id="footerHome" styleClass="footerText" text="Home" />
-                        <Label id="footerAbout" styleClass="footerText" text="About Us" />
-                        <Label id="footerContact" styleClass="footerText" text="Contact" />
+                        <Label fx:id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
+                        <Label fx:id="footerHome" styleClass="footerText" text="Home" />
+                        <Label fx:id="footerAbout" styleClass="footerText" text="About Us" />
+                        <Label fx:id="footerContact" styleClass="footerText" text="Contact" />
                      </children>
                   </VBox>
-                  <VBox id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
+                  <VBox fx:id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
                      <children>
-                        <Label id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
-                        <Label id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
-                        <Label id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
+                        <Label fx:id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
+                        <Label fx:id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
+                        <Label fx:id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
                      </children>
                   </VBox>
-                  <VBox id="followUs" alignment="TOP_RIGHT" spacing="10.0">
+                  <VBox fx:id="followUs" alignment="TOP_RIGHT" spacing="10.0">
                      <children>
-                        <Label id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
-                        <Label id="footerFacebook" styleClass="footerLink" text="Facebook" />
-                        <Label id="footerBluesky" styleClass="footerLink" text="Bluesky" />
-                        <Label id="footerInstagram" styleClass="footerLink" text="Instagram" />
+                        <Label fx:id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
+                        <Label fx:id="footerFacebook" styleClass="footerLink" text="Facebook" />
+                        <Label fx:id="footerBluesky" styleClass="footerLink" text="Bluesky" />
+                        <Label fx:id="footerInstagram" styleClass="footerLink" text="Instagram" />
                      </children>
                   </VBox>
                </children>
             </HBox>
-            <VBox id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
+            <VBox fx:id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
                <children>
-                  <Label id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
+                  <Label fx:id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
                </children>
             </VBox>
          </children>
       </VBox>
    </bottom>
+
+   <!-- Main Content Section -->
    <center>
-      <GridPane id="main" styleClass="main" BorderPane.alignment="CENTER">
-        <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-        </columnConstraints>
-        <rowConstraints>
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        </rowConstraints>
+      <GridPane fx:id="main" styleClass="main" BorderPane.alignment="CENTER">
+         <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+         </columnConstraints>
+         <rowConstraints>
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+         </rowConstraints>
          <children>
-            <VBox id="loginForm" alignment="CENTER" prefHeight="400.0" prefWidth="300.0" spacing="20.0">
+            <VBox fx:id="loginForm" alignment="CENTER" prefHeight="400.0" prefWidth="300.0" spacing="20.0">
                <children>
-                  <Label id="formTitle" styleClass="formTitle" text="Login" />
-                  <VBox id="formFields" spacing="15.0">
-                     <!-- Username -->
+                  <Label fx:id="formTitle" styleClass="formTitle" text="Login" />
+                  <VBox fx:id="formFields" spacing="15.0">
+                     <!-- Username Field -->
                      <VBox spacing="5.0">
-                        <Label id="usernameLabel" styleClass="formLabel" text="Username" />
-                        <TextField id="usernameInput" styleClass="formInput" />
+                        <Label fx:id="usernameLabel" styleClass="formLabel" text="Username" />
+                        <TextField fx:id="usernameInput" styleClass="formInput" />
                      </VBox>
-      
-                     <!-- Password -->
+                     <!-- Password Field -->
                      <VBox spacing="5.0">
-                        <Label id="passwordLabel" styleClass="formLabel" text="Password" />
-                        <PasswordField id="passwordInput" styleClass="formInput" />
+                        <Label fx:id="passwordLabel" styleClass="formLabel" text="Password" />
+                        <PasswordField fx:id="passwordInput" styleClass="formInput" />
                      </VBox>
                   </VBox>
-                  <Button id="loginButton" mnemonicParsing="false" styleClass="btnLogin" text="Login" />
+                  <Button fx:id="loginButton" mnemonicParsing="false" styleClass="btnLogin" text="Login" />
                </children>
             </VBox>
          </children>
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 2062aca..a815c20 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
@@ -14,17 +14,17 @@
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.RegisterController">
    <top>
-      <HBox id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
+      <HBox id="header" fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
          <children>
             <!-- Main Title -->
-            <Label id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
+            <Label id="mainTitle" fx:id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
             
             <!-- Spacer for alignment -->
-            <Pane HBox.hgrow="ALWAYS" />
+            <Pane fx:id="spacerPane" HBox.hgrow="ALWAYS" />
             
             <!-- Buttons -->
-            <Button id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button id="cartBtn" fx:id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
+            <Button id="loginBtn" fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
@@ -32,7 +32,7 @@
       </HBox>
    </top>
    <center>
-      <GridPane id="main" styleClass="main" BorderPane.alignment="CENTER">
+      <GridPane id="main" fx:id="mainGrid" styleClass="main" BorderPane.alignment="CENTER">
          <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" minWidth="100.0" prefWidth="100.0" />
          </columnConstraints>
@@ -46,68 +46,68 @@
             <Insets />
          </BorderPane.margin>
          <children>
-            <Label id="formTitle" styleClass="formTitle" text="LOGIN" />
-            <VBox id="formFields" prefHeight="200.0" prefWidth="100.0" GridPane.rowIndex="1">
+            <Label id="formTitle" fx:id="formTitle" styleClass="formTitle" text="LOGIN" />
+            <VBox id="formFields" fx:id="formFields" prefHeight="200.0" prefWidth="100.0" GridPane.rowIndex="1">
                <children>
-                  <Label id="nameLabel" styleClass="formLabel" text="Name" />
-                  <TextField id="nameInput" styleClass="formInput" />
+                  <Label id="nameLabel" fx:id="nameLabel" styleClass="formLabel" text="Name" />
+                  <TextField id="nameInput" fx:id="nameInput" styleClass="formInput" />
                   
-                  <Label id="surnameLabel" styleClass="formLabel" text="Surname" />
-                  <TextField id="surnameInput" styleClass="formInput" />
+                  <Label id="surnameLabel" fx:id="surnameLabel" styleClass="formLabel" text="Surname" />
+                  <TextField id="surnameInput" fx:id="surnameInput" styleClass="formInput" />
                   
-                  <Label id="emailLabel" styleClass="formLabel" text="Email address" />
-                  <TextField id="emailInput" styleClass="formInput" />
+                  <Label id="emailLabel" fx:id="emailLabel" styleClass="formLabel" text="Email address" />
+                  <TextField id="emailInput" fx:id="emailInput" styleClass="formInput" />
                   
-                  <Label id="phoneLabel" styleClass="formLabel" text="Phone number" />
-                  <TextField id="phoneInput" styleClass="formInput" />
+                  <Label id="phoneLabel" fx:id="phoneLabel" styleClass="formLabel" text="Phone number" />
+                  <TextField id="phoneInput" fx:id="phoneInput" styleClass="formInput" />
                   
-                  <Label id="streetLabel" styleClass="formLabel" text="Street &amp; Nr." />
-                  <TextField id="streetInput" styleClass="formInput" />
+                  <Label id="streetLabel" fx:id="streetLabel" styleClass="formLabel" text="Street &amp; Nr." />
+                  <TextField id="streetInput" fx:id="streetInput" styleClass="formInput" />
                   
-                  <Label id="cityLabel" styleClass="formLabel" text="City" />
-                  <TextField id="cityInput" styleClass="formInput" />
+                  <Label id="cityLabel" fx:id="cityLabel" styleClass="formLabel" text="City" />
+                  <TextField id="cityInput" fx:id="cityInput" styleClass="formInput" />
                   
-                  <Label id="cityCodeLabel" styleClass="formLabel" text="City code" />
-                  <TextField id="cityCodeInput" styleClass="formInput" />
+                  <Label id="cityCodeLabel" fx:id="cityCodeLabel" styleClass="formLabel" text="City code" />
+                  <TextField id="cityCodeInput" fx:id="cityCodeInput" styleClass="formInput" />
                </children>
             </VBox>
-            <Button id="createAccountButton" mnemonicParsing="false" styleClass="btnCreateAccount" text="Create account" GridPane.rowIndex="3" />
+            <Button id="createAccountButton" fx:id="createAccountButton" mnemonicParsing="false" styleClass="btnCreateAccount" text="Create account" GridPane.rowIndex="3" />
          </children>
       </GridPane>
    </center>
    <bottom>
-      <VBox id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
+      <VBox id="footer" fx:id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
          <children>
-            <HBox id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
+            <HBox id="footerLinks" fx:id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
                <children>
-                  <VBox id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
+                  <VBox id="quickLinks" fx:id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
                      <children>
-                        <Label id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
-                        <Label id="footerHome" styleClass="footerText" text="Home" />
-                        <Label id="footerAbout" styleClass="footerText" text="About Us" />
-                        <Label id="footerContact" styleClass="footerText" text="Contact" />
+                        <Label id="footerText" fx:id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
+                        <Label id="footerHome" fx:id="footerHome" styleClass="footerText" text="Home" />
+                        <Label id="footerAbout" fx:id="footerAbout" styleClass="footerText" text="About Us" />
+                        <Label id="footerContact" fx:id="footerContact" styleClass="footerText" text="Contact" />
                      </children>
                   </VBox>
-                  <VBox id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
+                  <VBox id="contactUs" fx:id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
                      <children>
-                        <Label id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
-                        <Label id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
-                        <Label id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
+                        <Label id="footerHeading2" fx:id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
+                        <Label id="footerEmail" fx:id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
+                        <Label id="footerPhone" fx:id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
                      </children>
                   </VBox>
-                  <VBox id="followUs" alignment="TOP_RIGHT" spacing="10.0">
+                  <VBox id="followUs" fx:id="followUs" alignment="TOP_RIGHT" spacing="10.0">
                      <children>
-                        <Label id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
-                        <Label id="footerFacebook" styleClass="footerLink" text="Facebook" />
-                        <Label id="footerBluesky" styleClass="footerLink" text="Bluesky" />
-                        <Label id="footerInstagram" styleClass="footerLink" text="Instagram" />
+                        <Label id="footerHeading3" fx:id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
+                        <Label id="footerFacebook" fx:id="footerFacebook" styleClass="footerLink" text="Facebook" />
+                        <Label id="footerBluesky" fx:id="footerBluesky" styleClass="footerLink" text="Bluesky" />
+                        <Label id="footerInstagram" fx:id="footerInstagram" styleClass="footerLink" text="Instagram" />
                      </children>
                   </VBox>
                </children>
             </HBox>
-            <VBox id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
+            <VBox id="footerCopy" fx:id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
                <children>
-                  <Label id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
+                  <Label id="footerCopyText" fx:id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
                </children>
             </VBox>
          </children>
diff --git a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/CartController.class b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/CartController.class
index 8560921..a1b4fc7 100644
Binary files a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/CartController.class and b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/CartController.class differ
diff --git a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/ShopController.class b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/ShopController.class
index d28e9ab..343e6db 100644
Binary files a/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/ShopController.class and b/Code/ost/JAVA-FX-PROJECT/_javafx_website_task/target/classes/com/example/ShopController.class differ
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 ffb567b..142f89f 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
@@ -15,17 +15,17 @@
 
 <fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" type="BorderPane" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.CartController">
    <top>
-      <HBox id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
+      <HBox fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
          <children>
             <!-- Main Title -->
-            <Label id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
+            <Label fx:id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
             
             <!-- Spacer for alignment -->
             <Pane HBox.hgrow="ALWAYS" />
             
             <!-- Buttons -->
-            <Button id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button fx:id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
+            <Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
@@ -33,7 +33,7 @@
       </HBox>
    </top>
    <center>
-      <GridPane id="main" styleClass="main" BorderPane.alignment="CENTER">
+      <GridPane fx:id="main" styleClass="main" BorderPane.alignment="CENTER">
          <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" minWidth="100.0" prefWidth="100.0" />
          </columnConstraints>
@@ -46,52 +46,52 @@
             <Insets />
          </BorderPane.margin>
          <children>
-            <Button id="btnCheckOut" mnemonicParsing="false" styleClass="btnCheckOut" text="Check out" GridPane.rowIndex="2" />
-            <Label id="cartTitle" styleClass="cartTitle" text="Your cart" />
-            <TableView id="cartContent" prefHeight="0.0" prefWidth="364.0" GridPane.rowIndex="1">
+            <Button fx:id="btnCheckOut" mnemonicParsing="false" styleClass="btnCheckOut" text="Check out" GridPane.rowIndex="2" />
+            <Label fx:id="cartTitle" styleClass="cartTitle" text="Your cart" />
+            <TableView fx:id="cartContent" prefHeight="0.0" prefWidth="364.0" GridPane.rowIndex="1">
                <columns>
-                     <TableColumn id="nameColumn" prefWidth="243.0" text="Name" />
-                     <TableColumn id="descriptionColumn" prefWidth="615.0" text="Description" />
-                     <TableColumn id="quantityColumn" minWidth="0.0" prefWidth="154.0" text="Quantity" />
-                     <TableColumn id="priceColumn" minWidth="0.0" prefWidth="147.0" text="Price" />
+                  <TableColumn fx:id="nameColumn" prefWidth="243.0" text="Name" />
+                  <TableColumn fx:id="descriptionColumn" prefWidth="615.0" text="Description" />
+                  <TableColumn fx:id="quantityColumn" minWidth="0.0" prefWidth="154.0" text="Quantity" />
+                  <TableColumn fx:id="priceColumn" minWidth="0.0" prefWidth="147.0" text="Price" />
                </columns>
             </TableView>
          </children>
       </GridPane>
    </center>
    <bottom>
-      <VBox id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
+      <VBox fx:id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
          <children>
-            <HBox id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
+            <HBox fx:id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
                <children>
-                  <VBox id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
+                  <VBox fx:id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
                      <children>
-                        <Label id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
-                        <Label id="footerHome" styleClass="footerText" text="Home" />
-                        <Label id="footerAbout" styleClass="footerText" text="About Us" />
-                        <Label id="footerContact" styleClass="footerText" text="Contact" />
+                        <Label fx:id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
+                        <Label fx:id="footerHome" styleClass="footerText" text="Home" />
+                        <Label fx:id="footerAbout" styleClass="footerText" text="About Us" />
+                        <Label fx:id="footerContact" styleClass="footerText" text="Contact" />
                      </children>
                   </VBox>
-                  <VBox id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
+                  <VBox fx:id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
                      <children>
-                        <Label id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
-                        <Label id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
-                        <Label id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
+                        <Label fx:id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
+                        <Label fx:id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
+                        <Label fx:id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
                      </children>
                   </VBox>
-                  <VBox id="followUs" alignment="TOP_RIGHT" spacing="10.0">
+                  <VBox fx:id="followUs" alignment="TOP_RIGHT" spacing="10.0">
                      <children>
-                        <Label id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
-                        <Label id="footerFacebook" styleClass="footerLink" text="Facebook" />
-                        <Label id="footerBluesky" styleClass="footerLink" text="Bluesky" />
-                        <Label id="footerInstagram" styleClass="footerLink" text="Instagram" />
+                        <Label fx:id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
+                        <Label fx:id="footerFacebook" styleClass="footerLink" text="Facebook" />
+                        <Label fx:id="footerBluesky" styleClass="footerLink" text="Bluesky" />
+                        <Label fx:id="footerInstagram" styleClass="footerLink" text="Instagram" />
                      </children>
                   </VBox>
                </children>
             </HBox>
-            <VBox id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
+            <VBox fx:id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
                <children>
-                  <Label id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
+                  <Label fx:id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
                </children>
             </VBox>
          </children>
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 2d977d2..eab69f7 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
@@ -16,12 +16,12 @@
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.CheckOutController">
    <top>
-      <HBox id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
+      <HBox fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
          <children>
-            <Label id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
-            <Pane id="headerSpacer" HBox.hgrow="ALWAYS" />
-            <Button id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Label fx:id="mainTitle" 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" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
@@ -29,91 +29,91 @@
       </HBox>
    </top>
    <bottom>
-      <VBox id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
+      <VBox fx:id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
          <children>
-            <HBox id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
+            <HBox fx:id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
                <children>
-                  <VBox id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
+                  <VBox fx:id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
                      <children>
-                        <Label id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
-                        <Label id="footerHome" styleClass="footerText" text="Home" />
-                        <Label id="footerAbout" styleClass="footerText" text="About Us" />
-                        <Label id="footerContact" styleClass="footerText" text="Contact" />
+                        <Label fx:id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
+                        <Label fx:id="footerHome" styleClass="footerText" text="Home" />
+                        <Label fx:id="footerAbout" styleClass="footerText" text="About Us" />
+                        <Label fx:id="footerContact" styleClass="footerText" text="Contact" />
                      </children>
                   </VBox>
-                  <VBox id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
+                  <VBox fx:id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
                      <children>
-                        <Label id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
-                        <Label id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
-                        <Label id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
+                        <Label fx:id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
+                        <Label fx:id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
+                        <Label fx:id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
                      </children>
                   </VBox>
-                  <VBox id="followUs" alignment="TOP_RIGHT" spacing="10.0">
+                  <VBox fx:id="followUs" alignment="TOP_RIGHT" spacing="10.0">
                      <children>
-                        <Label id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
-                        <Label id="footerFacebook" styleClass="footerLink" text="Facebook" />
-                        <Label id="footerBluesky" styleClass="footerLink" text="Bluesky" />
-                        <Label id="footerInstagram" styleClass="footerLink" text="Instagram" />
+                        <Label fx:id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
+                        <Label fx:id="footerFacebook" styleClass="footerLink" text="Facebook" />
+                        <Label fx:id="footerBluesky" styleClass="footerLink" text="Bluesky" />
+                        <Label fx:id="footerInstagram" styleClass="footerLink" text="Instagram" />
                      </children>
                   </VBox>
                </children>
             </HBox>
-            <VBox id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
+            <VBox fx:id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
                <children>
-                  <Label id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
+                  <Label fx:id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
                </children>
             </VBox>
          </children>
       </VBox>
    </bottom>
    <center>
-      <GridPane id="main" alignment="TOP_CENTER" styleClass="main" BorderPane.alignment="CENTER">
+      <GridPane fx:id="main" alignment="TOP_CENTER" styleClass="main" BorderPane.alignment="CENTER">
          <children>
-            <GridPane id="billingForm" alignment="TOP_CENTER" hgap="10" prefHeight="600.0" prefWidth="800.0" style="-fx-background-color: rgba(238, 130, 238, 0.8);" vgap="20">
+            <GridPane fx:id="billingForm" alignment="TOP_CENTER" hgap="10" prefHeight="600.0" prefWidth="800.0" style="-fx-background-color: rgba(238, 130, 238, 0.8);" vgap="20">
                <children>
-                  <Label id="checkoutHeader" style="-fx-font-size: 24px; -fx-font-weight: bold;" text="Check out" textFill="WHITE" GridPane.columnSpan="2" GridPane.rowIndex="0" />
-                  <Label id="paymentTitle" style="-fx-font-size: 30px; -fx-font-weight: bold;" text="Payment" textFill="WHITE" GridPane.columnSpan="2" GridPane.rowIndex="1" />
-                  <Label id="paymentSubtitle" style="-fx-font-size: 14px;" text="Choose payment method below" textFill="WHITE" GridPane.columnSpan="2" GridPane.rowIndex="2" />
-                  <HBox id="paymentMethods" alignment="CENTER" spacing="20" GridPane.columnSpan="2" GridPane.rowIndex="3">
-                     <Button id="creditCard" mnemonicParsing="false" styleClass="creditCard" />
-                     <Button id="bill" mnemonicParsing="false" styleClass="bill" />
-                     <Button id="paypal" mnemonicParsing="false" styleClass="paypal" />
+                  <Label fx:id="checkoutHeader" style="-fx-font-size: 24px; -fx-font-weight: bold;" text="Check out" textFill="WHITE" GridPane.columnSpan="2" GridPane.rowIndex="0" />
+                  <Label fx:id="paymentTitle" style="-fx-font-size: 30px; -fx-font-weight: bold;" text="Payment" textFill="WHITE" GridPane.columnSpan="2" GridPane.rowIndex="1" />
+                  <Label fx:id="paymentSubtitle" style="-fx-font-size: 14px;" text="Choose payment method below" textFill="WHITE" GridPane.columnSpan="2" GridPane.rowIndex="2" />
+                  <HBox fx:id="paymentMethods" alignment="CENTER" spacing="20" GridPane.columnSpan="2" GridPane.rowIndex="3">
+                     <Button fx:id="creditCard" mnemonicParsing="false" styleClass="creditCard" />
+                     <Button fx:id="bill" mnemonicParsing="false" styleClass="bill" />
+                     <Button fx:id="paypal" mnemonicParsing="false" styleClass="paypal" />
                   </HBox>
-                  <Label id="billingInfoTitle" style="-fx-font-size: 18px; -fx-font-weight: bold;" text="Billing Info" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="4" />
-                  <HBox id="billingName" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="5">
-                     <Label id="fullNameLabel" text="Full Name:" textFill="WHITE" />
-                     <TextField id="fullNameField" fx:id="addressField1" prefWidth="200" promptText="Jon Doe" />
+                  <Label fx:id="billingInfoTitle" style="-fx-font-size: 18px; -fx-font-weight: bold;" text="Billing Info" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="4" />
+                  <HBox fx:id="billingName" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="5">
+                     <Label fx:id="fullNameLabel" text="Full Name:" textFill="WHITE" />
+                     <TextField fx:id="fullNameField" prefWidth="200" promptText="Jon Doe" />
                   </HBox>
-                  <HBox id="billingAddress" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="6">
-                     <Label id="addressLabel" text="Address:" textFill="WHITE" />
-                     <TextField id="addressField" fx:id="addressField" prefWidth="200" promptText="497 Evergreen Rd." />
+                  <HBox fx:id="billingAddress" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="6">
+                     <Label fx:id="addressLabel" text="Address:" textFill="WHITE" />
+                     <TextField fx:id="addressField" prefWidth="200" promptText="497 Evergreen Rd." />
                   </HBox>
-                  <HBox id="billingCityZip" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="7">
-                     <Label id="cityLabel" text="City:" textFill="WHITE" />
-                     <TextField id="cityField" fx:id="cityField" prefWidth="100" promptText="Roseville" />
-                     <Label id="zipLabel" text="ZIP Code:" textFill="WHITE" />
-                     <TextField id="zipField" fx:id="zipField" prefWidth="80" promptText="95673" />
+                  <HBox fx:id="billingCityZip" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="7">
+                     <Label fx:id="cityLabel" text="City:" textFill="WHITE" />
+                     <TextField fx:id="cityField" prefWidth="100" promptText="Roseville" />
+                     <Label fx:id="zipLabel" text="ZIP Code:" textFill="WHITE" />
+                     <TextField fx:id="zipField" prefWidth="80" promptText="95673" />
                   </HBox>
-                  <HBox id="billingCountry" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="8">
-                     <Label id="countryLabel" text="Country:" textFill="WHITE" />
-                     <ComboBox id="countryComboBox" fx:id="countryComboBox" prefWidth="150.0" />
+                  <HBox fx:id="billingCountry" spacing="10" GridPane.columnIndex="0" GridPane.rowIndex="8">
+                     <Label fx:id="countryLabel" text="Country:" textFill="WHITE" />
+                     <ComboBox fx:id="countryComboBox" prefWidth="150.0" />
                   </HBox>
-                  <Label id="creditCardInfoTitle" style="-fx-font-size: 18px; -fx-font-weight: bold;" text="Credit Card Info" textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-                  <HBox id="creditCardNumber" spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="5">
-                     <Label id="cardNumberLabel" text="Card Number:" textFill="WHITE" />
-                     <TextField id="cardNumberField" fx:id="cardNumberField" prefWidth="200" promptText="1234 5678 3456 2456" />
+                  <Label fx:id="creditCardInfoTitle" style="-fx-font-size: 18px; -fx-font-weight: bold;" text="Credit Card Info" textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                  <HBox fx:id="creditCardNumber" spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="5">
+                     <Label fx:id="cardNumberLabel" text="Card Number:" textFill="WHITE" />
+                     <TextField fx:id="cardNumberField" prefWidth="200" promptText="1234 5678 3456 2456" />
                   </HBox>
-                  <HBox id="creditCardHolder" spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="6">
-                     <Label id="cardHolderNameLabel" text="Cardholder Name:" textFill="WHITE" />
-                     <TextField id="cardHolderNameField" fx:id="cardHolderNameField" prefWidth="200" promptText="John Doe" />
+                  <HBox fx:id="creditCardHolder" spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="6">
+                     <Label fx:id="cardHolderNameLabel" text="Cardholder Name:" textFill="WHITE" />
+                     <TextField fx:id="cardHolderNameField" prefWidth="200" promptText="John Doe" />
                   </HBox>
-                  <HBox id="creditCardExpiry" spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="7">
-                     <Label id="expiryDateLabel" text="Expire Date:" textFill="WHITE" />
-                     <TextField id="expiryDateField" fx:id="expiryDateField" prefWidth="80" promptText="MM / YY" />
-                     <Label id="cvvLabel" text="CVV:" textFill="WHITE" />
-                     <PasswordField id="cvvField" fx:id="cvvField" />
+                  <HBox fx:id="creditCardExpiry" spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="7">
+                     <Label fx:id="expiryDateLabel" text="Expire Date:" textFill="WHITE" />
+                     <TextField fx:id="expiryDateField" prefWidth="80" promptText="MM / YY" />
+                     <Label fx:id="cvvLabel" text="CVV:" textFill="WHITE" />
+                     <PasswordField fx:id="cvvField" />
                   </HBox>
-                  <Button id="submitBtn" fx:id="submitButton" alignment="CENTER" contentDisplay="CENTER" prefWidth="150" style="-fx-alignment: #4CAF50; -fx-text-fill: white; -fx-font-size: 16px; -fx-font-weight: bold;" styleClass="cartBtn" text="Submit" GridPane.columnSpan="2" GridPane.rowIndex="9" />
+                  <Button fx:id="submitButton" alignment="CENTER" contentDisplay="CENTER" prefWidth="150" style="-fx-alignment: #4CAF50; -fx-text-fill: white; -fx-font-size: 16px; -fx-font-weight: bold;" styleClass="cartBtn" text="Submit" GridPane.columnSpan="2" GridPane.rowIndex="9" />
                </children>
                <columnConstraints>
                   <ColumnConstraints />
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 def302c..5973a9e 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
@@ -14,88 +14,88 @@
 <?import javafx.scene.layout.VBox?>
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.LoginController">
+
+   <!-- Header Section -->
    <top>
-      <HBox id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
+      <HBox fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
          <children>
-            <!-- Main Title -->
-            <Label id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
-            
-            <!-- Spacer for alignment -->
+            <Label fx:id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
             <Pane HBox.hgrow="ALWAYS" />
-            
-            <!-- Buttons -->
-            <Button id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button fx:id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
+            <Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
          </padding>
       </HBox>
    </top>
+
+   <!-- Footer Section -->
    <bottom>
-      <VBox id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
+      <VBox fx:id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
          <children>
-            <HBox id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
+            <HBox fx:id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
                <children>
-                  <VBox id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
+                  <VBox fx:id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
                      <children>
-                        <Label id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
-                        <Label id="footerHome" styleClass="footerText" text="Home" />
-                        <Label id="footerAbout" styleClass="footerText" text="About Us" />
-                        <Label id="footerContact" styleClass="footerText" text="Contact" />
+                        <Label fx:id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
+                        <Label fx:id="footerHome" styleClass="footerText" text="Home" />
+                        <Label fx:id="footerAbout" styleClass="footerText" text="About Us" />
+                        <Label fx:id="footerContact" styleClass="footerText" text="Contact" />
                      </children>
                   </VBox>
-                  <VBox id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
+                  <VBox fx:id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
                      <children>
-                        <Label id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
-                        <Label id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
-                        <Label id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
+                        <Label fx:id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
+                        <Label fx:id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
+                        <Label fx:id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
                      </children>
                   </VBox>
-                  <VBox id="followUs" alignment="TOP_RIGHT" spacing="10.0">
+                  <VBox fx:id="followUs" alignment="TOP_RIGHT" spacing="10.0">
                      <children>
-                        <Label id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
-                        <Label id="footerFacebook" styleClass="footerLink" text="Facebook" />
-                        <Label id="footerBluesky" styleClass="footerLink" text="Bluesky" />
-                        <Label id="footerInstagram" styleClass="footerLink" text="Instagram" />
+                        <Label fx:id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
+                        <Label fx:id="footerFacebook" styleClass="footerLink" text="Facebook" />
+                        <Label fx:id="footerBluesky" styleClass="footerLink" text="Bluesky" />
+                        <Label fx:id="footerInstagram" styleClass="footerLink" text="Instagram" />
                      </children>
                   </VBox>
                </children>
             </HBox>
-            <VBox id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
+            <VBox fx:id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
                <children>
-                  <Label id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
+                  <Label fx:id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
                </children>
             </VBox>
          </children>
       </VBox>
    </bottom>
+
+   <!-- Main Content Section -->
    <center>
-      <GridPane id="main" styleClass="main" BorderPane.alignment="CENTER">
-        <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-        </columnConstraints>
-        <rowConstraints>
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        </rowConstraints>
+      <GridPane fx:id="main" styleClass="main" BorderPane.alignment="CENTER">
+         <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+         </columnConstraints>
+         <rowConstraints>
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+         </rowConstraints>
          <children>
-            <VBox id="loginForm" alignment="CENTER" prefHeight="400.0" prefWidth="300.0" spacing="20.0">
+            <VBox fx:id="loginForm" alignment="CENTER" prefHeight="400.0" prefWidth="300.0" spacing="20.0">
                <children>
-                  <Label id="formTitle" styleClass="formTitle" text="Login" />
-                  <VBox id="formFields" spacing="15.0">
-                     <!-- Username -->
+                  <Label fx:id="formTitle" styleClass="formTitle" text="Login" />
+                  <VBox fx:id="formFields" spacing="15.0">
+                     <!-- Username Field -->
                      <VBox spacing="5.0">
-                        <Label id="usernameLabel" styleClass="formLabel" text="Username" />
-                        <TextField id="usernameInput" styleClass="formInput" />
+                        <Label fx:id="usernameLabel" styleClass="formLabel" text="Username" />
+                        <TextField fx:id="usernameInput" styleClass="formInput" />
                      </VBox>
-      
-                     <!-- Password -->
+                     <!-- Password Field -->
                      <VBox spacing="5.0">
-                        <Label id="passwordLabel" styleClass="formLabel" text="Password" />
-                        <PasswordField id="passwordInput" styleClass="formInput" />
+                        <Label fx:id="passwordLabel" styleClass="formLabel" text="Password" />
+                        <PasswordField fx:id="passwordInput" styleClass="formInput" />
                      </VBox>
                   </VBox>
-                  <Button id="loginButton" mnemonicParsing="false" styleClass="btnLogin" text="Login" />
+                  <Button fx:id="loginButton" mnemonicParsing="false" styleClass="btnLogin" text="Login" />
                </children>
             </VBox>
          </children>
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 2062aca..a815c20 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
@@ -14,17 +14,17 @@
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.RegisterController">
    <top>
-      <HBox id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
+      <HBox id="header" fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
          <children>
             <!-- Main Title -->
-            <Label id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
+            <Label id="mainTitle" fx:id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
             
             <!-- Spacer for alignment -->
-            <Pane HBox.hgrow="ALWAYS" />
+            <Pane fx:id="spacerPane" HBox.hgrow="ALWAYS" />
             
             <!-- Buttons -->
-            <Button id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
-            <Button id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
+            <Button id="cartBtn" fx:id="cartBtn" mnemonicParsing="false" styleClass="cartBtn" text="Cart" />
+            <Button id="loginBtn" fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
          </children>
          <padding>
             <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
@@ -32,7 +32,7 @@
       </HBox>
    </top>
    <center>
-      <GridPane id="main" styleClass="main" BorderPane.alignment="CENTER">
+      <GridPane id="main" fx:id="mainGrid" styleClass="main" BorderPane.alignment="CENTER">
          <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" minWidth="100.0" prefWidth="100.0" />
          </columnConstraints>
@@ -46,68 +46,68 @@
             <Insets />
          </BorderPane.margin>
          <children>
-            <Label id="formTitle" styleClass="formTitle" text="LOGIN" />
-            <VBox id="formFields" prefHeight="200.0" prefWidth="100.0" GridPane.rowIndex="1">
+            <Label id="formTitle" fx:id="formTitle" styleClass="formTitle" text="LOGIN" />
+            <VBox id="formFields" fx:id="formFields" prefHeight="200.0" prefWidth="100.0" GridPane.rowIndex="1">
                <children>
-                  <Label id="nameLabel" styleClass="formLabel" text="Name" />
-                  <TextField id="nameInput" styleClass="formInput" />
+                  <Label id="nameLabel" fx:id="nameLabel" styleClass="formLabel" text="Name" />
+                  <TextField id="nameInput" fx:id="nameInput" styleClass="formInput" />
                   
-                  <Label id="surnameLabel" styleClass="formLabel" text="Surname" />
-                  <TextField id="surnameInput" styleClass="formInput" />
+                  <Label id="surnameLabel" fx:id="surnameLabel" styleClass="formLabel" text="Surname" />
+                  <TextField id="surnameInput" fx:id="surnameInput" styleClass="formInput" />
                   
-                  <Label id="emailLabel" styleClass="formLabel" text="Email address" />
-                  <TextField id="emailInput" styleClass="formInput" />
+                  <Label id="emailLabel" fx:id="emailLabel" styleClass="formLabel" text="Email address" />
+                  <TextField id="emailInput" fx:id="emailInput" styleClass="formInput" />
                   
-                  <Label id="phoneLabel" styleClass="formLabel" text="Phone number" />
-                  <TextField id="phoneInput" styleClass="formInput" />
+                  <Label id="phoneLabel" fx:id="phoneLabel" styleClass="formLabel" text="Phone number" />
+                  <TextField id="phoneInput" fx:id="phoneInput" styleClass="formInput" />
                   
-                  <Label id="streetLabel" styleClass="formLabel" text="Street &amp; Nr." />
-                  <TextField id="streetInput" styleClass="formInput" />
+                  <Label id="streetLabel" fx:id="streetLabel" styleClass="formLabel" text="Street &amp; Nr." />
+                  <TextField id="streetInput" fx:id="streetInput" styleClass="formInput" />
                   
-                  <Label id="cityLabel" styleClass="formLabel" text="City" />
-                  <TextField id="cityInput" styleClass="formInput" />
+                  <Label id="cityLabel" fx:id="cityLabel" styleClass="formLabel" text="City" />
+                  <TextField id="cityInput" fx:id="cityInput" styleClass="formInput" />
                   
-                  <Label id="cityCodeLabel" styleClass="formLabel" text="City code" />
-                  <TextField id="cityCodeInput" styleClass="formInput" />
+                  <Label id="cityCodeLabel" fx:id="cityCodeLabel" styleClass="formLabel" text="City code" />
+                  <TextField id="cityCodeInput" fx:id="cityCodeInput" styleClass="formInput" />
                </children>
             </VBox>
-            <Button id="createAccountButton" mnemonicParsing="false" styleClass="btnCreateAccount" text="Create account" GridPane.rowIndex="3" />
+            <Button id="createAccountButton" fx:id="createAccountButton" mnemonicParsing="false" styleClass="btnCreateAccount" text="Create account" GridPane.rowIndex="3" />
          </children>
       </GridPane>
    </center>
    <bottom>
-      <VBox id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
+      <VBox id="footer" fx:id="footer" prefHeight="188.0" prefWidth="1200.0" styleClass="footer" BorderPane.alignment="CENTER">
          <children>
-            <HBox id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
+            <HBox id="footerLinks" fx:id="footerLinks" alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0">
                <children>
-                  <VBox id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
+                  <VBox id="quickLinks" fx:id="quickLinks" alignment="TOP_LEFT" prefHeight="145.0" prefWidth="470.0" spacing="10.0">
                      <children>
-                        <Label id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
-                        <Label id="footerHome" styleClass="footerText" text="Home" />
-                        <Label id="footerAbout" styleClass="footerText" text="About Us" />
-                        <Label id="footerContact" styleClass="footerText" text="Contact" />
+                        <Label id="footerText" fx:id="footerText" prefHeight="25.0" prefWidth="226.0" styleClass="footerHeading" text="Quick Links" />
+                        <Label id="footerHome" fx:id="footerHome" styleClass="footerText" text="Home" />
+                        <Label id="footerAbout" fx:id="footerAbout" styleClass="footerText" text="About Us" />
+                        <Label id="footerContact" fx:id="footerContact" styleClass="footerText" text="Contact" />
                      </children>
                   </VBox>
-                  <VBox id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
+                  <VBox id="contactUs" fx:id="contactUs" prefHeight="145.0" prefWidth="583.0" spacing="10.0">
                      <children>
-                        <Label id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
-                        <Label id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
-                        <Label id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
+                        <Label id="footerHeading2" fx:id="footerHeading2" prefWidth="534.0" styleClass="footerHeading" text="Contact Us" />
+                        <Label id="footerEmail" fx:id="footerEmail" styleClass="footerText" text="Email: info@example.com" />
+                        <Label id="footerPhone" fx:id="footerPhone" styleClass="footerText" text="Phone: +1 123 456 7890" />
                      </children>
                   </VBox>
-                  <VBox id="followUs" alignment="TOP_RIGHT" spacing="10.0">
+                  <VBox id="followUs" fx:id="followUs" alignment="TOP_RIGHT" spacing="10.0">
                      <children>
-                        <Label id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
-                        <Label id="footerFacebook" styleClass="footerLink" text="Facebook" />
-                        <Label id="footerBluesky" styleClass="footerLink" text="Bluesky" />
-                        <Label id="footerInstagram" styleClass="footerLink" text="Instagram" />
+                        <Label id="footerHeading3" fx:id="footerHeading3" styleClass="footerHeading" text="Follow Us" />
+                        <Label id="footerFacebook" fx:id="footerFacebook" styleClass="footerLink" text="Facebook" />
+                        <Label id="footerBluesky" fx:id="footerBluesky" styleClass="footerLink" text="Bluesky" />
+                        <Label id="footerInstagram" fx:id="footerInstagram" styleClass="footerLink" text="Instagram" />
                      </children>
                   </VBox>
                </children>
             </HBox>
-            <VBox id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
+            <VBox id="footerCopy" fx:id="footerCopy" alignment="BOTTOM_CENTER" prefHeight="68.0" prefWidth="1170.0" spacing="10.0">
                <children>
-                  <Label id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
+                  <Label id="footerCopyText" fx:id="footerCopyText" alignment="CENTER" contentDisplay="CENTER" styleClass="footerCopy" text="© 2024 My Website. All rights reserved." />
                </children>
             </VBox>
          </children>