From 77e5287b3c752deafe9389458566f86ad8220620 Mon Sep 17 00:00:00 2001
From: AdrianBalunan <adrianbalunan63@gmail.com>
Date: Fri, 13 Mar 2026 18:50:01 +0100
Subject: [PATCH] Fix: Tweaks on fxmls so that the logo can work as a button

---
 .../src/main/resources/fxml/charityPage.fxml  | 401 +++++-------------
 .../src/main/resources/fxml/donationPage.fxml |  25 +-
 2 files changed, 111 insertions(+), 315 deletions(-)

diff --git a/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml b/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml
index 4fead93..1af1827 100644
--- a/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml
+++ b/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml
@@ -1,59 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.Cursor?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Hyperlink?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.shape.Arc?>
-<?import javafx.scene.shape.Circle?>
-<?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.paint.Color?>
-
-<?import javafx.scene.effect.DropShadow?>
-<?import javafx.scene.layout.FlowPane?>
-<GridPane hgap="0.0"
-          prefHeight="900.0"
-          prefWidth="1200.0"
-          vgap="0.0"
-          xmlns="http://javafx.com/javafx/17.0.12"
-          xmlns:fx="http://javafx.com/fxml/1"
-          fx:controller="ntnu.systemutvikling.team6.controller.CharityPageController">
+<?import javafx.geometry.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.effect.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.paint.*?>
+<?import javafx.scene.shape.*?>
+<?import javafx.scene.text.*?>
+
+<GridPane hgap="0.0" prefHeight="900.0" prefWidth="1200.0" vgap="0.0" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ntnu.systemutvikling.team6.controller.CharityPageController">
 
    <columnConstraints>
       <ColumnConstraints percentWidth="100.0" />
    </columnConstraints>
 
    <rowConstraints>
-      <RowConstraints prefHeight="92.0" minHeight="92.0" maxHeight="92.0" />
+      <RowConstraints maxHeight="92.0" minHeight="92.0" prefHeight="92.0" />
       <RowConstraints vgrow="ALWAYS" />
-      <RowConstraints prefHeight="180.0" minHeight="180.0" maxHeight="180.0" />
+      <RowConstraints maxHeight="180.0" minHeight="180.0" prefHeight="180.0" />
    </rowConstraints>
 
    <children>
 
       <!-- NAVBAR -->
-      <GridPane prefHeight="92.0"
-                prefWidth="1200.0"
-                style="-fx-background-color: #5F9895;"
-                GridPane.columnIndex="0"
-                GridPane.rowIndex="0">
+      <GridPane prefHeight="92.0" prefWidth="1200.0" style="-fx-background-color: #5F9895;" GridPane.columnIndex="0" GridPane.rowIndex="0">
 
          <padding>
-            <Insets top="10.0" right="20.0" bottom="10.0" left="20.0" />
+            <Insets bottom="10.0" left="20.0" right="20.0" top="10.0" />
          </padding>
 
          <columnConstraints>
@@ -69,26 +44,22 @@
 
          <children>
 
-            <ImageView fitHeight="95.0"
-                       fitWidth="95.0"
-                       pickOnBounds="true"
-                       preserveRatio="true"
-                       GridPane.columnIndex="0"
-                       GridPane.rowIndex="0"
-                       translateX="-10">
-
-               <image>
-                  <Image url="@../images/Logo.png" />
-               </image>
-               <cursor>
-                  <Cursor fx:constant="HAND" />
-               </cursor>
-            </ImageView>
-
-            <HBox alignment="CENTER_LEFT"
-                  spacing="0.0"
-                  GridPane.columnIndex="1"
-                  GridPane.rowIndex="0">
+            <!-- -->
+            <Button mnemonicParsing="false" onAction="#switchToFrontPage" prefHeight="0.0" prefWidth="0.0" style="-fx-background-color: #2f8f8b">
+               <graphic>
+                  <ImageView fitHeight="54.0" fitWidth="67.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@../images/Logo.png" />
+                     </image>
+                     <cursor>
+                        <Cursor fx:constant="HAND" />
+                     </cursor>
+                  </ImageView>
+               </graphic>
+            </Button>
+            <!-- -->
+
+            <HBox alignment="CENTER_LEFT" spacing="0.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
                <children>
                   <Label text="Help" textFill="WHITE">
                      <font>
@@ -110,26 +81,15 @@
                </children>
             </HBox>
 
-            <HBox alignment="CENTER"
-                  GridPane.columnIndex="2"
-                  GridPane.rowIndex="0">
+            <HBox alignment="CENTER" GridPane.columnIndex="2" GridPane.rowIndex="0">
                <children>
-                  <TextField promptText="Search"
-                             prefHeight="48.0"
-                             prefWidth="430.0"
-                             maxWidth="430.0"
-                             style="-fx-background-radius: 24; -fx-border-radius: 24; -fx-font-size: 16px; -fx-padding: 0 0 0 16;" />
+                  <TextField maxWidth="430.0" prefHeight="48.0" prefWidth="430.0" promptText="Search" style="-fx-background-radius: 24; -fx-border-radius: 24; -fx-font-size: 16px; -fx-padding: 0 0 0 16;" />
                </children>
             </HBox>
 
-            <HBox alignment="CENTER_RIGHT"
-                  GridPane.columnIndex="3"
-                  GridPane.rowIndex="0">
+            <HBox alignment="CENTER_RIGHT" GridPane.columnIndex="3" GridPane.rowIndex="0">
                <children>
-                  <Button text="Login"
-                          prefHeight="48.0"
-                          prefWidth="180.0"
-                          style="-fx-background-color: #4453D9; -fx-background-radius: 24; -fx-text-fill: white; -fx-font-size: 16px; -fx-font-weight: bold;">
+                  <Button prefHeight="48.0" prefWidth="180.0" style="-fx-background-color: #4453D9; -fx-background-radius: 24; -fx-text-fill: white; -fx-font-size: 16px; -fx-font-weight: bold;" text="Login">
                      <cursor>
                         <Cursor fx:constant="HAND" />
                      </cursor>
@@ -141,14 +101,10 @@
       </GridPane>
 
       <!-- MAIN CONTENT -->
-      <GridPane prefHeight="628.0"
-                prefWidth="1200.0"
-                style="-fx-background-color: #F5F5F5;"
-                GridPane.columnIndex="0"
-                GridPane.rowIndex="1">
+      <GridPane prefHeight="628.0" prefWidth="1200.0" style="-fx-background-color: #F5F5F5;" GridPane.columnIndex="0" GridPane.rowIndex="1">
 
          <padding>
-            <Insets top="25.0" right="30.0" bottom="25.0" left="30.0" />
+            <Insets bottom="25.0" left="30.0" right="30.0" top="25.0" />
          </padding>
 
          <columnConstraints>
@@ -163,12 +119,7 @@
          <children>
 
             <!-- LEFT SIDE -->
-            <GridPane prefWidth="300.0"
-                      style="-fx-background-color: #F5F5F5;"
-                      GridPane.columnIndex="0"
-                      GridPane.rowIndex="0"
-                      translateX="80"
-                      translateY="150">
+            <GridPane prefWidth="300.0" style="-fx-background-color: #F5F5F5;" translateX="80" translateY="150" GridPane.columnIndex="0" GridPane.rowIndex="0">
 
                <children>
                   <VBox alignment="TOP_CENTER" spacing="15.0">
@@ -201,19 +152,13 @@
                            </padding>
 
                            <children>
-                              <Button text="Favorite"
-                                      prefHeight="55.0"
-                                      prefWidth="190.0"
-                                      style="-fx-background-color:#4453D9; -fx-background-radius:30; -fx-text-fill:white;">
+                              <Button prefHeight="55.0" prefWidth="190.0" style="-fx-background-color:#4453D9; -fx-background-radius:30; -fx-text-fill:white;" text="Favorite">
                                  <font>
                                     <Font name="System Bold" size="16.0" />
                                  </font>
                               </Button>
 
-                              <Button text="Donate"
-                                      prefHeight="55.0"
-                                      prefWidth="190.0"
-                                      style="-fx-background-color:#4E7C3F; -fx-background-radius:30; -fx-text-fill:white;">
+                              <Button onAction="#switchToDonationPage" prefHeight="55.0" prefWidth="190.0" style="-fx-background-color:#4E7C3F; -fx-background-radius:30; -fx-text-fill:white;" text="Donate">
                                  <font>
                                     <Font name="System Bold" size="16.0" />
                                  </font>
@@ -223,15 +168,16 @@
                      </children>
                   </VBox>
                </children>
+               <columnConstraints>
+                  <ColumnConstraints />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints />
+               </rowConstraints>
             </GridPane>
 
             <!-- RIGHT SIDE -->
-            <GridPane prefWidth="900.0"
-                      style="-fx-background-color: #F5F5F5;"
-                      GridPane.columnIndex="1"
-                      GridPane.rowIndex="0"
-                      hgap="20.0"
-                      vgap="18.0">
+            <GridPane hgap="20.0" prefWidth="900.0" style="-fx-background-color: #F5F5F5;" vgap="18.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
 
                <columnConstraints>
                   <ColumnConstraints percentWidth="55.0" />
@@ -247,9 +193,7 @@
                <children>
 
                   <!-- TOP LEFT INFO -->
-                  <GridPane GridPane.columnIndex="0"
-                            GridPane.rowIndex="0"
-                            vgap="14.0">
+                  <GridPane vgap="14.0" GridPane.columnIndex="0" GridPane.rowIndex="0">
 
                      <rowConstraints>
                         <RowConstraints percentHeight="45.0" />
@@ -259,37 +203,22 @@
 
                      <children>
 
-                        <Label text="[Charity Name]"
-                               style="-fx-text-fill:#2D3C8F;"
-                               GridPane.rowIndex="0"
-                               translateX="-280">
+                        <Label fx:id="CharityName" style="-fx-text-fill:#2D3C8F;" text="[Charity Name]" translateX="-280" GridPane.rowIndex="0">
                            <font>
                               <Font name="System Bold" size="62.0" />
                            </font>
                         </Label>
 
-                        <Label text="✓ Verified"
-                               style="-fx-background-color:#C8E6C0; -fx-background-radius:18; -fx-text-fill:#4E7C3F; -fx-padding:8 16 8 16;"
-                               GridPane.rowIndex="1"
-                               translateX="-280">
+                        <Label style="-fx-background-color:#C8E6C0; -fx-background-radius:18; -fx-text-fill:#4E7C3F; -fx-padding:8 16 8 16;" text="✓ Verified" translateX="-280" GridPane.rowIndex="1">
                            <font>
                               <Font name="System Bold" size="15.0" />
                            </font>
                         </Label>
 
-                        <StackPane prefHeight="80.0"
-                                   prefWidth="220.0"
-                                   GridPane.rowIndex="2"
-                                   translateX="-30">
+                        <StackPane prefHeight="80.0" prefWidth="220.0" translateX="-30" GridPane.rowIndex="2">
 
                            <children>
-                              <Rectangle arcHeight="30.0"
-                                         arcWidth="30.0"
-                                         fill="#F5F5F5"
-                                         height="60.0"
-                                         stroke="#4F4F4F"
-                                         strokeType="INSIDE"
-                                         width="220.0" />
+                              <Rectangle arcHeight="30.0" arcWidth="30.0" fill="#F5F5F5" height="60.0" stroke="#4F4F4F" strokeType="INSIDE" width="220.0" />
 
 
                               <Label text="[Category]">
@@ -301,28 +230,17 @@
                         </StackPane>
 
                      </children>
+                     <columnConstraints>
+                        <ColumnConstraints />
+                     </columnConstraints>
                   </GridPane>
 
                   <!-- TOP RIGHT IMAGE -->
-                  <StackPane prefHeight="210.0"
-                             prefWidth="420.0"
-                             style="-fx-background-color:#F5F5F5;"
-                             GridPane.columnIndex="1"
-                             GridPane.rowIndex="0"
-                             translateX="-70">
+                  <StackPane prefHeight="210.0" prefWidth="420.0" style="-fx-background-color:#F5F5F5;" translateX="-70" GridPane.columnIndex="1" GridPane.rowIndex="0">
 
                      <children>
-                        <Rectangle arcHeight="25.0"
-                                   arcWidth="25.0"
-                                   fill="#F5F5F5"
-                                   height="210.0"
-                                   stroke="#8B8B8B"
-                                   strokeType="INSIDE"
-                                   width="420.0" />
-                        <ImageView fitHeight="150.0"
-                                   fitWidth="220.0"
-                                   pickOnBounds="true"
-                                   preserveRatio="true">
+                        <Rectangle arcHeight="25.0" arcWidth="25.0" fill="#F5F5F5" height="210.0" stroke="#8B8B8B" strokeType="INSIDE" width="420.0" />
+                        <ImageView fitHeight="150.0" fitWidth="220.0" pickOnBounds="true" preserveRatio="true">
                            <image>
                               <Image url="@../images/leggTilBilde.jpg" />
                            </image>
@@ -332,68 +250,29 @@
 
 
                   <!-- SUMMARY -->
-                  <StackPane GridPane.columnIndex="0"
-                             GridPane.columnSpan="2"
-                             GridPane.rowIndex="1"
-                             translateY="60"
-                             translateX="-20"
-                             alignment="CENTER">
+                  <StackPane alignment="CENTER" translateX="-20" translateY="60" GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="1">
 
                      <children>
 
                         <!-- Kort-bakgrunn -->
-                        <Rectangle arcHeight="30.0"
-                                   arcWidth="30.0"
-                                   fill="#F5F5F5"
-                                   height="300.0"
-                                   width="700.0"
-                                   stroke="#8B8B8B"
-                                   strokeType="INSIDE">
+                        <Rectangle arcHeight="30.0" arcWidth="30.0" fill="#F5F5F5" height="300.0" stroke="#8B8B8B" strokeType="INSIDE" width="700.0">
                            <effect>
-                              <DropShadow radius="8.0" offsetY="3.0">
+                              <DropShadow offsetY="3.0" radius="8.0">
                                  <color>
-                                    <Color red="0.0" green="0.0" blue="0.0" opacity="0.2"/>
+                                    <Color red="0.0" green="0.0" blue="0.0" opacity="0.2" />
                                  </color>
                               </DropShadow>
                            </effect>
                         </Rectangle>
 
                         <!-- Ekte scrollbart innhold -->
-                        <ScrollPane prefHeight="260.0"
-                                    prefWidth="650.0"
-                                    minHeight="260.0"
-                                    minWidth="650.0"
-                                    maxHeight="260.0"
-                                    maxWidth="650.0"
-                                    fitToWidth="true"
-                                    hbarPolicy="NEVER"
-                                    vbarPolicy="ALWAYS"
-                                    pannable="true"
-                                    style="-fx-background-color: transparent; -fx-background: transparent;">
+                        <ScrollPane fitToWidth="true" hbarPolicy="NEVER" maxHeight="260.0" maxWidth="650.0" minHeight="260.0" minWidth="650.0" pannable="true" prefHeight="260.0" prefWidth="650.0" style="-fx-background-color: transparent; -fx-background: transparent;" vbarPolicy="ALWAYS">
 
                            <content>
-                              <VBox prefWidth="620.0"
-                                    fillWidth="true"
-                                    style="-fx-padding: 10;">
+                              <VBox fillWidth="true" prefWidth="620.0" style="-fx-padding: 10;">
                                  <children>
 
-                                    <Label wrapText="true"
-                                           prefWidth="600.0"
-                                           maxWidth="600.0"
-                                           text="Summary about the charity.
-
-Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle.
-Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle.
-Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle.
-Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle.
-Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle.
-Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle.
-Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle.
-Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle.
-Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle.
-Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle.
-Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle.
-Poenget er at teksten må bli høyere enn selve boksen.">
+                                    <Label fx:id="CharityDescription" maxWidth="600.0" prefWidth="600.0" text="Summary about the charity.  Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle. Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle. Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle. Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle. Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle. Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle. Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle. Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle. Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle. Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle. Poenget er at teksten må bli høyere enn selve boksen. Dette er en lengre testtekst for å sjekke at summary-feltet faktisk kan scrolle. Poenget er at teksten må bli høyere enn selve boksen." wrapText="true">
                                        <font>
                                           <Font size="16.0" />
                                        </font>
@@ -407,11 +286,7 @@ Poenget er at teksten må bli høyere enn selve boksen.">
                      </children>
                   </StackPane>
                   <!-- STATS -->
-                  <GridPane GridPane.columnIndex="0"
-                            GridPane.columnSpan="2"
-                            GridPane.rowIndex="2"
-                            hgap="30.0"
-                            style="-fx-padding: 80 0 0 0;">
+                  <GridPane hgap="30.0" style="-fx-padding: 80 0 0 0;" GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="2">
 
                      <columnConstraints>
                         <ColumnConstraints percentWidth="33.33" />
@@ -430,34 +305,14 @@ Poenget er at teksten må bli høyere enn selve boksen.">
                                  </font>
                               </Label>
 
-                              <StackPane prefWidth="100.0" prefHeight="100.0"
-                                         minWidth="100.0" minHeight="100.0"
-                                         maxWidth="100.0" maxHeight="100.0"
-                                         alignment="CENTER">
+                              <StackPane alignment="CENTER" maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
                                  <children>
 
-                                    <Pane prefWidth="100.0" prefHeight="100.0"
-                                          minWidth="100.0" minHeight="100.0"
-                                          maxWidth="100.0" maxHeight="100.0">
+                                    <Pane maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
                                        <children>
-                                          <Circle centerX="50.0"
-                                                  centerY="50.0"
-                                                  radius="38.0"
-                                                  fill="TRANSPARENT"
-                                                  stroke="#F1DADA"
-                                                  strokeWidth="8.0" />
-
-                                          <Arc centerX="50.0"
-                                               centerY="50.0"
-                                               radiusX="38.0"
-                                               radiusY="38.0"
-                                               startAngle="90.0"
-                                               length="-350.64"
-                                               stroke="#D83A32"
-                                               strokeWidth="8.0"
-                                               strokeLineCap="BUTT"
-                                               fill="TRANSPARENT"
-                                               type="OPEN" />
+                                          <Circle centerX="50.0" centerY="50.0" fill="TRANSPARENT" radius="38.0" stroke="#F1DADA" strokeWidth="8.0" />
+
+                                          <Arc centerX="50.0" centerY="50.0" fill="TRANSPARENT" length="-350.64" radiusX="38.0" radiusY="38.0" startAngle="90.0" stroke="#D83A32" strokeLineCap="BUTT" strokeWidth="8.0" type="OPEN" />
                                        </children>
                                     </Pane>
 
@@ -481,34 +336,14 @@ Poenget er at teksten må bli høyere enn selve boksen.">
                                  </font>
                               </Label>
 
-                              <StackPane prefWidth="100.0" prefHeight="100.0"
-                                         minWidth="100.0" minHeight="100.0"
-                                         maxWidth="100.0" maxHeight="100.0"
-                                         alignment="CENTER">
+                              <StackPane alignment="CENTER" maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
                                  <children>
 
-                                    <Pane prefWidth="100.0" prefHeight="100.0"
-                                          minWidth="100.0" minHeight="100.0"
-                                          maxWidth="100.0" maxHeight="100.0">
+                                    <Pane maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
                                        <children>
-                                          <Circle centerX="50.0"
-                                                  centerY="50.0"
-                                                  radius="38.0"
-                                                  fill="TRANSPARENT"
-                                                  stroke="#F1DADA"
-                                                  strokeWidth="8.0" />
-
-                                          <Arc centerX="50.0"
-                                               centerY="50.0"
-                                               radiusX="38.0"
-                                               radiusY="38.0"
-                                               startAngle="90.0"
-                                               length="-11.52"
-                                               stroke="#D83A32"
-                                               strokeWidth="8.0"
-                                               strokeLineCap="BUTT"
-                                               fill="TRANSPARENT"
-                                               type="OPEN" />
+                                          <Circle centerX="50.0" centerY="50.0" fill="TRANSPARENT" radius="38.0" stroke="#F1DADA" strokeWidth="8.0" />
+
+                                          <Arc centerX="50.0" centerY="50.0" fill="TRANSPARENT" length="-11.52" radiusX="38.0" radiusY="38.0" startAngle="90.0" stroke="#D83A32" strokeLineCap="BUTT" strokeWidth="8.0" type="OPEN" />
                                        </children>
                                     </Pane>
 
@@ -532,34 +367,14 @@ Poenget er at teksten må bli høyere enn selve boksen.">
                                  </font>
                               </Label>
 
-                              <StackPane prefWidth="100.0" prefHeight="100.0"
-                                         minWidth="100.0" minHeight="100.0"
-                                         maxWidth="100.0" maxHeight="100.0"
-                                         alignment="CENTER">
+                              <StackPane alignment="CENTER" maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
                                  <children>
 
-                                    <Pane prefWidth="100.0" prefHeight="100.0"
-                                          minWidth="100.0" minHeight="100.0"
-                                          maxWidth="100.0" maxHeight="100.0">
+                                    <Pane maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
                                        <children>
-                                          <Circle centerX="50.0"
-                                                  centerY="50.0"
-                                                  radius="38.0"
-                                                  fill="TRANSPARENT"
-                                                  stroke="#F1DADA"
-                                                  strokeWidth="8.0" />
-
-                                          <Arc centerX="50.0"
-                                               centerY="50.0"
-                                               radiusX="38.0"
-                                               radiusY="38.0"
-                                               startAngle="90.0"
-                                               length="-335.88"
-                                               stroke="#D83A32"
-                                               strokeWidth="8.0"
-                                               strokeLineCap="BUTT"
-                                               fill="TRANSPARENT"
-                                               type="OPEN" />
+                                          <Circle centerX="50.0" centerY="50.0" fill="TRANSPARENT" radius="38.0" stroke="#F1DADA" strokeWidth="8.0" />
+
+                                          <Arc centerX="50.0" centerY="50.0" fill="TRANSPARENT" length="-335.88" radiusX="38.0" radiusY="38.0" startAngle="90.0" stroke="#D83A32" strokeLineCap="BUTT" strokeWidth="8.0" type="OPEN" />
                                        </children>
                                     </Pane>
 
@@ -575,6 +390,9 @@ Poenget er at teksten må bli høyere enn selve boksen.">
                         </VBox>
 
                      </children>
+                     <rowConstraints>
+                        <RowConstraints />
+                     </rowConstraints>
                   </GridPane>
 
                </children>
@@ -584,17 +402,10 @@ Poenget er at teksten må bli høyere enn selve boksen.">
       </GridPane>
 
       <!-- FOOTER -->
-      <HBox alignment="BOTTOM_CENTER"
-            prefHeight="180.0"
-            prefWidth="1200.0"
-            style="-fx-background-color: #5F9895;"
-            GridPane.columnIndex="0"
-            GridPane.rowIndex="2">
+      <HBox alignment="BOTTOM_CENTER" prefHeight="180.0" prefWidth="1200.0" style="-fx-background-color: #5F9895;" GridPane.columnIndex="0" GridPane.rowIndex="2">
 
          <children>
-            <GridPane HBox.hgrow="ALWAYS"
-                      prefHeight="180.0"
-                      prefWidth="1200.0">
+            <GridPane prefHeight="180.0" prefWidth="1200.0" HBox.hgrow="ALWAYS">
 
                <columnConstraints>
                   <ColumnConstraints percentWidth="60.0" />
@@ -608,16 +419,11 @@ Poenget er at teksten må bli høyere enn selve boksen.">
                <children>
 
                   <!-- LEFT FOOTER SIDE -->
-                  <StackPane prefHeight="180.0"
-                             prefWidth="720.0"
-                             GridPane.columnIndex="0"
-                             GridPane.rowIndex="0">
+                  <StackPane prefHeight="180.0" prefWidth="720.0" GridPane.columnIndex="0" GridPane.rowIndex="0">
 
                      <children>
 
-                        <HBox alignment="CENTER_LEFT"
-                              spacing="0.0"
-                              translateX="60.0">
+                        <HBox alignment="CENTER_LEFT" spacing="0.0" translateX="60.0">
                            <children>
                               <Label text="Help" textFill="WHITE">
                                  <font>
@@ -639,14 +445,9 @@ Poenget er at teksten må bli høyere enn selve boksen.">
                            </children>
                         </HBox>
 
-                        <Rectangle fill="WHITE"
-                                   height="90.0"
-                                   width="2.0"
-                                   translateX="-20.0" />
+                        <Rectangle fill="WHITE" height="90.0" translateX="-20.0" width="2.0" />
 
-                        <VBox alignment="CENTER"
-                              spacing="5.0"
-                              translateX="120.0">
+                        <VBox alignment="CENTER" spacing="5.0" translateX="120.0">
                            <children>
                               <Label text="About us" textFill="WHITE">
                                  <font>
@@ -681,31 +482,19 @@ Poenget er at teksten må bli høyere enn selve boksen.">
                   </StackPane>
 
                   <!-- RIGHT FOOTER SIDE -->
-                  <StackPane alignment="CENTER"
-                             prefHeight="180.0"
-                             prefWidth="480.0"
-                             GridPane.columnIndex="1"
-                             GridPane.rowIndex="0">
+                  <StackPane alignment="CENTER" prefHeight="180.0" prefWidth="480.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
 
                      <children>
 
-                        <VBox alignment="CENTER"
-                              spacing="10.0">
+                        <VBox alignment="CENTER" spacing="10.0">
                            <children>
-                              <ImageView fitHeight="80.0"
-                                         fitWidth="150.0"
-                                         pickOnBounds="true"
-                                         preserveRatio="true">
+                              <ImageView fitHeight="80.0" fitWidth="150.0" pickOnBounds="true" preserveRatio="true">
                                  <image>
                                     <Image url="@../images/img.png" />
                                  </image>
                               </ImageView>
 
-                              <Label maxWidth="250.0"
-                                     text="All data is consistently updated and reverified"
-                                     textAlignment="CENTER"
-                                     textFill="WHITE"
-                                     wrapText="true">
+                              <Label maxWidth="250.0" text="All data is consistently updated and reverified" textAlignment="CENTER" textFill="WHITE" wrapText="true">
                                  <font>
                                     <Font name="System Bold" size="17.0" />
                                  </font>
@@ -722,4 +511,4 @@ Poenget er at teksten må bli høyere enn selve boksen.">
       </HBox>
 
    </children>
-</GridPane>
\ No newline at end of file
+</GridPane>
diff --git a/helpmehelpapplication/src/main/resources/fxml/donationPage.fxml b/helpmehelpapplication/src/main/resources/fxml/donationPage.fxml
index 7171520..405eec1 100644
--- a/helpmehelpapplication/src/main/resources/fxml/donationPage.fxml
+++ b/helpmehelpapplication/src/main/resources/fxml/donationPage.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.shape.*?>
 <?import javafx.scene.text.*?>
 
-<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1">
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ntnu.systemutvikling.team6.controller.DonationPageController">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
   </columnConstraints>
@@ -32,14 +32,6 @@
                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
               </rowConstraints>
                <children>
-                  <ImageView fitHeight="54.0" fitWidth="67.0" pickOnBounds="true" preserveRatio="true" translateX="10.0">
-                     <image>
-                        <Image url="@../images/Logo.png" />
-                     </image>
-                     <cursor>
-                        <Cursor fx:constant="HAND" />
-                     </cursor>
-                  </ImageView>
                   <Label text="Help" textFill="WHITE" translateX="100.0">
                      <font>
                         <Font name="System Bold" size="20.0" />
@@ -73,6 +65,21 @@
                         </Label>
                      </children>
                   </StackPane>
+                   <!-- -->
+                  <Button mnemonicParsing="false" onAction="#switchToFrontPage" prefHeight="0.0" prefWidth="0.0" style="-fx-background-color: #2f8f8b">
+                     <graphic>
+                        <ImageView fitHeight="54.0" fitWidth="67.0" pickOnBounds="true" preserveRatio="true">
+                           <image>
+                              <Image url="@../images/Logo.png" />
+                           </image>
+                           <cursor>
+                              <Cursor fx:constant="HAND" />
+                           </cursor>
+                        </ImageView>
+                     </graphic>
+                  </Button>
+                   <!-- -->
+
                </children>
             </GridPane>
          </children>