diff --git a/frontend/android/assets/glassy/skin/glassy-ui.json b/frontend/android/assets/glassy/skin/glassy-ui.json
index 2eaad5f5e125bf3f1261282a500a514a3676e4c4..b1bf9acde64b0b155ac2bca540391a23ee5f7174 100644
--- a/frontend/android/assets/glassy/skin/glassy-ui.json
+++ b/frontend/android/assets/glassy/skin/glassy-ui.json
@@ -93,6 +93,7 @@ com.badlogic.gdx.scenes.scene2d.ui.ImageTextButton$ImageTextButtonStyle: {
 com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
 	default: {
 		font: font
+		fontColor: black
 	}
 	big: {
 		font: font-big
diff --git a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
index 4a192f6465c3f8c12910fd8c69b33d5be1518305..4b09bf2cf61494f8ed193299c0567d5c2303e368 100644
--- a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
+++ b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
@@ -6,24 +6,29 @@ import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.Stage;
 import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.ui.Table;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.gameware.game.GameWare;
 
 public class CreateJoinTournamentState extends State {
 
     private Stage stage;
-    private Table table;
+    private Table outerTable;
+    private Table innerTable;
 
     private int spacingOnBottom = Gdx.graphics.getHeight()/15;
     private float fontScaleX = 3f;
     private float fontScaleY = 3f;
     private String backBtnText = "Back";
     private String enterBtnText = "Enter";
-
-
+    private String createBtnText = "Create new";
+    private String joinBtnText = "Join new";
+    private String tournamentText = "Tournament 1";
 
     public CreateJoinTournamentState(GameStateManager gsm) {
         super(gsm);
@@ -34,32 +39,100 @@ public class CreateJoinTournamentState extends State {
         skin.getFont("font").getData().setScale(fontScaleX,fontScaleY);
         cam.setToOrtho(false, Gdx.graphics.getWidth()/2, Gdx.graphics.getHeight()/2);
 
-        table = new Table();
-        table.setFillParent(true);
+        outerTable = new Table();
+        outerTable.setFillParent(true);
+        innerTable = new Table();
+        outerTable.setFillParent(true);
 
-        table.row();
+        outerTable.row();
+        innerTable.row();
 
-        TextButton backBtn = new TextButton(backBtnText, skin);
-        backBtn.addListener(new ClickListener() {
+        Label tournamentLabel = new Label(tournamentText,skin);
+
+        TextButton enterBtn = new TextButton(enterBtnText, skin);
+        enterBtn.addListener(new ClickListener() {
             @Override
             public void clicked(InputEvent e, float x, float y){
-                handleBackBtnClick();
+                handleEnterBtnClick();
+            }
+        });
+
+        TextButton enterBtn2 = new TextButton(enterBtnText, skin);
+        enterBtn2.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent e, float x, float y){
+                handleEnterBtnClick();
             }
         });
-        table.add(backBtn);
 
-        table.row();
+        TextButton enterBtn3 = new TextButton(enterBtnText, skin);
+        enterBtn3.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent e, float x, float y){
+                handleEnterBtnClick();
+            }
+        });
 
-        TextButton enterBtn = new TextButton(enterBtnText, skin);
-        enterBtn.addListener(new ClickListener() {
+        TextButton enterBtn4 = new TextButton(enterBtnText, skin);
+        enterBtn4.addListener(new ClickListener() {
             @Override
             public void clicked(InputEvent e, float x, float y){
                 handleEnterBtnClick();
             }
         });
-        table.add(enterBtn);
 
-        stage.addActor(table);
+        innerTable.add(tournamentLabel).size(Gdx.graphics.getWidth()/5);
+        innerTable.add(enterBtn);
+        innerTable.row();
+        innerTable.add(enterBtn2);
+        innerTable.row();
+        innerTable.add(enterBtn3);
+        innerTable.row();
+        innerTable.add(enterBtn4);
+        innerTable.row();
+
+
+
+        ScrollPane tournamentsPane = new ScrollPane(innerTable, skin);
+        outerTable.add(tournamentsPane).pad(10);
+
+        outerTable.row();
+
+        TextButton createBtn = new TextButton(createBtnText, skin);
+        createBtn.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent e, float x, float y){
+                handleCreateBtnClick();
+            }
+        });
+        outerTable.add(createBtn).pad(10);
+
+        TextButton joinBtn = new TextButton(joinBtnText, skin);
+        joinBtn.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent e, float x, float y){
+                handleJoinBtnClick();
+            }
+        });
+        outerTable.add(joinBtn).pad(10);
+
+        outerTable.row();
+
+        TextButton backBtn = new TextButton(backBtnText, skin);
+        backBtn.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent e, float x, float y){
+                handleBackBtnClick();
+            }
+        });
+        outerTable.add(backBtn).pad(10);
+
+        //outerTable.row();
+
+        Label tournamentLabel1 = new Label(tournamentText,skin);
+        outerTable.add(tournamentLabel1).size(10f);
+
+        stage.addActor(outerTable);
     }
 
     @Override
@@ -99,4 +172,9 @@ public class CreateJoinTournamentState extends State {
     private void handleEnterBtnClick(){
         gsm.set(new ViewTournamentState(gsm));
     }
+
+    private void handleCreateBtnClick(){};
+
+    private void handleJoinBtnClick(){};
+
 }