diff --git a/Limelight/Input/CommandManager.swift b/Limelight/Input/CommandManager.swift
index 5e76a43e..1e60ad4b 100644
--- a/Limelight/Input/CommandManager.swift
+++ b/Limelight/Input/CommandManager.swift
@@ -49,7 +49,7 @@ import UIKit
         "F2": 0x71
     ]
     
-    private weak var viewController: CommandManagerViewController?
+    public weak var viewController: CommandManagerViewController?
     
     private override init() {
         super.init()
@@ -81,7 +81,7 @@ import UIKit
     @objc public func addCommand(_ command: RemoteCommand) {
         commands.append(command)
         saveCommands()
-        viewController?.reloadTableView()
+        viewController?.reloadTableView() // don't know why but this reload has to be called from the CommandManager, doesn't work by calling it in the viewcontroller, probably related with the dialog box.
     }
     
     @objc public func deleteCommand(at index: Int) {
@@ -108,14 +108,4 @@ import UIKit
             UserDefaults.standard.set(data, forKey: "savedCommands")
         }
     }
-    
-    @objc public func setupViewController(_ viewController: CommandManagerViewController) {
-        self.viewController = viewController
-        //let addButton = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(promptForNewCommand))
-        //viewController.navigationItem.rightBarButtonItem = addButton
-        //viewController.navigationItem.title = "Manage Commands"
-        
-        //viewController.tableView.delegate = viewController
-        //viewController.tableView.dataSource = viewController
-    }
 }
diff --git a/Limelight/ViewControllers/CommandManagerViewController.swift b/Limelight/ViewControllers/CommandManagerViewController.swift
index 2723ea0b..e12eba11 100644
--- a/Limelight/ViewControllers/CommandManagerViewController.swift
+++ b/Limelight/ViewControllers/CommandManagerViewController.swift
@@ -36,8 +36,8 @@ import UIKit
         
         // Register the cell class
         tableView.register(UITableViewCell.self, forCellReuseIdentifier: "cell")
-        
-        CommandManager.shared.setupViewController(self)
+        //pass self to the CommandManager
+        CommandManager.shared.viewController = self
     }
     
     override public func viewDidLayoutSubviews() {
@@ -52,8 +52,8 @@ import UIKit
         view.layer.masksToBounds = true
         
         // Set up the title label
-        titleLabel.text = SwiftLocalizationHelper.localizedString(forKey: "Send Special Keys")
-        titleLabel.font = UIFont.boldSystemFont(ofSize: 24)  // Adjust font size as needed
+        titleLabel.text = SwiftLocalizationHelper.localizedString(forKey: "Send Commands")
+        titleLabel.font = UIFont.boldSystemFont(ofSize: 20)  // Adjust font size as needed
         titleLabel.textColor = UIColor.white  // Adjust color as needed
         titleLabel.textAlignment = .center
         view.addSubview(titleLabel)
@@ -105,14 +105,14 @@ import UIKit
             
             // Set the width and height of the view
             view.widthAnchor.constraint(equalTo: view.superview!.widthAnchor, multiplier: 0.7),
-            view.heightAnchor.constraint(equalTo: view.superview!.heightAnchor, multiplier: 0.75),
+            view.heightAnchor.constraint(equalTo: view.superview!.heightAnchor, multiplier: 0.9),
             
             // Center the view horizontally and vertically
             view.centerXAnchor.constraint(equalTo: view.superview!.centerXAnchor),
             view.centerYAnchor.constraint(equalTo: view.superview!.centerYAnchor),
             
             // ViewTitle constrains
-            titleLabel.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: 20),
+            titleLabel.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: 13.5),
             titleLabel.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 10),
             titleLabel.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -10),
             
@@ -120,7 +120,7 @@ import UIKit
             // TableView constraints
             tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 10),
             tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -10),
-            tableView.topAnchor.constraint(equalTo: view.topAnchor, constant: 70),
+            tableView.topAnchor.constraint(equalTo: view.topAnchor, constant: 50),
             tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: -60),
             
             // ExitButton constraints
@@ -161,7 +161,7 @@ import UIKit
             let alias = alert.textFields?[1].text ?? keyboardCmdString
             let newCommand = RemoteCommand(keyboardCmdString: keyboardCmdString, alias: alias)
             CommandManager.shared.addCommand(newCommand)
-            //self.reloadTableView()
+            //self.reloadTableView() // don't know why but this reload has to be called from the CommandManager, it doesn't work here.
         }
         
         let cancelAction = UIAlertAction(title: "Cancel", style: .cancel)