diff --git a/KvizServer/app/src/main/assets/defaultQuestions.txt b/KvizServer/app/src/main/assets/defaultQuestions.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e199d5dea66f721348784b7c939d0fa68f12cb82
--- /dev/null
+++ b/KvizServer/app/src/main/assets/defaultQuestions.txt
@@ -0,0 +1,3 @@
+Hogyan írjuk arab számmal a következő római számot: CXLVII?	147
+Mi az 10011 kettes számrendszerbeli szám tizes számrendszerbeli alakja?	19
+Melyik évben volt a mohácsi csata?	1526
diff --git a/KvizServer/app/src/main/assets/tippek.txt b/KvizServer/app/src/main/assets/tippek.txt
new file mode 100644
index 0000000000000000000000000000000000000000..683eedcad05281d60a7c7786404a8087f84ef59a
--- /dev/null
+++ b/KvizServer/app/src/main/assets/tippek.txt
@@ -0,0 +1,7 @@
+Melyik a legnagyobb egyjegyű prímszám?	7
+Hány éle van egy kockának?	12
+Hányadik kerületben van a BME?	11
+Hány kétjegyű szám van?	90
+Hány napos hónap április?	30
+Ha egy négyzet oldalát kétszeresére növeljük, hányszorosára nő a területe?	4
+Hányas számú metró közlekedik Kelenföld és a Keleti pályaudvar között?	4
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java b/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java
index e888b400e87158e047d4a1ba754fd71c68aa000e..71422ee9ac8586248e64603acc7436d46bd7f908 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java
@@ -39,11 +39,15 @@ public class GameActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_game);
         Bundle extras = getIntent().getExtras();
-        String questionFileName = extras.getString("QUESTION_FILE_NAME");
+        String questionFileName = extras.getString("QUESTION_FILE_NAME", null);
 
         BufferedReader buffreader;
         try {
-            buffreader = new BufferedReader(new InputStreamReader(new FileInputStream(new File(questionFileName))));
+            if (questionFileName == null) {
+                buffreader = new BufferedReader(new InputStreamReader(getAssets().open("defaultQuestions.txt")));
+            } else {
+                buffreader = new BufferedReader(new InputStreamReader(new FileInputStream(new File(questionFileName))));
+            }
             String line;
             while ((line = buffreader.readLine()) != null) {
                 String[] parts = line.split("\t");
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java b/KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java
index a5c596b6ca03ef2318fbda2ff53b19f2057a83d6..917da0749440b4ed9349d59ead130627de0e3c6a 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java
@@ -86,7 +86,7 @@ public class LobbyActivity extends AppCompatActivity {
                 HOSTNAME = "";
             } else {
                 HOSTNAME = extras.getString("STRING_HOSTNAME");
-                questionFileName = extras.getString("QUESTION_FILE_NAME");
+                questionFileName = extras.getString("QUESTION_FILE_NAME", null);
             }
         } else {
             HOSTNAME = (String) savedInstanceState.getSerializable("STRING_HOSTNAME");
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/MainActivity.java b/KvizServer/app/src/main/java/onlab/kvizserver/MainActivity.java
index 785c7e4b1a16468270b1b403e0f1e0faed123265..0ecd77eb6f643143c7b848bcb7ea7de19f7b0ff5 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/MainActivity.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/MainActivity.java
@@ -55,6 +55,8 @@ public class MainActivity extends AppCompatActivity implements FileDialog.OnFile
     public void onFileSelected(FileDialog dialog, File file) {
         try {
             fileCanonicalPath = file.getCanonicalPath();
+            TextView questionFileTextView = (TextView) findViewById(R.id.QuestionFileTextView);
+            questionFileTextView.setText(fileCanonicalPath);
             Log.d("MainActivity", fileCanonicalPath);
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/KvizServer/app/src/main/res/layout/activity_main.xml b/KvizServer/app/src/main/res/layout/activity_main.xml
index e215fa9cb2cccaf94449ef65b4ecb536e6788e2d..0e884b0007cb42dc2e133da56875c21af03fd627 100644
--- a/KvizServer/app/src/main/res/layout/activity_main.xml
+++ b/KvizServer/app/src/main/res/layout/activity_main.xml
@@ -10,7 +10,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Server name!"
+        android:text="Server name:"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -28,16 +28,37 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.231" />
 
-    <Button
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Choose question file"
-        android:id="@+id/ChooseQuestionFile"
+        android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.433" />
+        app:layout_constraintVertical_bias="0.453">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="Question file:" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text=""
+            android:id="@+id/QuestionFileTextView" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="Browse"
+            android:id="@+id/ChooseQuestionFile" />
+
+    </LinearLayout>
 
     <Button
         android:layout_width="wrap_content"