diff --git a/src/main/kotlin/org/bm00/data-accessor/ProgramWindow.kt b/src/main/kotlin/org/bm00/data-accessor/ProgramWindow.kt
index 9e7d88d..4e640ed 100644
--- a/src/main/kotlin/org/bm00/data-accessor/ProgramWindow.kt
+++ b/src/main/kotlin/org/bm00/data-accessor/ProgramWindow.kt
@@ -20,13 +20,29 @@ class ProgramWindow private constructor(parent: TApplication, flags: Int) :
         addLabel("Welcome to", CENTERED + 13, CENTERED - 4)
         addLabel("The ORG-NAME-WIP Secure Data Accessor", CENTERED, CENTERED - 3)
 
-
-        addButton("Exit...", CENTERED + 14, CENTERED + 10,
+        addButton("Exit...", CENTERED + 28, CENTERED,
             object : TAction() {
                 override fun DO() {
                     System.exit(0)
                 }
             }
         )
+
+        addButton("Options", CENTERED + 13, CENTERED,
+            object : TAction() {
+                override fun DO() {
+                    TODO()
+                }
+            }
+        )
+
+        //Keep in mind, whatever button/element is created last is always the one pre-selected on launch.
+        addButton("Login", CENTERED, CENTERED,
+            object : TAction() {
+                override fun DO() {
+                    TODO()
+                }
+            }
+        )
     }
 }