diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
index 1026c20..0f4a58b 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
@@ -46,6 +46,12 @@ public void start(Stage stage) throws Exception {
     stage.setFullScreen(true);
 
     stage.show();
+    // Re-enter fullscreen when restored from taskbar
+    stage.iconifiedProperty().addListener((obs, wasIconified, isNowIconified) -> {
+      if (!isNowIconified) {
+        stage.setFullScreen(true);
+      }
+    });
   }
 
   @Override
@@ -78,9 +84,8 @@ public void init() {
            */
 
         // Comment out the two below to use already generated database.
-        CharityRegistry charityRegistry = scraper.getAPIAndURLCharityData();
-
-        db.addAPIDataToTable(charityRegistry.getAllCharities());
+        //CharityRegistry charityRegistry = scraper.getAPIAndURLCharityData();
+        //db.addAPIDataToTable(charityRegistry.getAllCharities());
       }
     } catch (Exception e) {
       e.printStackTrace();
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CharityPageController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CharityPageController.java
index 44a66b6..363afbc 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CharityPageController.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CharityPageController.java
@@ -79,6 +79,7 @@ protected void authTokenisSet(){
   public void setCharity(Charity charity) {
     this.charity = charity;
 
+
     CharityDescription.setText(charity.getDescription());
     CharityName.setText(charity.getName());
 
@@ -97,25 +98,27 @@ public void setCharity(Charity charity) {
 
     // Sets key values to a List<Double>
     String input = charity.getKeyValues();
-
-    String[] parts = input.split(":");
-    List<Double> numbers = new ArrayList<>();
-
-    for (String part : parts) {
-      part = part.replace(",", ".");
-      numbers.add(Double.parseDouble(part));
+    if (input != null) {
+
+      String[] parts = input.split(":");
+      List<Double> numbers = new ArrayList<>();
+
+      for (String part : parts) {
+        part = part.replace(",", ".");
+        numbers.add(Double.parseDouble(part));
+      }
+
+      // Sets the value of each arc and label
+      setArc(keyValueInnsamlingArc, numbers.getFirst());
+      keyValueInnsamlingLabel.setText(String.format("%.1f%%", numbers.getFirst()));
+      setArc(keyValueAdminArc, numbers.get(1));
+      keyValueAdminLabel.setText(String.format("%.1f%%", numbers.get(1)));
+      setArc(keyValueFormaalArc, numbers.getLast());
+      keyValueFormaalLabel.setText(String.format("%.1f%%", numbers.getLast()));
     }
 
-    // Sets the value of each arc and label
-    setArc(keyValueInnsamlingArc, numbers.getFirst());
-    keyValueInnsamlingLabel.setText(String.format("%.1f%%", numbers.getFirst()));
-    setArc(keyValueAdminArc, numbers.get(1));
-    keyValueAdminLabel.setText(String.format("%.1f%%", numbers.get(1)));
-    setArc(keyValueFormaalArc, numbers.getLast());
-    keyValueFormaalLabel.setText(String.format("%.1f%%", numbers.getLast()));
-
-    // Sets the categories
-    setCategories(charity.getCategory());
+      // Sets the categories
+      setCategories(charity.getCategory());
   }
 
   /**
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java
index a4bd599..041f32d 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java
@@ -86,6 +86,7 @@ private void loadPage(){
 
       for (String category : categories) {
         CheckBox cb = new CheckBox(category);
+        cb.setStyle("-fx-font-size: 12; -fx-padding: 10 0 0 20; -fx-text-fill: black" );
 
         cb.setOnAction(
             e -> {
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/LoaderScene.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/LoaderScene.java
index d9ec09a..5adc1c0 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/LoaderScene.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/LoaderScene.java
@@ -73,6 +73,11 @@ public static void LoadScene(String sceneName, Stage stage, Charity charity, Str
       stage.setScene(scene);
       stage.setFullScreen(true);
       stage.show();
+      stage.iconifiedProperty().addListener((obs, wasIconified, isNowIconified) -> {
+        if (!isNowIconified) {
+          stage.setFullScreen(true);
+        }
+      });
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgEditController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgEditController.java
index 5ad1d17..12c0094 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgEditController.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgEditController.java
@@ -25,7 +25,9 @@
 public class profileOrgEditController extends BaseController {
     @FXML
     private NavbarController navbarController;
+
     @FXML private Label charityNameLabel;
+    @FXML private Label charityNameLabel2;
     @FXML private TextArea descriptionField;
 
     @Override
@@ -50,6 +52,7 @@ protected void authTokenisSet() {
     private void populateFields(){
         Charity usersCharity = authToken.isCharityUser();
         charityNameLabel.setText(usersCharity.getName());
+        charityNameLabel2.setText(usersCharity.getName());
         descriptionField.setText(usersCharity.getDescription());
     }
 
@@ -99,7 +102,7 @@ private void switchToFeedbackPage(ActionEvent event){
 
     @FXML
     private void switchToSettingsPage(ActionEvent event){
-        LoaderScene.LoadScene("profile_user_Settings", event, null, null, authToken);
+        LoaderScene.LoadScene("profile_org_Settings", event, null, null, authToken);
     }
 
 
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgInboxController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgInboxController.java
index 6b89eee..40d8549 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgInboxController.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgInboxController.java
@@ -125,7 +125,7 @@ private void switchToEditPage(ActionEvent event) {
 
     @FXML
     private void switchToSettingsPage(ActionEvent event) {
-        LoaderScene.LoadScene("profile_user_Settings", event, null, null, authToken);
+        LoaderScene.LoadScene("profile_org_Settings", event, null, null, authToken);
     }
 
 
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgPaymentsController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgPaymentsController.java
index de65107..e1baa79 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgPaymentsController.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgPaymentsController.java
@@ -92,7 +92,7 @@ private void switchToFeedbackPage(ActionEvent event){
 
     @FXML
     private void switchToSettingsPage(ActionEvent event){
-        LoaderScene.LoadScene("profile_user_Settings", event, null, null, authToken);
+        LoaderScene.LoadScene("profile_org_Settings", event, null, null, authToken);
     }
 
 
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java
index 640d90c..3c81035 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java
@@ -69,7 +69,7 @@ public CharityRegistry getCharitiesFromDB() {
           LEFT JOIN User u ON f.user_id = u.UUID_user
           LEFT JOIN Charity_Categories cc ON cc.Charities_UUID_charities = c.UUID_charities
           LEFT JOIN Categories cat ON cat.category_id = cc.Categories_category_id
-          INNER JOIN CharityVanity cv ON cv.UUID_charity = c.UUID_charities;
+          INNER JOIN CharityVanity cv ON cv.UUID_charity = c.UUID_charities
           ORDER BY c.UUID_charities;
           """;
       Statement stmt = conn.createStatement();
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java
index 20e1663..fde91f9 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java
@@ -20,7 +20,7 @@ public class User {
   private String username;
   private String email;
   private String passwordHash;
-  private final Role role;
+  private Role role;
   private Settings settings;
   private Inbox inbox;
 
@@ -200,4 +200,12 @@ public void setInbox(Inbox inbox) {
     }
     this.inbox = inbox;
   }
+
+  public void setRole(Role role) {
+    if (role == null) {
+      throw new IllegalArgumentException("Inbox cannot be null");
+    }
+    this.role = role;
+  }
 }
+
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/AuthenticationService.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/AuthenticationService.java
index cd9cbc2..032d138 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/AuthenticationService.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/AuthenticationService.java
@@ -55,6 +55,9 @@ public boolean login(String email, String password){
         if (user != null){
             currentUser = user;
             isCharityUser = userDataReader.getUserCharityUser(currentUser.getId().toString());
+            if (isCharityUser != null){
+                currentUser.setRole(Role.CHARITY_USER);
+            }
             System.out.println("User gotten");
             return true;
         }
diff --git a/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml b/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml
index d0a8097..8b7309f 100644
--- a/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml
+++ b/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml
@@ -20,6 +20,8 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
+<?import javafx.scene.Cursor?>
+<?import javafx.scene.layout.HBox?>
 <GridPane fx:id="CharityPage" hgap="0.0" prefHeight="900.0" prefWidth="1200.0" vgap="0.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ntnu.systemutvikling.team6.controller.CharityPageController">
 
    <columnConstraints>
@@ -66,84 +68,89 @@
       
                <!-- TOP LEFT INFO -->
                <GridPane vgap="14.0" GridPane.columnIndex="0" GridPane.rowIndex="0">
-      
+
+
                   <rowConstraints>
                      <RowConstraints percentHeight="45.0" />
                      <RowConstraints percentHeight="25.0" />
                      <RowConstraints percentHeight="30.0" />
                   </rowConstraints>
-      
+
                   <columnConstraints>
                      <ColumnConstraints />
                   </columnConstraints>
-      
-                  <Label fx:id="CharityName" prefHeight="90.0" prefWidth="456.0" style="-fx-text-fill:#2D3C8F;" text="[Charity Name]" textAlignment="CENTER" GridPane.rowIndex="0">
+
+                  <Label style="-fx-background-color:#C8E6C0; -fx-background-radius:18; -fx-text-fill:#4E7C3F; -fx-padding:8 16 8 16;" text="✓ Verified" translateY="-200.0" GridPane.rowIndex="1">
                      <font>
-                        <Font name="System Bold" size="50.0" />
+                        <Font name="System Bold" size="15.0" />
                      </font>
-                     <padding>
-                        <Insets left="10.0" />
-                     </padding>
                   </Label>
-      
-                  <Label style="-fx-background-color:#C8E6C0; -fx-background-radius:18; -fx-text-fill:#4E7C3F; -fx-padding:8 16 8 16;" text="✓ Verified" GridPane.rowIndex="1">
+                  <Label text="Categories">
                      <font>
-                        <Font name="System Bold" size="15.0" />
+                        <Font name="System Bold" size="22.0" />
                      </font>
+                     <opaqueInsets>
+                        <Insets />
+                     </opaqueInsets>
+                     <padding>
+                        <Insets left="10.0" top="100.0" />
+                     </padding>
                   </Label>
-      
-                  <StackPane prefHeight="67.0" prefWidth="489.0" translateX="-30" GridPane.rowIndex="2">
-      
-                     <Rectangle arcHeight="30.0" arcWidth="30.0" fill="#F5F5F5" height="60.0" stroke="#4F4F4F" strokeType="INSIDE" width="220.0" />
-      
-      
-                     <Label text="[Category]">
-                        <font>
-                           <Font name="System Bold" size="18.0" />
-                        </font>
-                     </Label>
-                  </StackPane>
+                  <!-- Categories -->
+                  <ScrollPane prefHeight="200.0" prefWidth="250.0" translateY="-200.0" GridPane.rowIndex="2">
+                     <content>
+                        <VBox fx:id="categoriesContainer" spacing="10.0">
+                           <padding>
+                              <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                           </padding>
+                        </VBox>
+                     </content>
+                  </ScrollPane>
                   <padding>
                      <Insets left="10.0" />
                   </padding>
       
                </GridPane>
                <VBox alignment="CENTER" prefHeight="509.0" prefWidth="425.0" spacing="15.0" GridPane.rowIndex="1">
-      
-                  <Hyperlink text="Homepage">
+
+                  <Hyperlink fx:id="CharityURL" onAction="#handleHomepageClick" text="Homepage">
                      <font>
                         <Font name="System Bold" size="20.0" />
                      </font>
                   </Hyperlink>
-      
+
                   <Hyperlink text="Socials">
                      <font>
                         <Font name="System Bold" size="20.0" />
                      </font>
                   </Hyperlink>
-      
+
                   <Hyperlink text="Verification Report">
                      <font>
                         <Font name="System Bold" size="20.0" />
                      </font>
                   </Hyperlink>
-      
+
                   <VBox alignment="CENTER" prefHeight="89.0" prefWidth="191.0" spacing="22.0">
-      
-                     <Button onAction="#switchToDonationPage" prefHeight="55.0" prefWidth="190.0" style="-fx-background-color:#4E7C3F; -fx-background-radius:30; -fx-text-fill:white;" text="Donate">
+                     <Button onAction="#switchToFeedbackPage" prefHeight="55.0" prefWidth="190.0" style="-fx-background-color:#E07400; -fx-background-radius:30; -fx-text-fill:white;" text="Feedbacks">
+                        <cursor>
+                           <Cursor fx:constant="HAND" />
+                        </cursor>
                         <font>
                            <Font name="System Bold" size="16.0" />
                         </font>
                      </Button>
-                  </VBox>
-                  <VBox alignment="CENTER" prefHeight="89.0" prefWidth="191.0" spacing="22.0">
 
-                     <Button onAction="#switchToFeedbackPage" prefHeight="55.0" prefWidth="190.0" style="-fx-background-color:#E07400; -fx-background-radius:30; -fx-text-fill:white;" text="Feedback">
+                     <Button onAction="#switchToDonationPage" prefHeight="55.0" prefWidth="190.0" style="-fx-background-color:#4E7C3F; -fx-background-radius:30; -fx-text-fill:white;" text="Donate">
+                        <cursor>
+                           <Cursor fx:constant="HAND" />
+                        </cursor>
                         <font>
                            <Font name="System Bold" size="16.0" />
                         </font>
                      </Button>
                   </VBox>
+
                </VBox>
             </GridPane>
       
@@ -163,13 +170,8 @@
       
                <!-- TOP RIGHT IMAGE -->
                <StackPane prefHeight="210.0" prefWidth="420.0" style="-fx-background-color:#F5F5F5;" translateX="-70" GridPane.rowIndex="0">
-      
-                  <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>
-                  </ImageView>
+                  <Rectangle arcHeight="25.0" arcWidth="25.0" fill="#F5F5F5" height="210.0" stroke="#8B8B8B" strokeType="INSIDE" translateY="100.0" width="420.0" />
+                  <ImageView fx:id="CharityLogo" fitHeight="150.0" fitWidth="220.0" pickOnBounds="true" preserveRatio="true" translateY="100.0" />
                   <GridPane.margin>
                      <Insets top="20.0" />
                   </GridPane.margin>
@@ -178,10 +180,9 @@
       
                <!-- SUMMARY -->
                <StackPane alignment="CENTER" translateX="-20" translateY="60" GridPane.columnIndex="0" GridPane.columnSpan="1" GridPane.rowIndex="1">
-      
+
                   <children>
-      
-                     <!-- Kort-bakgrunn -->
+
                      <Rectangle arcHeight="30.0" arcWidth="30.0" fill="#F5F5F5" height="300.0" stroke="#8B8B8B" strokeType="INSIDE" width="700.0">
                         <effect>
                            <DropShadow offsetY="3.0" radius="8.0">
@@ -191,20 +192,19 @@
                            </DropShadow>
                         </effect>
                      </Rectangle>
-      
                      <!-- Ekte scrollbart innhold -->
                      <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 fillWidth="true" prefWidth="620.0" style="-fx-padding: 10;">
                               <children>
-      
+
                                  <Label fx:id="CharityDescription" maxWidth="600.0" prefWidth="600.0" style="-fx-text-fill: black;" 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>
                                  </Label>
-      
+
                               </children>
                            </VBox>
                         </content>
@@ -213,130 +213,148 @@
                   </children>
                </StackPane>
                <!-- STATS -->
-               <GridPane hgap="30.0" style="-fx-padding: 80 0 0 0;" GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="2">
-      
+         <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" />
+               <ColumnConstraints percentWidth="33.33" />
+               <ColumnConstraints percentWidth="33.33" />
+            </columnConstraints>
+
+            <children>
+               <GridPane hgap="10.0" GridPane.hgrow="ALWAYS">
                   <columnConstraints>
-                     <ColumnConstraints percentWidth="33.33" />
-                     <ColumnConstraints percentWidth="33.33" />
-                     <ColumnConstraints percentWidth="33.33" />
+                     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+                     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                   </columnConstraints>
-      
+                  <rowConstraints>
+                     <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                  </rowConstraints>
                   <children>
-                     <GridPane hgap="10.0">
-                        <columnConstraints>
-                           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
-                           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                        </columnConstraints>
-                        <rowConstraints>
-                           <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                        </rowConstraints>
+                     <HBox fillHeight="false" prefHeight="100.0" prefWidth="3000000.0" GridPane.hgrow="ALWAYS">
                         <children>
-            
-                                 <!-- 97,4 % -->
-                           <VBox alignment="CENTER_LEFT" spacing="12.0">
+
+                           <VBox alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minWidth="250.0" prefWidth="250.0" spacing="12.0" HBox.hgrow="SOMETIMES">
                               <children>
                                  <Label text="Innsamlingsprosent">
                                     <font>
                                        <Font name="System Bold" size="16.0" />
                                     </font>
                                  </Label>
-            
-                                       <StackPane alignment="CENTER" maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
+
+                                 <StackPane alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="300.0">
                                     <children>
-            
-                                             <Pane maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="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" 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" />
+
+                                             <Arc fx:id="keyValueInnsamlingArc" centerX="50.0" centerY="50.0" fill="TRANSPARENT" length="-180" radiusX="38.0" radiusY="38.0" startAngle="90.0" stroke="#D83A32" strokeLineCap="BUTT" strokeWidth="8.0" type="OPEN" />
                                           </children>
                                        </Pane>
-            
-                                             <Label text="97,4%" StackPane.alignment="CENTER">
+
+                                       <Label fx:id="keyValueInnsamlingLabel" minWidth="-Infinity" text="50%" StackPane.alignment="CENTER">
                                           <font>
                                              <Font name="System Bold" size="16.0" />
                                           </font>
                                        </Label>
-            
-                                          </children>
+
+                                    </children>
                                  </StackPane>
                               </children>
+                              <padding>
+                                 <Insets right="100.0" />
+                              </padding>
                            </VBox>
-            
-                                 <!-- 3,2 % -->
-                           <VBox alignment="CENTER" prefWidth="144.0" spacing="12.0" GridPane.columnIndex="1">
+
+                           <VBox alignment="CENTER" minWidth="300.0" prefWidth="300.0" spacing="12.0" HBox.hgrow="SOMETIMES">
                               <children>
-                                 <Label text="Administrasjonsprosent">
+                                 <Label text="Administrasjonsprosent" VBox.vgrow="ALWAYS">
                                     <font>
                                        <Font name="System Bold" size="16.0" />
                                     </font>
                                  </Label>
-            
-                                       <StackPane alignment="CENTER" maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
+
+                                 <StackPane alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="300.0" VBox.vgrow="ALWAYS">
                                     <children>
-            
-                                             <Pane maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="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" 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" />
+
+                                             <Arc fx:id="keyValueAdminArc" centerX="50.0" centerY="50.0" fill="TRANSPARENT" length="-180.00" radiusX="38.0" radiusY="38.0" startAngle="90.0" stroke="#D83A32" strokeLineCap="BUTT" strokeWidth="8.0" type="OPEN" />
                                           </children>
                                        </Pane>
-            
-                                             <Label text="3,2%" StackPane.alignment="CENTER">
+
+                                       <Label fx:id="keyValueAdminLabel" text="50%" StackPane.alignment="CENTER">
                                           <font>
                                              <Font name="System Bold" size="16.0" />
                                           </font>
                                        </Label>
-            
-                                          </children>
+
+                                    </children>
                                  </StackPane>
                               </children>
+                              <padding>
+                                 <Insets right="100.0" />
+                              </padding>
                            </VBox>
-            
-                                 <!-- 93,3 % -->
-                           <VBox alignment="CENTER_RIGHT" spacing="12.0" GridPane.columnIndex="2">
+
+                           <VBox alignment="CENTER_RIGHT" minWidth="120.0" prefWidth="350.0" spacing="12.0" HBox.hgrow="SOMETIMES">
                               <children>
-                                 <Label text="Formålsprosent">
+                                 <Label text="Formålsprosent" VBox.vgrow="ALWAYS">
                                     <font>
                                        <Font name="System Bold" size="16.0" />
                                     </font>
                                  </Label>
-            
-                                       <StackPane alignment="CENTER" maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
+
+                                 <StackPane alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="300.0" VBox.vgrow="ALWAYS">
                                     <children>
-            
-                                             <Pane maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="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" 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" />
+
+                                             <Arc fx:id="keyValueFormaalArc" centerX="50.0" centerY="50.0" fill="TRANSPARENT" length="-180" radiusX="38.0" radiusY="38.0" startAngle="90.0" stroke="#D83A32" strokeLineCap="BUTT" strokeWidth="8.0" type="OPEN" />
                                           </children>
                                        </Pane>
-            
-                                             <Label text="93,3%" StackPane.alignment="CENTER">
+
+                                       <Label fx:id="keyValueFormaalLabel" text="50%" StackPane.alignment="CENTER">
                                           <font>
                                              <Font name="System Bold" size="16.0" />
                                           </font>
                                        </Label>
-            
-                                          </children>
+
+                                    </children>
                                  </StackPane>
                               </children>
                            </VBox>
                         </children>
-                     </GridPane>
-      
+                     </HBox>
+
                   </children>
-                  <rowConstraints>
-                     <RowConstraints />
-                  </rowConstraints>
                </GridPane>
-      
-            </GridPane>
-      
+
+
+            </children>
+            <rowConstraints>
+               <RowConstraints />
+            </rowConstraints>
          </GridPane>
+
+         <Label fx:id="CharityName" maxWidth="1000" prefHeight="90.0" prefWidth="456.0" style="-fx-text-fill:#2D3C8F;" text="[Charity Name]" textAlignment="CENTER" translateY="-420.0" GridPane.columnSpan="2" GridPane.rowIndex="0" GridPane.rowSpan="2">
+
+            <font>
+               <Font name="System Bold" size="50.0" />
+            </font>
+            <padding>
+               <Insets left="10.0" />
+            </padding>
+         </Label>
+         </GridPane>
+      </GridPane>
+
       </content>
    </ScrollPane>
 
diff --git a/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml b/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml
index 1e095ea..a564a0b 100644
--- a/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml
+++ b/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml
@@ -130,7 +130,7 @@
                   <padding><Insets top="10.0" /></padding>
                   <children>
                      <!-- FILTER SIDEBAR -->
-                     <VBox prefWidth="160.0"
+                     <VBox fx:id="categoryList" prefWidth="160.0"
                            style="-fx-background-color: transparent; -fx-border-color: #2F8F8B; -fx-border-radius: 10; -fx-border-width: 2;">
                         <children>
                            <Label textFill="black" text="Categories:">
diff --git a/helpmehelpapplication/src/main/resources/fxml/giveFeedback.fxml b/helpmehelpapplication/src/main/resources/fxml/giveFeedback.fxml
index 6fae176..3551065 100644
--- a/helpmehelpapplication/src/main/resources/fxml/giveFeedback.fxml
+++ b/helpmehelpapplication/src/main/resources/fxml/giveFeedback.fxml
@@ -46,12 +46,9 @@
                     <!-- PAGE TITLE -->
                     <VBox spacing="4.0">
                         <children>
-                            <Label style="-fx-text-fill: #222222;" text="Charity Feedback">
+                            <Label style="-fx-text-fill: #2f8f8b;"  fx:id="charityNameLabel" text="Charity Feedback">
                                 <font><Font name="System Bold" size="36.0" /></font>
                             </Label>
-                            <Label fx:id="charityNameLabel" style="-fx-text-fill: #2f8f8b;">
-                                <font><Font name="System Bold" size="18.0" /></font>
-                            </Label>
                         </children>
                     </VBox>
 
diff --git a/helpmehelpapplication/src/main/resources/fxml/profile_org_Payments.fxml b/helpmehelpapplication/src/main/resources/fxml/profile_org_Payments.fxml
index e63aa4d..9bd4e1f 100644
--- a/helpmehelpapplication/src/main/resources/fxml/profile_org_Payments.fxml
+++ b/helpmehelpapplication/src/main/resources/fxml/profile_org_Payments.fxml
@@ -147,16 +147,6 @@
 
     </children>
 </VBox>
-
-                <HBox alignment="CENTER">
-                    <children>
-                        <Label text="▼" textFill="#7E8288">
-                            <font>
-                                <Font size="22" />
-                            </font>
-                        </Label>
-                    </children>
-                </HBox>
             </children>
         </VBox>
       <rowConstraints>
diff --git a/helpmehelpapplication/src/main/resources/fxml/profile_org_edit.fxml b/helpmehelpapplication/src/main/resources/fxml/profile_org_edit.fxml
index 0ec3088..a17a1cf 100644
--- a/helpmehelpapplication/src/main/resources/fxml/profile_org_edit.fxml
+++ b/helpmehelpapplication/src/main/resources/fxml/profile_org_edit.fxml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.layout.BorderPane?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.Cursor?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
@@ -20,12 +18,11 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.layout.BorderPane?>
 <GridPane prefHeight="900.0" prefWidth="1400.0" style="-fx-background-color: #F5F5F5;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ntnu.systemutvikling.team6.controller.profileCharity.profileOrgEditController">
 
     <columnConstraints>
         <ColumnConstraints percentWidth="100.0" />
+      <ColumnConstraints />
     </columnConstraints>
 
     <rowConstraints>
@@ -34,15 +31,15 @@
     </rowConstraints>
 
     <!-- NAVBAR -->
-    <StackPane prefHeight="86.0" minHeight="86.0" maxHeight="86.0" style="-fx-background-color: #379894;">
+    <StackPane maxHeight="86.0" minHeight="86.0" prefHeight="86.0" style="-fx-background-color: #379894;">
         <children>
             <!-- Pull in the navbar from components with its own controller -->
-            <fx:include fx:id="navbar" source="components/navbar.fxml"/>
+            <fx:include fx:id="navbar" source="components/navbar.fxml" />
         </children>
     </StackPane>
 
     <!-- MAIN CONTENT -->
-    <BorderPane VBox.vgrow="ALWAYS" style="-fx-background-color: #F5F5F5;">
+    <BorderPane style="-fx-background-color: #F5F5F5;" GridPane.rowIndex="1" VBox.vgrow="ALWAYS">
 
         <!-- SIDEBAR -->
         <left>
@@ -55,7 +52,7 @@
                     <VBox alignment="CENTER" spacing="16">
                         <children>
                             <Circle fill="#D9D9D9" radius="88" />
-                            <Label text="Organization&#10;Name" textAlignment="CENTER" textFill="#333333">
+                            <Label fx:id="charityNameLabel" text="Organization&#10;Name" textAlignment="CENTER" textFill="#333333">
                                 <font>
                                     <Font size="18" />
                                 </font>
@@ -99,80 +96,72 @@
 
                 <Button onAction="#handleLogout" style="-fx-background-color: transparent; -fx-font-size: 20px; -fx-alignment: CENTER_LEFT; -fx-text-fill: #333333;" text="Log Out" />
             </children>
-        </VBox>
-    </left>
-    </BorderPane>
+            </VBox>
+        </left>
 
         <!-- PAGE AREA -->
-        <ScrollPane fitToWidth="true" hbarPolicy="NEVER" style="-fx-background-color: transparent;" GridPane.columnIndex="1">
-            <content>
-                <VBox spacing="30" style="-fx-background-color: #F5F5F5;">
-                    <padding>
-                        <Insets bottom="40" left="50" right="34" top="40" />
-                    </padding>
-
-                    <children>
-                        <!-- PAGE TITLE -->
-                        <VBox spacing="4">
-                            <children>
-                                <Label text="Edit Organisation" textFill="#111111">
-                                    <font><Font name="System Bold" size="32" /></font>
-                                </Label>
-                                <Label text="Update your organisation's public description." textFill="#8B8B8B">
-                                    <font><Font size="24" /></font>
-                                </Label>
-                            </children>
-                        </VBox>
+        <center>
+            <ScrollPane fitToWidth="true" hbarPolicy="NEVER" style="-fx-background-color: transparent;">
+                <content>
+                    <VBox spacing="30" style="-fx-background-color: #F5F5F5;">
+                        <padding>
+                            <Insets bottom="40" left="50" right="34" top="40" />
+                        </padding>
 
-                        <!-- HEADER CARD (read-only) -->
-                        <VBox spacing="8">
-                            <children>
-                                <Label text="Organisation Name" textFill="#444444">
-                                    <font><Font name="System Regular" size="13" /></font>
-                                </Label>
-                                <StackPane>
-                                    <children>
-                                        <Rectangle arcHeight="12" arcWidth="12" fill="#EEEEEE" height="60" width="780" />
-                                        <Label fx:id="charityNameLabel" text="REDD BARNA NORGE" textFill="#888888"
-                                               style="-fx-padding: 0 0 0 18;">
-                                            <font><Font name="System Regular" size="20" /></font>
-                                        </Label>
-                                    </children>
-                                </StackPane>
-                                <Label text="Organisation name can only be changed in Settings." textFill="#AAAAAA">
-                                    <font><Font size="11" /></font>
-                                </Label>
-                            </children>
-                        </VBox>
+                        <children>
+                            <!-- PAGE TITLE -->
+                            <VBox spacing="4">
+                                <children>
+                                    <Label text="Edit Organisation" textFill="#111111">
+                                        <font><Font name="System Bold" size="32" /></font>
+                                    </Label>
+                                    <Label text="Update your organisation's public description." textFill="#8B8B8B">
+                                        <font><Font size="24" /></font>
+                                    </Label>
+                                </children>
+                            </VBox>
 
-                        <VBox spacing="8">
-                            <children>
-                                <Label text="Description" textFill="#444444">
-                                    <font><Font name="System Regular" size="13" /></font>
-                                </Label>
-                                <TextArea fx:id="descriptionField"
-                                          prefHeight="180"
-                                          promptText="Write a description of your organisation..."
-                                          style="-fx-background-color: #FFFFFF;
-                                         -fx-border-color: #DDDDDD;
-                                         -fx-border-radius: 10;
-                                         -fx-background-radius: 10;
-                                         -fx-font-size: 14px;
-                                         -fx-padding: 10;"
-                                          wrapText="true" />
-                                <Button onAction="#handleSaveDescription"
-                                        text="Save Description"
-                                        style="-fx-padding: 8 20 8 20;">
-                                    <cursor><Cursor fx:constant="HAND" /></cursor>
-                                </Button>
-                            </children>
-                        </VBox>
+                            <!-- HEADER CARD (read-only) -->
+                            <VBox spacing="8">
+                                <children>
+                                    <Label text="Organisation Name" textFill="#444444">
+                                        <font><Font name="System Regular" size="13" /></font>
+                                    </Label>
+                                    <StackPane>
+                                        <children>
+                                            <Rectangle arcHeight="12" arcWidth="12" fill="#EEEEEE" height="60" width="780" />
+                                            <Label fx:id="charityNameLabel2" style="-fx-padding: 0 0 0 18;" text="REDD BARNA NORGE" textFill="#888888">
+                                                <font><Font name="System Regular" size="20" /></font>
+                                            </Label>
+                                        </children>
+                                    </StackPane>
+                                    <Label text="Organisation name can only be changed in Settings." textFill="#AAAAAA">
+                                        <font><Font size="11" /></font>
+                                    </Label>
+                                </children>
+                            </VBox>
 
-                    </children>
-                </VBox>
-            </content>
-        </ScrollPane>
+                            <VBox spacing="8">
+                                <children>
+                                    <Label text="Description" textFill="#444444">
+                                        <font><Font name="System Regular" size="13" /></font>
+                                    </Label>
+                                    <TextArea fx:id="descriptionField" prefHeight="180" promptText="Write a description of your organisation..." style="-fx-background-color: #FFFFFF;                                          -fx-border-color: #DDDDDD;                                          -fx-border-radius: 10;                                          -fx-background-radius: 10;                                          -fx-font-size: 14px;                                          -fx-padding: 10;" wrapText="true" />
+                                    <Button onAction="#handleSaveDescription" style="-fx-padding: 8 20 8 20;" text="Save Description">
+                                        <cursor><Cursor fx:constant="HAND" /></cursor>
+                                    </Button>
+                                </children>
+                            </VBox>
+
+                        </children>
+                    </VBox>
+                </content>
+            </ScrollPane>
+        </center>
+    </BorderPane>
       <rowConstraints>
          <RowConstraints />
+      <RowConstraints />
+      <RowConstraints />
       </rowConstraints>
-    </GridPane>
+</GridPane>