diff --git a/src/main/java/ChatClient.java b/src/main/java/ChatClient.java
index 7ff74a6..bbfc218 100644
--- a/src/main/java/ChatClient.java
+++ b/src/main/java/ChatClient.java
@@ -77,6 +77,10 @@ public class ChatClient extends JFrame implements KeyListener {
     private Timer timer;
     private JLabel timeLabel;
 
+    private JButton emojiButton;
+    private EmojiPicker emojiPicker;
+    
+    
     public ChatClient() {
         super("Chat");
         address = JOptionPane.showInputDialog("bitte IP-Adresse");
@@ -118,8 +122,13 @@ public class ChatClient extends JFrame implements KeyListener {
         inputTextField.setBorder(BorderFactory.createTitledBorder("Nachricht eingeben"));
         inputTextField.addKeyListener(this);
 
+        JPanel inputPanel = new JPanel(new BorderLayout());
+        inputPanel.add(inputTextField, BorderLayout.CENTER);
+        emojiPicker = new EmojiPicker(inputTextField);
+        
+        
         add(outputScrollPane, BorderLayout.CENTER);
-        add(inputTextField, BorderLayout.SOUTH);
+        add(inputTextField, BorderLayout.PAGE_END);
 
         setVisible(true);
         setSize(Constants.WINDOW_WIDTH, Constants.WINDOW_HEIGHT);