diff --git a/.gitignore b/.gitignore
index 4b87013..2b9324a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /.metadata/
+/isPrime/dist/
diff --git a/isPrime/build/classes/application/Sample.fxml b/isPrime/build/classes/application/Sample.fxml
index 9199793..88f5f88 100644
--- a/isPrime/build/classes/application/Sample.fxml
+++ b/isPrime/build/classes/application/Sample.fxml
@@ -50,7 +50,7 @@
                            <items>
                               <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="373.0" prefWidth="247.0">
                                  <children>
-                                    <GridPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+                                    <GridPane fx:id="buttonsGrid" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
                                        <columnConstraints>
                                           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                                           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -61,14 +61,14 @@
                                           <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                                        </rowConstraints>
                                        <children>
-                                          <Button id="calculateButton" fx:id="calculateButton" mnemonicParsing="false" onAction="#calculateBottunOnClick" prefHeight="25.0" prefWidth="184.0" text="Calculate" GridPane.rowIndex="2" />
-                                          <Button fx:id="resetButton" mnemonicParsing="false" onAction="#resetBottunOnClick" prefHeight="25.0" prefWidth="143.0" text="Reset" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                                          <Button id="pseudoButton" mnemonicParsing="false" onAction="#pseudoButtonOnClick" prefHeight="25.0" prefWidth="184.0" text="Euler Pseudoprimes" GridPane.rowIndex="1" />
-                                          <Button fx:id="strongButton" mnemonicParsing="false" onAction="#strongButtonOnClick" prefHeight="25.0" prefWidth="144.0" text="Strong pseudoprimes" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                                          <Button id="timeButton" mnemonicParsing="false" onAction="#timeButtonOnClick" prefHeight="30.0" prefWidth="300.0" text="Time comparisons" GridPane.columnSpan="2147483647" />
+                                          <Button id="calculateButton" fx:id="calculateButton" mnemonicParsing="false" onAction="#calculateBottunOnClick" maxWidth="1.7976931348623157E308" text="Calculate" GridPane.rowIndex="2" />
+                                          <Button fx:id="resetButton" maxWidth="1.7976931348623157E308" onAction="#resetBottunOnClick" text="Reset" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                                          <Button id="pseudoButton" mnemonicParsing="false" onAction="#pseudoButtonOnClick" maxWidth="1.7976931348623157E308" text="Euler Pseudoprimes" GridPane.rowIndex="1" />
+                                          <Button fx:id="strongButton" mnemonicParsing="false" onAction="#strongButtonOnClick" maxWidth="1.7976931348623157E308" text="Strong pseudoprimes" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                                          <Button id="timeButton" fx:id="timeCompButton" mnemonicParsing="false" onAction="#timeButtonOnClick" maxWidth="1.7976931348623157E308" text="Time comparisons" GridPane.columnSpan="2147483647" />
                                        </children>
                                     </GridPane>
-                                    <VBox layoutY="-15.0" prefHeight="306.0" prefWidth="290.0" AnchorPane.bottomAnchor="67.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="-2.0" AnchorPane.topAnchor="0.0">
+                                    <VBox layoutY="-15.0" prefHeight="306.0" prefWidth="290.0" AnchorPane.bottomAnchor="90.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="-2.0" AnchorPane.topAnchor="0.0">
                                        <children>
                                           <Label text="Is number prime">
                                              <font>
diff --git a/isPrime/dbase.db b/isPrime/dbase.db
index a6f6c2f..f10690a 100644
Binary files a/isPrime/dbase.db and b/isPrime/dbase.db differ
diff --git a/isPrime/nbproject/build-impl.xml b/isPrime/nbproject/build-impl.xml
index e61f1fa..f020b7b 100644
--- a/isPrime/nbproject/build-impl.xml
+++ b/isPrime/nbproject/build-impl.xml
@@ -119,43 +119,7 @@ is divided into following sections:
         <property name="module.name" value=""/>
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init">
-        <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
-        <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
-        <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
-        <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
-        <condition property="platform.javac" value="${platform.home}/bin/javac">
-            <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
-        </condition>
-        <property name="platform.javac" value="${platform.javac.tmp}"/>
-        <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
-        <condition property="platform.java" value="${platform.home}/bin/java">
-            <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
-        </condition>
-        <property name="platform.java" value="${platform.java.tmp}"/>
-        <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
-        <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
-            <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
-        </condition>
-        <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
-        <condition property="platform.invalid" value="true">
-            <or>
-                <contains string="${platform.javac}" substring="$${platforms."/>
-                <contains string="${platform.java}" substring="$${platforms."/>
-                <contains string="${platform.javadoc}" substring="$${platforms."/>
-            </or>
-        </condition>
-        <fail unless="platform.home">Must set platform.home</fail>
-        <fail unless="platform.bootcp">Must set platform.bootcp</fail>
-        <fail unless="platform.java">Must set platform.java</fail>
-        <fail unless="platform.javac">Must set platform.javac</fail>
-        <fail if="platform.invalid">
- The J2SE Platform is not correctly set up.
- Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. 
- Either open the project in the IDE and setup the Platform with the same name or add it manually.
- For example like this:
-     ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file)
-  or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used) 
-  </fail>
+        <property name="platform.java" value="${java.home}/bin/java"/>
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="splashscreen.available">
             <and>
@@ -278,6 +242,20 @@ is divided into following sections:
         <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
             <isset property="profile.available"/>
         </condition>
+        <condition else="false" property="jdkBug6558476">
+            <and>
+                <matches pattern="1\.[56]" string="${java.specification.version}"/>
+                <not>
+                    <os family="unix"/>
+                </not>
+            </and>
+        </condition>
+        <condition else="false" property="javac.fork">
+            <or>
+                <istrue value="${jdkBug6558476}"/>
+                <istrue value="${javac.external.vm}"/>
+            </or>
+        </condition>
         <property name="jar.index" value="false"/>
         <property name="jar.index.metainf" value="${jar.index}"/>
         <property name="copylibs.rebase" value="true"/>
@@ -365,7 +343,7 @@ is divided into following sections:
                         </path>
                     </resourcecount>
                 </condition>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>
@@ -416,7 +394,7 @@ is divided into following sections:
                 <property location="${build.dir}/empty" name="empty.dir"/>
                 <mkdir dir="${empty.dir}"/>
                 <mkdir dir="@{apgeneratedsrcdir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>
@@ -458,7 +436,7 @@ is divided into following sections:
             <sequential>
                 <property location="${build.dir}/empty" name="empty.dir"/>
                 <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>
@@ -537,7 +515,7 @@ is divided into following sections:
             <element name="customizePrototype" optional="true"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
@@ -565,7 +543,7 @@ is divided into following sections:
             <element name="customizePrototype" optional="true"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
@@ -641,7 +619,7 @@ is divided into following sections:
                     </fileset>
                 </union>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="isPrime" testname="TestNG tests" workingDir="${work.dir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="isPrime" testname="TestNG tests" workingDir="${work.dir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -872,9 +850,6 @@ is divided into following sections:
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
-                    <bootclasspath>
-                        <path path="${platform.bootcp}"/>
-                    </bootclasspath>
                 </nbjpdastart>
             </sequential>
         </macrodef>
@@ -924,7 +899,7 @@ is divided into following sections:
             <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}" module="@{modulename}">
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -958,7 +933,7 @@ is divided into following sections:
             <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -990,7 +965,7 @@ is divided into following sections:
             <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
@@ -1224,7 +1199,7 @@ is divided into following sections:
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
         <echo level="info">To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
+        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
     </target>
     <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
         <j2seproject1:jar manifest="${tmp.manifest.file}"/>
@@ -1326,8 +1301,8 @@ is divided into following sections:
                 <isset property="main.class.available"/>
             </and>
         </condition>
-        <property name="platform.jlink" value="${platform.home}/bin/jlink"/>
-        <property name="jlink.systemmodules.internal" value="${platform.home}/jmods"/>
+        <property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
+        <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
         <exec executable="${platform.jlink}">
             <arg value="--module-path"/>
             <arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
@@ -1520,19 +1495,16 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
-        <exec executable="${platform.java}" failonerror="false" outputproperty="platform.version.output">
-            <arg value="-version"/>
-        </exec>
         <condition else="" property="bug5101868workaround" value="*.java">
-            <matches multiline="true" pattern="1\.[56](\..*)?" string="${platform.version.output}"/>
+            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
         </condition>
         <condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
             <and>
                 <isset property="javadoc.html5"/>
-                <available file="${platform.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
+                <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
             </and>
         </condition>
-        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
diff --git a/isPrime/nbproject/genfiles.properties b/isPrime/nbproject/genfiles.properties
index cd434fe..b823557 100644
--- a/isPrime/nbproject/genfiles.properties
+++ b/isPrime/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=a2b01ef6
+build.xml.data.CRC32=294c6290
 build.xml.script.CRC32=a0aca9cf
-build.xml.stylesheet.CRC32=f85dc8f2@1.98.0.48
+build.xml.stylesheet.CRC32=f85dc8f2@1.99.0.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=a2b01ef6
-nbproject/build-impl.xml.script.CRC32=f4d3a3d7
-nbproject/build-impl.xml.stylesheet.CRC32=d549e5cc@1.98.0.48
+nbproject/build-impl.xml.data.CRC32=294c6290
+nbproject/build-impl.xml.script.CRC32=87103c59
+nbproject/build-impl.xml.stylesheet.CRC32=d549e5cc@1.99.0.48
diff --git a/isPrime/nbproject/private/private.properties b/isPrime/nbproject/private/private.properties
index e0a42b6..0611795 100644
--- a/isPrime/nbproject/private/private.properties
+++ b/isPrime/nbproject/private/private.properties
@@ -1,8 +1,9 @@
 compile.on.save=true
 do.depend=false
 do.jar=true
-do.jlink=true
+do.jlink=false
+file.reference.sqlite-jdbc-3.36.0.1.jar=C:\\Users\\franv\\Documents\\Faks-noDrive\\Java\\Projekt\\sqlite-jdbc-3.36.0.1.jar
 javac.debug=true
 javadoc.preview=true
 jlink.strip=false
-user.properties.file=/home/zialen/.netbeans/12.3/build.properties
+user.properties.file=C:\\Users\\franv\\AppData\\Roaming\\NetBeans\\12.4\\build.properties
diff --git a/isPrime/nbproject/project.properties b/isPrime/nbproject/project.properties
index bd16558..52d7484 100644
--- a/isPrime/nbproject/project.properties
+++ b/isPrime/nbproject/project.properties
@@ -105,7 +105,7 @@ manifest.custom.permissions=
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
-platform.active=JDK_16
+platform.active=default_platform
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
diff --git a/isPrime/nbproject/project.xml b/isPrime/nbproject/project.xml
index e8d8e3c..63f5529 100644
--- a/isPrime/nbproject/project.xml
+++ b/isPrime/nbproject/project.xml
@@ -4,7 +4,6 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>isPrime</name>
-            <explicit-platform explicit-source-supported="true"/>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>
diff --git a/isPrime/src/application/Sample.fxml b/isPrime/src/application/Sample.fxml
index 9199793..88f5f88 100644
--- a/isPrime/src/application/Sample.fxml
+++ b/isPrime/src/application/Sample.fxml
@@ -50,7 +50,7 @@
                            <items>
                               <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="373.0" prefWidth="247.0">
                                  <children>
-                                    <GridPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+                                    <GridPane fx:id="buttonsGrid" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
                                        <columnConstraints>
                                           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                                           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -61,14 +61,14 @@
                                           <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                                        </rowConstraints>
                                        <children>
-                                          <Button id="calculateButton" fx:id="calculateButton" mnemonicParsing="false" onAction="#calculateBottunOnClick" prefHeight="25.0" prefWidth="184.0" text="Calculate" GridPane.rowIndex="2" />
-                                          <Button fx:id="resetButton" mnemonicParsing="false" onAction="#resetBottunOnClick" prefHeight="25.0" prefWidth="143.0" text="Reset" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                                          <Button id="pseudoButton" mnemonicParsing="false" onAction="#pseudoButtonOnClick" prefHeight="25.0" prefWidth="184.0" text="Euler Pseudoprimes" GridPane.rowIndex="1" />
-                                          <Button fx:id="strongButton" mnemonicParsing="false" onAction="#strongButtonOnClick" prefHeight="25.0" prefWidth="144.0" text="Strong pseudoprimes" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                                          <Button id="timeButton" mnemonicParsing="false" onAction="#timeButtonOnClick" prefHeight="30.0" prefWidth="300.0" text="Time comparisons" GridPane.columnSpan="2147483647" />
+                                          <Button id="calculateButton" fx:id="calculateButton" mnemonicParsing="false" onAction="#calculateBottunOnClick" maxWidth="1.7976931348623157E308" text="Calculate" GridPane.rowIndex="2" />
+                                          <Button fx:id="resetButton" maxWidth="1.7976931348623157E308" onAction="#resetBottunOnClick" text="Reset" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                                          <Button id="pseudoButton" mnemonicParsing="false" onAction="#pseudoButtonOnClick" maxWidth="1.7976931348623157E308" text="Euler Pseudoprimes" GridPane.rowIndex="1" />
+                                          <Button fx:id="strongButton" mnemonicParsing="false" onAction="#strongButtonOnClick" maxWidth="1.7976931348623157E308" text="Strong pseudoprimes" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                                          <Button id="timeButton" fx:id="timeCompButton" mnemonicParsing="false" onAction="#timeButtonOnClick" maxWidth="1.7976931348623157E308" text="Time comparisons" GridPane.columnSpan="2147483647" />
                                        </children>
                                     </GridPane>
-                                    <VBox layoutY="-15.0" prefHeight="306.0" prefWidth="290.0" AnchorPane.bottomAnchor="67.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="-2.0" AnchorPane.topAnchor="0.0">
+                                    <VBox layoutY="-15.0" prefHeight="306.0" prefWidth="290.0" AnchorPane.bottomAnchor="90.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="-2.0" AnchorPane.topAnchor="0.0">
                                        <children>
                                           <Label text="Is number prime">
                                              <font>
diff --git a/isPrime/src/application/SampleController.java b/isPrime/src/application/SampleController.java
index b4e18a5..f76207a 100644
--- a/isPrime/src/application/SampleController.java
+++ b/isPrime/src/application/SampleController.java
@@ -13,17 +13,13 @@
 import Algorithms.StrongPseudo;
 import Algorithms.Wilson;
 import database.DataBase;
-import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
-import javafx.stage.Stage;
+import javafx.scene.layout.GridPane;
 
 /**
  * Controller for app.
@@ -32,8 +28,12 @@
  */
 public class SampleController {
     
+
     private static int processorNum = 1;
 
+    @FXML
+    private GridPane buttonsGrid;
+        
     @FXML // fx:id="calculateButton"
     private Button calculateButton; // Value injected by FXMLLoader
 
@@ -76,12 +76,16 @@ public class SampleController {
     @FXML
     private Button strongButton;
     
-    @FXML
-    private Button timeButton;
+
+    
+    
+    @FXML // fx:id="timeCompButton"
+    private Button timeCompButton; // Value injected by FXMLLoader
     
 	/////////////////////////////
     //		FUNCTIONS
     ////////////////////////////
+       
     
     /**
      * Controller for button click calculate.
diff --git a/isPrime/time.png b/isPrime/time.png
index c2e4f48..ccd21b1 100644
Binary files a/isPrime/time.png and b/isPrime/time.png differ