diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..4dd6a56
--- /dev/null
+++ b/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.ixab.Main
+
diff --git a/src/com/ixab/GUI/StreamChooserMenu.java b/src/com/ixab/GUI/StreamChooserMenu.java
index 4d92b70..2ecf729 100644
--- a/src/com/ixab/GUI/StreamChooserMenu.java
+++ b/src/com/ixab/GUI/StreamChooserMenu.java
@@ -1,5 +1,6 @@
 package com.ixab.GUI;
 
+import com.ixab.*;
 import com.ixab.ConfigHandling.Config;
 import com.ixab.ConfigHandling.ConfigFileIOHandler;
 import com.ixab.ConfigHandling.ConfigFileInstanceHandler;
@@ -9,6 +10,8 @@ import com.sun.xml.internal.ws.policy.privateutil.PolicyUtils;
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 
 public class StreamChooserMenu {
     private JPanel panel;
@@ -31,10 +34,7 @@ public class StreamChooserMenu {
         hinzufügenButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                ConfigFileInstanceHandler.getConfig().addStream(textField1.getText());
-                ConfigFileIOHandler.save(ConfigFileInstanceHandler.getConfig());
-                initComboBoxes();
-                textField1.setText("");
+                addNewStream();
             }
         });
         entfernenButton.addActionListener(new ActionListener() {
@@ -42,24 +42,52 @@ public class StreamChooserMenu {
             public void actionPerformed(ActionEvent e) {
                 ConfigFileInstanceHandler.getConfig().removeStream(comboBox1.getSelectedItem());
                 ConfigFileIOHandler.save(ConfigFileInstanceHandler.getConfig());
-                initComboBoxes();
+                initStreamsComboBox();
+            }
+        });
+        comboBox1.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                // TODO: implement twitch api and update stream info
+            }
+        });
+        textField1.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyPressed(KeyEvent e) {
+                super.keyPressed(e);
+                if (textField1.isFocusOwner() && e.getKeyCode() == 10) {
+                    addNewStream();
+                }
             }
         });
     }
-    public void initComboBoxes() {
+    private void addNewStream() {
+        ConfigFileInstanceHandler.getConfig().addStream(textField1.getText());
+        ConfigFileIOHandler.save(ConfigFileInstanceHandler.getConfig());
+        initStreamsComboBox();
+        textField1.setText("");
+    }
+    private void initComboBoxes() {
+        initQualityComboBox();
+        initStreamsComboBox();
+    }
+    private void initStreamsComboBox() {
         comboBox1.removeAllItems();
-        comboBox2.removeAllItems();
         for (String streamName :
                 ConfigFileInstanceHandler.getConfig().getStreams()) {
             comboBox1.addItem(streamName);
         }
+    }
+    private void initQualityComboBox() {
+        comboBox2.removeAllItems();
         comboBox2.addItem("best"); comboBox2.addItem("high"); comboBox2.addItem("medium"); comboBox2.addItem("low"); comboBox2.addItem("mobile");
     }
     public static void main(String[] args) {
-        JFrame frame = new JFrame("StreamChooserMenu");
+        JFrame frame = new JFrame("jLSLauncher v"+ com.ixab.Main.getVersion());
         frame.setContentPane(new StreamChooserMenu().panel);
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.pack();
+        frame.setLocationByPlatform(true);
         frame.setVisible(true);
     }
 }
diff --git a/src/com/ixab/Main.java b/src/com/ixab/Main.java
index 306c0f7..71702a1 100644
--- a/src/com/ixab/Main.java
+++ b/src/com/ixab/Main.java
@@ -5,9 +5,30 @@ import com.ixab.ConfigHandling.ConfigFileIOHandler;
 import com.ixab.ConfigHandling.ConfigFileInstanceHandler;
 import com.ixab.GUI.StreamChooserMenu;
 
+import javax.swing.*;
+
 public class Main {
+    private final static double version = 0.1;
     private static Config c = null;
     public static void main(String[] args) {
+        try {
+            // Set System L&F
+            UIManager.setLookAndFeel(
+                    UIManager.getSystemLookAndFeelClassName());
+        }
+        catch (UnsupportedLookAndFeelException e) {
+            // handle exception
+        }
+        catch (ClassNotFoundException e) {
+            // handle exception
+        }
+        catch (InstantiationException e) {
+            // handle exception
+        }
+        catch (IllegalAccessException e) {
+            // handle exception
+        }
+
         //ConfigLoadMenu.main(null);
         c = ConfigFileIOHandler.load();
         if (c == null) {
@@ -22,4 +43,8 @@ public class Main {
         c.setLSPath("e:\\downloads\\livestreamer-v1.11.1\\livestreamer.exe");
         ConfigFileIOHandler.save(c);
     }
+
+    public static double getVersion() {
+        return version;
+    }
 }