diff --git a/Katalogisivu.fxml b/Katalogisivu.fxml
index 7e3599d431f7930bcb799ec6fdd0e740604add2c..8d8d490c6982fb3b8ee19f5371df053e940a4146 100644
--- a/Katalogisivu.fxml
+++ b/Katalogisivu.fxml
@@ -1,396 +1,120 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollBar?>
 <?import javafx.scene.control.SplitPane?>
-<?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
 
-<SplitPane dividerPositions="0.5, 0.5" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="399.0" prefWidth="598.0" style="-fx-border-color: blue; -fx-border-width: 3;" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1">
-   <items>
-      <GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="401.0" prefWidth="500.0">
-         <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="96.33334350585938" minWidth="10.0" prefWidth="87.99997965494792" />
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="99.0" minWidth="10.0" prefWidth="500.0" />
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-         </columnConstraints>
-         <rowConstraints>
-            <RowConstraints />
-            <RowConstraints maxHeight="159.33334350585938" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="159.33334350585938" minHeight="0.0" prefHeight="15.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="310.66667652130127" minHeight="10.0" prefHeight="15.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="351.00000381469727" minHeight="0.0" prefHeight="15.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="351.00000381469727" minHeight="10.0" prefHeight="15.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="351.00000381469727" minHeight="10.0" prefHeight="15.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="351.00000381469727" minHeight="10.0" prefHeight="15.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="351.00000381469727" minHeight="10.0" prefHeight="15.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="351.00000381469727" minHeight="10.0" prefHeight="15.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="351.00000381469727" minHeight="10.0" prefHeight="15.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="351.00000381469727" minHeight="15.0" prefHeight="15.0" vgrow="SOMETIMES" />
-         </rowConstraints>
+<SplitPane dividerPositions="0.5" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" orientation="VERTICAL" prefHeight="458.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1">
+  <items>
+    <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="100.0" prefWidth="160.0">
          <children>
-            <Label text="Teos" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <Label text="Kirjailija" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <Label text="Vuosi" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <Label text="Sivumäärä" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <Label prefHeight="24.0" prefWidth="42.0" text="Kannet" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER" />
-            <Label text="Kunto" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <Label text="Hinta" GridPane.columnIndex="6" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <TextField editable="false" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.rowIndex="5">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.rowIndex="6">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="1" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="2" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" prefHeight="25.0" prefWidth="53.0" GridPane.columnIndex="3" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="4" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="5" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="6" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="8.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="1" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="2" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="3" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="4" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="5" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="6" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="8.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="1" GridPane.rowIndex="5">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="2" GridPane.rowIndex="5">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="1" GridPane.rowIndex="6">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="3" GridPane.rowIndex="5">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="4" GridPane.rowIndex="5">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="5" GridPane.rowIndex="5">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="6" GridPane.rowIndex="5">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="8.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="2" GridPane.rowIndex="6">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="3" GridPane.rowIndex="6">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="4" GridPane.rowIndex="6">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="5" GridPane.rowIndex="6">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="6" GridPane.rowIndex="6">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="8.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="1" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="2" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="3" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="4" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="5" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.rowIndex="8">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="1" GridPane.rowIndex="8">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="2" GridPane.rowIndex="8">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="3" GridPane.rowIndex="8">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="4" GridPane.rowIndex="8">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="5" GridPane.rowIndex="8">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="6" GridPane.rowIndex="8">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="8.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="6" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="8.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.rowIndex="9">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="1" GridPane.rowIndex="9">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="2" GridPane.rowIndex="9">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="3" GridPane.rowIndex="9">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="4" GridPane.rowIndex="9">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="5" GridPane.rowIndex="9">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="6" GridPane.rowIndex="9">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="8.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.rowIndex="10">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.rowIndex="11">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="1" GridPane.rowIndex="10">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="1" GridPane.rowIndex="11">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="2" GridPane.rowIndex="10">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="3" GridPane.rowIndex="10">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="4" GridPane.rowIndex="10">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="5" GridPane.rowIndex="10">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="2" GridPane.rowIndex="11">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="3" GridPane.rowIndex="11">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="4" GridPane.rowIndex="11">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="5" GridPane.rowIndex="11">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="3.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="6" GridPane.rowIndex="10">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="8.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField editable="false" GridPane.columnIndex="6" GridPane.rowIndex="11">
-               <GridPane.margin>
-                  <Insets bottom="1.0" left="3.0" right="8.0" top="1.0" />
-               </GridPane.margin>
-            </TextField>
-            <Button mnemonicParsing="false" text="Järjestä" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-            <Button mnemonicParsing="false" text="Järjestä" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-            <Button mnemonicParsing="false" text="Järjestä" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-            <Button mnemonicParsing="false" text="Järjestä" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-            <Button mnemonicParsing="false" text="Järjestä" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-            <Button mnemonicParsing="false" text="Järjestä" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-            <Button mnemonicParsing="false" text="Järjestä" GridPane.columnIndex="6" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-         </children>
-      </GridPane>
-      <ScrollBar orientation="VERTICAL" />
-      <VBox prefHeight="200.0" prefWidth="100.0">
-         <children>
-            <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="393.0" prefWidth="68.0">
-              <items>
-                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="100.0" prefWidth="160.0">
+            <Label layoutX="243.0" layoutY="2.0" text="Katalogi">
+               <font>
+                  <Font size="31.0" />
+               </font>
+            </Label>
+         </children></AnchorPane>
+      <SplitPane orientation="VERTICAL" prefHeight="383.0" prefWidth="598.0">
+         <items>
+            <SplitPane dividerPositions="0.5, 0.5" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="399.0" prefWidth="598.0" style="-fx-border-color: blue; -fx-border-width: 3;">
+               <items>
+                  <GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="401.0" prefWidth="500.0">
+                     <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="96.33334350585938" minWidth="10.0" prefWidth="87.99997965494792" />
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="99.0" minWidth="10.0" prefWidth="500.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                     </columnConstraints>
+                     <rowConstraints>
+                        <RowConstraints maxHeight="159.33334350585938" minHeight="0.0" prefHeight="11.000005086263023" vgrow="SOMETIMES" />
+                        <RowConstraints maxHeight="310.66667652130127" minHeight="10.0" prefHeight="15.0" vgrow="SOMETIMES" />
+                        <RowConstraints maxHeight="351.00000381469727" minHeight="0.0" prefHeight="15.0" vgrow="SOMETIMES" />
+                        <RowConstraints maxHeight="351.00000381469727" minHeight="10.0" prefHeight="15.0" vgrow="SOMETIMES" />
+                        <RowConstraints maxHeight="351.00000381469727" minHeight="10.0" prefHeight="15.0" vgrow="SOMETIMES" />
+                        <RowConstraints maxHeight="351.00000381469727" minHeight="10.0" prefHeight="15.0" vgrow="SOMETIMES" />
+                     </rowConstraints>
                      <children>
-                        <Button layoutX="7.0" layoutY="28.0" mnemonicParsing="false" prefHeight="44.0" prefWidth="52.0" text="Koti" />
-                        <Button layoutX="7.0" layoutY="107.0" mnemonicParsing="false" prefHeight="44.0" prefWidth="52.0" text="sulje" />
+                        <Label text="Teos" GridPane.halignment="CENTER" />
+                        <Label text="Kirjailija" GridPane.columnIndex="1" GridPane.halignment="CENTER" />
+                        <Label text="Vuosi" GridPane.columnIndex="2" GridPane.halignment="CENTER" />
+                        <Label text="Sivumäärä" GridPane.columnIndex="3" GridPane.halignment="CENTER" />
+                        <Label prefHeight="24.0" prefWidth="42.0" text="Kannet" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
+                        <Label text="Kunto" GridPane.columnIndex="5" GridPane.halignment="CENTER" />
+                        <Label text="Hinta" GridPane.columnIndex="6" GridPane.halignment="CENTER" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" wrappingWidth="57.47003364562988" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="6" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="6" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="6" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="6" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sampletext" textAlignment="CENTER" GridPane.columnIndex="6" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
                      </children>
-                  </AnchorPane>
-                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="192.0" prefWidth="78.0">
+                  </GridPane>
+                  <ScrollBar orientation="VERTICAL" />
+                  <VBox prefHeight="200.0" prefWidth="100.0">
                      <children>
-                        <Button layoutX="9.0" layoutY="54.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="Lisää" />
-                        <Button layoutX="9.0" layoutY="96.0" mnemonicParsing="false" text="Poista" />
-                        <Button layoutX="9.0" layoutY="140.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="Edit" />
+                        <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="393.0" prefWidth="68.0">
+                           <items>
+                              <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="100.0" prefWidth="160.0">
+                                 <children>
+                                    <Button layoutX="7.0" layoutY="28.0" mnemonicParsing="false" prefHeight="44.0" prefWidth="52.0" text="Koti" />
+                                    <Button layoutX="7.0" layoutY="107.0" mnemonicParsing="false" prefHeight="44.0" prefWidth="52.0" text="sulje" />
+                                 </children>
+                              </AnchorPane>
+                              <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="192.0" prefWidth="78.0">
+                                 <children>
+                                    <Button layoutX="9.0" layoutY="54.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="Lisää" />
+                                    <Button layoutX="9.0" layoutY="96.0" mnemonicParsing="false" text="Poista" />
+                                    <Button layoutX="9.0" layoutY="140.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="48.0" text="Edit" />
+                                 </children>
+                              </AnchorPane>
+                           </items>
+                        </SplitPane>
                      </children>
-                  </AnchorPane>
-              </items>
+                  </VBox>
+               </items>
             </SplitPane>
-         </children>
-      </VBox>
-   </items>
+         </items>
+      </SplitPane>
+  </items>
 </SplitPane>
diff --git "a/Kirjan lis\303\244ys.fxml" "b/Kirjan lis\303\244ys.fxml"
index d527b2af6e8d3b7b5c16e40e7edda879e3731569..7656b1eb158c0a43fb95502486e2eb206b31c56a 100644
--- "a/Kirjan lis\303\244ys.fxml"	
+++ "b/Kirjan lis\303\244ys.fxml"	
@@ -74,7 +74,6 @@
                   <Label prefHeight="17.0" prefWidth="33.0" text="Hinta" GridPane.halignment="CENTER" GridPane.rowIndex="6" GridPane.valignment="CENTER" />
                </children>
             </GridPane>
-            <Button layoutX="426.0" layoutY="16.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="23.0" style="-fx-background-color: red; -fx-border-color: black;" text="X" />
             <Label layoutX="96.0" layoutY="12.0" prefHeight="35.0" prefWidth="140.0" text="Fanttikvariaatti OY">
                <font>
                   <Font size="17.0" />
diff --git a/Laskutussivu.fxml b/Laskutussivu.fxml
index 2950fdf07e9a9aad279cc857472eb4820bbd8974..7da44fb9a9a6579f8154349c21ecfc6a62d79d08 100644
--- a/Laskutussivu.fxml
+++ b/Laskutussivu.fxml
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
 
-<ScrollPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="373.0" prefWidth="595.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1">
+<ScrollPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="373.0" prefWidth="636.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <content>
-      <GridPane alignment="CENTER_RIGHT" nodeOrientation="RIGHT_TO_LEFT" prefHeight="372.0" prefWidth="627.0">
+      <GridPane alignment="CENTER_RIGHT" nodeOrientation="RIGHT_TO_LEFT" prefHeight="372.0" prefWidth="627.0" style="-fx-border-color: blue; -fx-border-width: 2;">
         <columnConstraints>
           <ColumnConstraints hgrow="SOMETIMES" maxWidth="204.0" minWidth="10.0" prefWidth="90.66664632161458" />
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="106.66668701171875" minWidth="0.0" prefWidth="96.00002034505208" />
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="109.66666666666666" minWidth="10.0" prefWidth="109.66666666666666" />
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="108.00004069010419" minWidth="10.0" prefWidth="108.00004069010419" />
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="109.6666259765625" minWidth="10.0" prefWidth="103.33331298828125" />
+          <ColumnConstraints hgrow="SOMETIMES" maxWidth="106.66668701171875" minWidth="0.0" prefWidth="63.333312988281264" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="109.66666666666666" minWidth="10.0" prefWidth="69.33335367838544" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="119.33331298828125" minWidth="10.0" prefWidth="119.33331298828125" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="169.99998982747394" minWidth="10.0" prefWidth="164.66668701171875" />
             <ColumnConstraints hgrow="SOMETIMES" maxWidth="118.00002034505212" minWidth="10.0" prefWidth="118.00002034505212" />
         </columnConstraints>
         <rowConstraints>
             <RowConstraints maxHeight="50.0" minHeight="10.0" prefHeight="50.0" vgrow="SOMETIMES" />
           <RowConstraints maxHeight="50.0" minHeight="0.0" prefHeight="50.0" vgrow="SOMETIMES" />
-          <RowConstraints maxHeight="50.0" minHeight="0.0" prefHeight="50.0" vgrow="SOMETIMES" />
           <RowConstraints maxHeight="50.0" minHeight="0.0" prefHeight="50.0" vgrow="SOMETIMES" />
             <RowConstraints maxHeight="50.0" minHeight="0.0" prefHeight="50.0" vgrow="SOMETIMES" />
             <RowConstraints maxHeight="50.0" minHeight="0.0" prefHeight="50.0" vgrow="SOMETIMES" />
@@ -32,171 +31,40 @@
             <RowConstraints maxHeight="50.0" minHeight="0.0" prefHeight="50.0" vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
-            <Button mnemonicParsing="false" text="Järjestä" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-            <Button mnemonicParsing="false" text="Järjestä" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-            <Button mnemonicParsing="false" text="Järjestä" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-            <Button mnemonicParsing="false" text="Järjestä" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-            <Button mnemonicParsing="false" text="Järjestä" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-            <Label text="Nimi" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <Label text="Hinta" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <Label text="Maksttu" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <Label text="Eräpäivä" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <Label text="S-posti" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <TextField prefHeight="25.0" prefWidth="73.0" text="-" GridPane.columnIndex="4" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="-" GridPane.columnIndex="4" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="-" GridPane.columnIndex="4" GridPane.rowIndex="5">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="-" GridPane.columnIndex="4" GridPane.rowIndex="6">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="-" GridPane.columnIndex="4" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="-" GridPane.columnIndex="4" GridPane.rowIndex="8">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField promptText="23.03.25" GridPane.columnIndex="3" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField promptText="14.01.25" GridPane.columnIndex="3" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="31.12.24" GridPane.columnIndex="3" GridPane.rowIndex="5">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="10.03.25" GridPane.columnIndex="3" GridPane.rowIndex="6">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="12.10.25" GridPane.columnIndex="3" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="01.01.25" GridPane.columnIndex="3" GridPane.rowIndex="8">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField promptText="Kyllä" GridPane.columnIndex="2" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField promptText="Kyllä" GridPane.columnIndex="2" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="Kyllä" GridPane.columnIndex="2" GridPane.rowIndex="5">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="Ei" GridPane.columnIndex="2" GridPane.rowIndex="6">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="Ei" GridPane.columnIndex="2" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField style="-fx-border-color: red; -fx-border-width: 3;" text="Ei" GridPane.columnIndex="2" GridPane.rowIndex="8">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="21,50€" GridPane.columnIndex="1" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="13,50€" GridPane.columnIndex="1" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="5,20€" GridPane.columnIndex="1" GridPane.rowIndex="5">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="10,00€" GridPane.columnIndex="1" GridPane.rowIndex="6">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="5,99€" GridPane.columnIndex="1" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="12,10€" GridPane.columnIndex="1" GridPane.rowIndex="8">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="Aatu Ahonen" GridPane.rowIndex="3">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="Bertta Bolznikov" GridPane.rowIndex="4">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="Cecilia Carvos" GridPane.rowIndex="6">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="Doris Dermosil" GridPane.rowIndex="6">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="Fitzgerald Forbes" GridPane.rowIndex="7">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <TextField text="Gromit Goira" GridPane.rowIndex="8">
-               <GridPane.margin>
-                  <Insets left="6.0" right="4.0" />
-               </GridPane.margin>
-            </TextField>
-            <Button mnemonicParsing="false" prefHeight="33.0" prefWidth="109.0" text="Lisää" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
-            <Button mnemonicParsing="false" prefHeight="32.0" prefWidth="117.0" text="Palaa Etusivulle" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
-            <Button mnemonicParsing="false" prefHeight="35.0" prefWidth="112.0" text="Tuki" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
-            <Button mnemonicParsing="false" prefHeight="24.0" prefWidth="15.0" text="X" />
-            <Button mnemonicParsing="false" prefHeight="31.0" prefWidth="119.0" text="Poista Maksetut" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="6" />
+            <Label text="Nimi" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+            <Label text="Hinta" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+            <Label text="Maksttu" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+            <Label text="Eräpäivä" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+            <Label text="S-posti" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+            <Button mnemonicParsing="false" prefHeight="33.0" prefWidth="109.0" text="Lisää" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+            <Button mnemonicParsing="false" prefHeight="32.0" prefWidth="117.0" text="Palaa Etusivulle" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+            <Button mnemonicParsing="false" prefHeight="35.0" prefWidth="112.0" text="Tuki" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+            <Button mnemonicParsing="false" prefHeight="31.0" prefWidth="119.0" text="Poista Maksetut" GridPane.columnIndex="5" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="aatu.aapinen@jmail.com" textAlignment="CENTER" wrappingWidth="170.0000023841858" GridPane.columnIndex="4" GridPane.rowIndex="2" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="sample.text@maili.com" textAlignment="CENTER" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="sample.text@maili.com" textAlignment="CENTER" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="sample.text@maili.com" textAlignment="CENTER" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="01.01.1970" textAlignment="CENTER" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="01.01.1970" textAlignment="CENTER" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="01.01.1970" textAlignment="CENTER" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="01.01.1970" textAlignment="CENTER" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Kyllä" textAlignment="CENTER" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Ei" textAlignment="CENTER" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Kyllä" textAlignment="CENTER" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Ei" textAlignment="CENTER" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="10,05€" textAlignment="CENTER" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="10,05€" textAlignment="CENTER" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="10,05€" textAlignment="CENTER" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="10,05€" textAlignment="CENTER" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Dick Samplertext" textAlignment="CENTER" wrappingWidth="100.0" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Dick Samplertext" textAlignment="CENTER" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Dick Samplertext" textAlignment="CENTER" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Dick Samplertext" textAlignment="CENTER" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Laskutussivu" wrappingWidth="116.087890625" GridPane.columnIndex="3">
+               <font>
+                  <Font name="Arial" size="20.0" />
+               </font>
+            </Text>
          </children>
       </GridPane>
    </content>
diff --git a/Menuscreen.fxml b/Menuscreen.fxml
index 1a44c70ee6a8a108d6ced79e99458224523bf5c6..0d0a8b46f46ed286e79ced0181e5d4552cc02102 100644
--- a/Menuscreen.fxml
+++ b/Menuscreen.fxml
@@ -10,37 +10,42 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<SplitPane dividerPositions="0.29797979797979796" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1">
-  <items>
-    <AnchorPane minHeight="0.0" minWidth="0.0" opacity="0.78" prefHeight="160.0" prefWidth="100.0" style="-fx-background-color: green; -fx-border-color: blue; -fx-border-width: 2;">
-         <children>
-            <Button layoutX="33.0" layoutY="319.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="110.0" style="-fx-border-color: blue;" text="Lisää kirja" />
-            <Button layoutX="33.0" layoutY="233.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="110.0" style="-fx-border-color: blue; -fx-border-radius: 3;" text="Laskutus" />
-            <Button layoutX="33.0" layoutY="143.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="110.0" style="-fx-border-color: blue;" text="Tuki" />
-         </children>
-         <opaqueInsets>
-            <Insets />
-         </opaqueInsets></AnchorPane>
-    <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="397.0" prefWidth="419.0" style="-fx-background-color: green; -fx-border-width: 2; -fx-border-color: blue;">
-         <children>
-            <Button layoutX="14.0" layoutY="186.0" mnemonicParsing="false" text="Hae" />
-            <TextField layoutX="65.0" layoutY="186.0" />
-            <MenuButton layoutX="227.0" layoutY="186.0" mnemonicParsing="false" text="Valinta">
-              <items>
-                  <MenuItem mnemonicParsing="false" text="sivumäärä yli" />
-                  <MenuItem mnemonicParsing="false" text="sivumäärä alle" />
-                <MenuItem mnemonicParsing="false" text="Hinta" />
-                <MenuItem mnemonicParsing="false" text="Nimi - kirjailija" />
-                  <MenuItem mnemonicParsing="false" text="Nimi - teos" />
-              </items>
-            </MenuButton>
-            <Text layoutX="33.0" layoutY="268.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Tervetuloa kirjakauppa Fanttikvariaatti OY:n kirjakatalogiin.Ylhäältä voit etsiä haluamaasi kirjaa. Napauta ensin Valinta-painiketta,jonka avulla voit valita hakuperusteen.Kirjoita sen jälkeen hakusana ja paina hae- painiketta." wrappingWidth="318.8034019470215" />
-            <Button layoutX="378.0" layoutY="14.0" mnemonicParsing="false" style="-fx-background-color: red;" text="X" />
-            <Text layoutX="14.0" layoutY="37.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Fanttikvariaatti" wrappingWidth="218.13669967651367">
-               <font>
-                  <Font size="30.0" />
-               </font>
-            </Text>
-         </children></AnchorPane>
-  </items>
-</SplitPane>
+<AnchorPane xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <SplitPane dividerPositions="0.5" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0">
+        <items>
+          <AnchorPane minHeight="0.0" minWidth="0.0" opacity="0.78" prefHeight="160.0" prefWidth="100.0" style="-fx-background-color: green; -fx-border-color: blue; -fx-border-width: 2;">
+               <children>
+                  <Button layoutX="33.0" layoutY="319.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="110.0" style="-fx-border-color: blue;" text="Lisää kirja" />
+                  <Button layoutX="33.0" layoutY="233.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="110.0" style="-fx-border-color: blue; -fx-border-radius: 3;" text="Laskutus" />
+                  <Button layoutX="33.0" layoutY="143.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="110.0" style="-fx-border-color: blue;" text="Tuki" />
+               </children>
+               <opaqueInsets>
+                  <Insets />
+               </opaqueInsets>
+            </AnchorPane>
+          <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="397.0" prefWidth="419.0" style="-fx-background-color: green; -fx-border-width: 2; -fx-border-color: blue;">
+               <children>
+                  <Button id="hakupainike" layoutX="14.0" layoutY="186.0" mnemonicParsing="false" text="Hae" />
+                  <TextField layoutX="65.0" layoutY="186.0" />
+                  <MenuButton layoutX="227.0" layoutY="186.0" mnemonicParsing="false" text="Valinta">
+                    <items>
+                        <MenuItem mnemonicParsing="false" text="sivumäärä yli" />
+                        <MenuItem mnemonicParsing="false" text="sivumäärä alle" />
+                      <MenuItem mnemonicParsing="false" text="Hinta" />
+                      <MenuItem mnemonicParsing="false" text="Nimi - kirjailija" />
+                        <MenuItem mnemonicParsing="false" text="Nimi - teos" />
+                    </items>
+                  </MenuButton>
+                  <Text layoutX="33.0" layoutY="268.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Tervetuloa kirjakauppa Fanttikvariaatti OY:n kirjakatalogiin.Ylhäältä voit etsiä haluamaasi kirjaa. Napauta ensin Valinta-painiketta,jonka avulla voit valita hakuperusteen.Kirjoita sen jälkeen hakusana ja paina hae- painiketta." wrappingWidth="318.8034019470215" />
+                  <Text layoutX="14.0" layoutY="37.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Fanttikvariaatti" wrappingWidth="218.13669967651367">
+                     <font>
+                        <Font size="30.0" />
+                     </font>
+                  </Text>
+               </children>
+            </AnchorPane>
+        </items>
+      </SplitPane>
+   </children>
+</AnchorPane>