diff --git a/app/src/main/assets/fonts/FunnyKid.ttf b/app/src/main/assets/fonts/FunnyKid.ttf
new file mode 100644
index 0000000..754ee19
Binary files /dev/null and b/app/src/main/assets/fonts/FunnyKid.ttf differ
diff --git a/app/src/main/java/com/example/raffaele/testapp/MainActivity.java b/app/src/main/java/com/example/raffaele/testapp/MainActivity.java
index 0d0d6eb..2301d91 100644
--- a/app/src/main/java/com/example/raffaele/testapp/MainActivity.java
+++ b/app/src/main/java/com/example/raffaele/testapp/MainActivity.java
@@ -1,12 +1,15 @@
 package com.example.raffaele.testapp;
 
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.TextView;
 import android.widget.Toast;
 
 public class MainActivity extends ActionBarActivity {
@@ -14,11 +17,19 @@ public class MainActivity extends ActionBarActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
-
-
+        try {
+            ((TextView)findViewById(R.id.usernameLabel)).setTypeface(Typeface.createFromAsset(getAssets(), "fonts/FunnyKid.ttf"));
+            ((TextView)findViewById(R.id.passwordLabel)).setTypeface(Typeface.createFromAsset(getAssets(), "fonts/FunnyKid.ttf"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        // TODO Auto-generated method stub
+        super.onConfigurationChanged(newConfig);
+        setContentView(R.layout.activity_main); //al cambiamento della configurazione dello schermo refresha il layout
     }
-
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
diff --git a/app/src/main/java/com/example/raffaele/testapp/Score_page.java b/app/src/main/java/com/example/raffaele/testapp/Score_page.java
index 7f22591..aa4d91a 100644
--- a/app/src/main/java/com/example/raffaele/testapp/Score_page.java
+++ b/app/src/main/java/com/example/raffaele/testapp/Score_page.java
@@ -16,13 +16,15 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_score_page);
         Intent i = getIntent();
         Bundle extras=i.getExtras();
-        this.correct = extras.getParcelable("Correct");
-        this.wrong=extras.getParcelable("Wrong");
-        //imposto valori di nome,cognome e scuola in view
-        ((TextView)findViewById(R.id.CorrectC)).setText(correct.StringValue());
-        ((TextView)findViewById(R.id.WrongC)).setText(wrong.StringValue());
-        ((TextView) findViewById(R.id.AnsweredC)).setText(correct.StringValue());
-
+        if(this.correct!=null || this.correct!=null) {
+            //TODO: Qui si dovrebbe inserire il getscore totale se il campo passato non è null (ciru ce pienz tu :) )
+            this.correct = extras.getParcelable("Correct");
+            this.wrong = extras.getParcelable("Wrong");
+            //imposto valori di nome,cognome e scuola in view
+            ((TextView) findViewById(R.id.CorrectC)).setText(correct.StringValue());
+            ((TextView) findViewById(R.id.WrongC)).setText(wrong.StringValue());
+            ((TextView) findViewById(R.id.AnsweredC)).setText(correct.StringValue());
+        }
     }
 
 
diff --git a/app/src/main/java/com/example/raffaele/testapp/Welcome_student.java b/app/src/main/java/com/example/raffaele/testapp/Welcome_student.java
index 1478ee7..d6fac40 100644
--- a/app/src/main/java/com/example/raffaele/testapp/Welcome_student.java
+++ b/app/src/main/java/com/example/raffaele/testapp/Welcome_student.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
@@ -29,7 +30,12 @@ protected void onCreate(Bundle savedInstanceState) {
         ((TextView)findViewById(R.id.school)).setText(utente.getSchool());
         argumentList=null;
     }
-
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        // TODO Auto-generated method stub
+        super.onConfigurationChanged(newConfig);
+        setContentView(R.layout.activity_welcome_student); //al cambiamento della configurazione dello schermo refresha il layout
+    }
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
@@ -102,6 +108,9 @@ public void toArgument(View v) {
         startActivityForResult(i, 0);
 
     }
-
+    public void onScore(View v ) {
+        Intent i = new Intent(this, Score_page.class);
+        startActivity(i);
+    }
 
 }
diff --git a/app/src/main/res/drawable/ic_login.png b/app/src/main/res/drawable/ic_login.png
new file mode 100644
index 0000000..4c50163
Binary files /dev/null and b/app/src/main/res/drawable/ic_login.png differ
diff --git a/app/src/main/res/drawable/ic_questions.png b/app/src/main/res/drawable/ic_questions.png
new file mode 100644
index 0000000..e4f47c7
Binary files /dev/null and b/app/src/main/res/drawable/ic_questions.png differ
diff --git a/app/src/main/res/drawable/ic_score.png b/app/src/main/res/drawable/ic_score.png
new file mode 100644
index 0000000..ab9fcd0
Binary files /dev/null and b/app/src/main/res/drawable/ic_score.png differ
diff --git a/app/src/main/res/drawable/ic_signup.png b/app/src/main/res/drawable/ic_signup.png
new file mode 100644
index 0000000..bc9208e
Binary files /dev/null and b/app/src/main/res/drawable/ic_signup.png differ
diff --git a/app/src/main/res/drawable/ic_topic.png b/app/src/main/res/drawable/ic_topic.png
new file mode 100644
index 0000000..8302f24
Binary files /dev/null and b/app/src/main/res/drawable/ic_topic.png differ
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
new file mode 100644
index 0000000..2126df8
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -0,0 +1,111 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity"
+    android:id="@+id/MainActivity">
+
+    <TableLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:id="@+id/tableLayout2">
+
+        <TableRow
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:text="Username"
+                android:id="@+id/usernameLabel"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:textSize="40dp"
+                android:layout_column="0"
+                android:textColor="#ff1e00ff" />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/username"
+                android:layout_alignParentTop="true"
+                android:layout_alignLeft="@+id/password"
+                android:layout_alignStart="@+id/password"
+                android:layout_above="@+id/password"
+                android:layout_alignRight="@+id/password"
+                android:layout_alignEnd="@+id/password"
+                android:textSize="40dp"
+                android:text="root"
+                android:layout_column="1"
+                android:layout_marginLeft="73dip" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:text="Password"
+                android:id="@+id/passwordLabel"
+                android:textSize="40dp"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/RegisterButton"
+                android:layout_toStartOf="@+id/RegisterButton"
+                android:layout_column="0"
+                android:textColor="#ff1e00ff" />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:inputType="textPassword"
+                android:ems="10"
+                android:id="@+id/password"
+                android:textSize="40dp"
+                android:layout_below="@+id/usernameLabel"
+                android:layout_toRightOf="@+id/usernameLabel"
+                android:layout_marginLeft="73dp"
+                android:layout_marginStart="73dp"
+                android:text="rootroot"
+                android:layout_column="1" />
+
+        </TableRow>
+
+    </TableLayout>
+
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/tableLayout2">
+
+        <ImageButton
+            android:layout_width="180dip"
+            android:layout_height="60dip"
+            android:id="@+id/RegisterButton"
+            android:layout_alignTop="@+id/loginButton"
+            android:layout_toLeftOf="@+id/loginButton"
+            android:layout_toStartOf="@+id/loginButton"
+            android:onClick="Register"
+            android:background="@drawable/ic_signup" />
+
+        <ImageButton
+            android:layout_width="180dip"
+            android:layout_height="60dip"
+            android:id="@+id/loginButton"
+            android:onClick="onStartClick"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:background="@drawable/ic_login"
+            android:layout_alignParentStart="false" />
+    </RelativeLayout>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout-land/activity_welcome_student.xml b/app/src/main/res/layout-land/activity_welcome_student.xml
new file mode 100644
index 0000000..fafed4e
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_welcome_student.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:minHeight="350dp"
+    android:minWidth="350dp"
+    tools:context=".welcome_student">
+
+    <TableLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/imageView"
+        android:layout_toRightOf="@+id/imageView"
+        android:layout_toEndOf="@+id/imageView"
+        android:id="@+id/tableLayout">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="37dp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="first_name"
+            android:id="@+id/first_name"
+            android:layout_alignTop="@+id/imageView"
+            android:layout_toRightOf="@+id/imageView"
+            android:layout_toEndOf="@+id/imageView"
+            android:textSize="20dp"
+            android:minHeight="80dp"
+            android:layout_row="2"
+            android:layout_column="1" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="33dp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="last_name"
+            android:id="@+id/last_name"
+            android:layout_below="@+id/first_name"
+            android:layout_alignLeft="@+id/first_name"
+            android:layout_alignStart="@+id/first_name"
+            android:textSize="20dp"
+            android:minHeight="80dp"
+            android:layout_row="3"
+            android:layout_column="1" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="31dp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="school"
+            android:id="@+id/school"
+            android:layout_below="@+id/last_name"
+            android:layout_alignLeft="@+id/last_name"
+            android:layout_alignStart="@+id/last_name"
+            android:minHeight="80dp"
+            android:textSize="20dp"
+            android:layout_row="4"
+            android:layout_column="1" />
+    </TableLayout>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/imageView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="42dp"
+        android:layout_marginStart="42dp"
+        android:layout_marginTop="44dp"
+        android:src="@mipmap/ic_contact"
+        android:minHeight="100dp"
+        android:minWidth="100dp"
+        android:layout_row="1"
+        android:layout_column="0"
+        android:maxHeight="100dp"
+        android:maxWidth="100dp" />
+
+    <ImageButton
+        android:layout_width="200dip"
+        android:layout_height="60dip"
+        android:id="@+id/QuestionButton"
+        android:background="@drawable/ic_questions"
+        android:nestedScrollingEnabled="false"
+        android:onClick="toQuestion"
+        android:layout_marginRight="20dp"
+        android:layout_marginEnd="57dp"
+        android:layout_marginBottom="30dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true" />
+
+    <ImageButton
+        android:layout_width="150dip"
+        android:layout_height="60dip"
+        android:id="@+id/ScoreButton"
+        android:background="@drawable/ic_score"
+        android:onClick="onScore"
+        android:layout_alignTop="@+id/tableLayout"
+        android:layout_alignRight="@+id/QuestionButton"
+        android:layout_alignEnd="@+id/QuestionButton" />
+
+    <ImageButton
+        android:layout_width="200dip"
+        android:layout_height="60dip"
+        android:id="@+id/button2"
+        android:onClick="toArgument"
+        android:background="@drawable/ic_topic"
+        android:layout_alignBottom="@+id/QuestionButton"
+        android:layout_alignLeft="@+id/imageView"
+        android:layout_alignStart="@+id/imageView" />
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/activity_main.xml b/app/src/main/res/layout-port/activity_main.xml
new file mode 100644
index 0000000..03f64dd
--- /dev/null
+++ b/app/src/main/res/layout-port/activity_main.xml
@@ -0,0 +1,86 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity"
+    android:id="@+id/MainActivity">
+
+    <ImageButton
+        android:layout_width="160dip"
+        android:layout_height="60dip"
+        android:id="@+id/loginButton"
+        android:onClick="onStartClick"
+        android:background="@drawable/ic_login"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginBottom="20dip" />
+
+    <ImageButton
+        android:layout_width="160dip"
+        android:layout_height="60dip"
+        android:id="@+id/RegisterButton"
+        android:onClick="Register"
+        android:background="@drawable/ic_signup"
+        android:layout_below="@+id/linearLayout"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginBottom="20dip" />
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@+id/loginButton"
+        android:id="@+id/linearLayout">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="Username"
+            android:id="@+id/usernameLabel"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:textSize="60dp"
+            android:textColor="#ff1e00ff" />
+
+        <EditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/username"
+            android:textSize="60dp"
+            android:text="root"
+            android:layout_below="@+id/usernameLabel"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="Password"
+            android:id="@+id/passwordLabel"
+            android:textSize="60dp"
+            android:layout_below="@+id/password"
+            android:layout_alignRight="@+id/usernameLabel"
+            android:layout_alignEnd="@+id/usernameLabel"
+            android:textColor="#ff1e00ff" />
+
+        <EditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"
+            android:ems="10"
+            android:id="@+id/password"
+            android:textSize="60dp"
+            android:text="rootroot"
+            android:layout_above="@+id/loginButton"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_marginBottom="91dp" />
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_welcome_student.xml b/app/src/main/res/layout-port/activity_welcome_student.xml
similarity index 76%
rename from app/src/main/res/layout/activity_welcome_student.xml
rename to app/src/main/res/layout-port/activity_welcome_student.xml
index 822f679..3100b1b 100644
--- a/app/src/main/res/layout/activity_welcome_student.xml
+++ b/app/src/main/res/layout-port/activity_welcome_student.xml
@@ -12,7 +12,8 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/imageView"
         android:layout_toRightOf="@+id/imageView"
-        android:layout_toEndOf="@+id/imageView">
+        android:layout_toEndOf="@+id/imageView"
+        android:id="@+id/tableLayout">
 
         <TextView
             android:layout_width="wrap_content"
@@ -75,37 +76,35 @@
         android:maxHeight="100dp"
         android:maxWidth="100dp" />
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Questions"
-        android:id="@+id/button"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginRight="42dp"
-        android:layout_marginEnd="42dp"
-        android:layout_marginBottom="44dp"
-        android:textSize="25dp"
-        android:onClick="toQuestion"
+    <ImageButton
+        android:layout_width="200dip"
+        android:layout_height="60dip"
+        android:id="@+id/QuestionButton"
+        android:background="@drawable/ic_questions"
         android:nestedScrollingEnabled="false"
-        android:layout_row="19"
-        android:layout_column="2" />
+        android:onClick="toQuestion"
+        android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true" />
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Argument"
+    <ImageButton
+        android:layout_width="130dip"
+        android:layout_height="60dip"
+        android:id="@+id/ScoreButton"
+        android:background="@drawable/ic_score"
+        android:onClick="onScore"
+        android:layout_alignTop="@+id/tableLayout"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true" />
+
+    <ImageButton
+        android:layout_width="200dip"
+        android:layout_height="60dip"
         android:id="@+id/button2"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_marginLeft="42dp"
-        android:layout_marginEnd="42dp"
-        android:layout_marginBottom="44dp"
-        android:textSize="25dp"
         android:onClick="toArgument"
-        android:nestedScrollingEnabled="false"
-        android:layout_row="19"
-        android:layout_column="2" />
+        android:background="@drawable/ic_topic"
+        android:layout_marginBottom="145dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"/>
+
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-land/activity_main.xml b/app/src/main/res/layout-sw600dp-land/activity_main.xml
new file mode 100644
index 0000000..7c5cde1
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-land/activity_main.xml
@@ -0,0 +1,111 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity"
+    android:id="@+id/MainActivity">
+
+    <TableLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:id="@+id/tableLayout2">
+
+        <TableRow
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:text="Username"
+                android:id="@+id/usernameLabel"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:textSize="60dp"
+                android:layout_column="0"
+                android:textColor="#ff1e00ff" />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/username"
+                android:layout_alignParentTop="true"
+                android:layout_alignLeft="@+id/password"
+                android:layout_alignStart="@+id/password"
+                android:layout_above="@+id/password"
+                android:layout_alignRight="@+id/password"
+                android:layout_alignEnd="@+id/password"
+                android:textSize="60dp"
+                android:text="root"
+                android:layout_column="1"
+                android:layout_marginLeft="73dip" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:text="Password"
+                android:id="@+id/passwordLabel"
+                android:textSize="60dp"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/RegisterButton"
+                android:layout_toStartOf="@+id/RegisterButton"
+                android:layout_column="0"
+                android:textColor="#ff1e00ff" />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:inputType="textPassword"
+                android:ems="10"
+                android:id="@+id/password"
+                android:textSize="60dp"
+                android:layout_below="@+id/usernameLabel"
+                android:layout_toRightOf="@+id/usernameLabel"
+                android:layout_marginLeft="73dp"
+                android:layout_marginStart="73dp"
+                android:text="rootroot"
+                android:layout_column="1" />
+
+        </TableRow>
+
+    </TableLayout>
+
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/tableLayout2">
+
+        <ImageButton
+            android:layout_width="200dip"
+            android:layout_height="70dip"
+            android:id="@+id/RegisterButton"
+            android:layout_alignTop="@+id/loginButton"
+            android:layout_toLeftOf="@+id/loginButton"
+            android:layout_toStartOf="@+id/loginButton"
+            android:onClick="Register"
+            android:background="@drawable/ic_signup" />
+
+        <ImageButton
+            android:layout_width="200dip"
+            android:layout_height="70dip"
+            android:id="@+id/loginButton"
+            android:onClick="onStartClick"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:background="@drawable/ic_login"
+            android:layout_alignParentStart="false" />
+    </RelativeLayout>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout-sw600dp-land/activity_welcome_student.xml b/app/src/main/res/layout-sw600dp-land/activity_welcome_student.xml
new file mode 100644
index 0000000..645a193
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-land/activity_welcome_student.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:minHeight="350dp"
+    android:minWidth="350dp"
+    tools:context=".welcome_student">
+
+    <TableLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/imageView"
+        android:layout_toRightOf="@+id/imageView"
+        android:layout_toEndOf="@+id/imageView"
+        android:id="@+id/tableLayout">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="37dp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="first_name"
+            android:id="@+id/first_name"
+            android:layout_alignTop="@+id/imageView"
+            android:layout_toRightOf="@+id/imageView"
+            android:layout_toEndOf="@+id/imageView"
+            android:textSize="20dp"
+            android:minHeight="80dp"
+            android:layout_row="2"
+            android:layout_column="1" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="33dp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="last_name"
+            android:id="@+id/last_name"
+            android:layout_below="@+id/first_name"
+            android:layout_alignLeft="@+id/first_name"
+            android:layout_alignStart="@+id/first_name"
+            android:textSize="20dp"
+            android:minHeight="80dp"
+            android:layout_row="3"
+            android:layout_column="1" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="31dp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="school"
+            android:id="@+id/school"
+            android:layout_below="@+id/last_name"
+            android:layout_alignLeft="@+id/last_name"
+            android:layout_alignStart="@+id/last_name"
+            android:minHeight="80dp"
+            android:textSize="20dp"
+            android:layout_row="4"
+            android:layout_column="1" />
+    </TableLayout>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/imageView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="42dp"
+        android:layout_marginStart="42dp"
+        android:layout_marginTop="44dp"
+        android:src="@mipmap/ic_contact"
+        android:minHeight="100dp"
+        android:minWidth="100dp"
+        android:layout_row="1"
+        android:layout_column="0"
+        android:maxHeight="100dp"
+        android:maxWidth="100dp" />
+
+    <ImageButton
+        android:layout_width="400dip"
+        android:layout_height="120dip"
+        android:id="@+id/QuestionButton"
+        android:background="@drawable/ic_questions"
+        android:nestedScrollingEnabled="false"
+        android:onClick="toQuestion"
+        android:layout_marginRight="20dp"
+        android:layout_marginEnd="57dp"
+        android:layout_marginBottom="30dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true" />
+
+    <ImageButton
+        android:layout_width="300dip"
+        android:layout_height="120dip"
+        android:id="@+id/ScoreButton"
+        android:background="@drawable/ic_score"
+        android:onClick="onScore"
+        android:layout_alignTop="@+id/tableLayout"
+        android:layout_alignRight="@+id/QuestionButton"
+        android:layout_alignEnd="@+id/QuestionButton" />
+
+    <ImageButton
+        android:layout_width="400dip"
+        android:layout_height="120dip"
+        android:id="@+id/button2"
+        android:onClick="toArgument"
+        android:background="@drawable/ic_topic"
+        android:layout_alignTop="@+id/QuestionButton"
+        android:layout_alignLeft="@+id/imageView"/>
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-port/activity_main.xml b/app/src/main/res/layout-sw600dp-port/activity_main.xml
new file mode 100644
index 0000000..50c18e5
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-port/activity_main.xml
@@ -0,0 +1,86 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity"
+    android:id="@+id/MainActivity">
+
+    <ImageButton
+        android:layout_width="200dip"
+        android:layout_height="80dip"
+        android:id="@+id/loginButton"
+        android:onClick="onStartClick"
+        android:background="@drawable/ic_login"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginBottom="20dip" />
+
+    <ImageButton
+        android:layout_width="200dip"
+        android:layout_height="80dip"
+        android:id="@+id/RegisterButton"
+        android:onClick="Register"
+        android:background="@drawable/ic_signup"
+        android:layout_below="@+id/linearLayout"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginBottom="20dip" />
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@+id/loginButton"
+        android:id="@+id/linearLayout">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="Username"
+            android:id="@+id/usernameLabel"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:textSize="80dp"
+            android:textColor="#ff1e00ff" />
+
+        <EditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/username"
+            android:textSize="80dp"
+            android:text="root"
+            android:layout_below="@+id/usernameLabel"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="Password"
+            android:id="@+id/passwordLabel"
+            android:textSize="80dp"
+            android:layout_below="@+id/password"
+            android:layout_alignRight="@+id/usernameLabel"
+            android:layout_alignEnd="@+id/usernameLabel"
+            android:textColor="#ff1e00ff" />
+
+        <EditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"
+            android:ems="10"
+            android:id="@+id/password"
+            android:textSize="80dp"
+            android:text="rootroot"
+            android:layout_above="@+id/loginButton"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_marginBottom="91dp" />
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout-sw600dp-port/activity_welcome_student.xml b/app/src/main/res/layout-sw600dp-port/activity_welcome_student.xml
new file mode 100644
index 0000000..41fb402
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-port/activity_welcome_student.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:minHeight="350dp"
+    android:minWidth="350dp"
+    tools:context=".welcome_student">
+
+    <TableLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/imageView"
+        android:layout_toRightOf="@+id/imageView"
+        android:layout_toEndOf="@+id/imageView"
+        android:id="@+id/tableLayout">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="37dp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="first_name"
+            android:id="@+id/first_name"
+            android:layout_alignTop="@+id/imageView"
+            android:layout_toRightOf="@+id/imageView"
+            android:layout_toEndOf="@+id/imageView"
+            android:textSize="20dp"
+            android:minHeight="80dp"
+            android:layout_row="2"
+            android:layout_column="1" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="33dp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="last_name"
+            android:id="@+id/last_name"
+            android:layout_below="@+id/first_name"
+            android:layout_alignLeft="@+id/first_name"
+            android:layout_alignStart="@+id/first_name"
+            android:textSize="20dp"
+            android:minHeight="80dp"
+            android:layout_row="3"
+            android:layout_column="1" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="31dp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="school"
+            android:id="@+id/school"
+            android:layout_below="@+id/last_name"
+            android:layout_alignLeft="@+id/last_name"
+            android:layout_alignStart="@+id/last_name"
+            android:minHeight="80dp"
+            android:textSize="20dp"
+            android:layout_row="4"
+            android:layout_column="1" />
+    </TableLayout>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/imageView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="42dp"
+        android:layout_marginStart="42dp"
+        android:layout_marginTop="44dp"
+        android:src="@mipmap/ic_contact"
+        android:minHeight="100dp"
+        android:minWidth="100dp"
+        android:layout_row="1"
+        android:layout_column="0"
+        android:maxHeight="100dp"
+        android:maxWidth="100dp" />
+
+    <ImageButton
+        android:layout_width="400dip"
+        android:layout_height="120dip"
+        android:id="@+id/QuestionButton"
+        android:background="@drawable/ic_questions"
+        android:nestedScrollingEnabled="false"
+        android:onClick="toQuestion"
+        android:layout_marginTop="131dp"
+        android:layout_below="@+id/button2"
+        android:layout_alignLeft="@+id/button2"
+        android:layout_alignStart="@+id/button2" />
+
+    <ImageButton
+        android:layout_width="300dip"
+        android:layout_height="100dip"
+        android:id="@+id/ScoreButton"
+        android:background="@drawable/ic_score"
+        android:onClick="onScore"
+        android:layout_alignTop="@+id/tableLayout"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true" />
+
+    <ImageButton
+        android:layout_width="400dip"
+        android:layout_height="120dip"
+        android:id="@+id/button2"
+        android:onClick="toArgument"
+        android:background="@drawable/ic_topic"
+        android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true" />
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 8b30966..0000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity"
-    android:id="@+id/MainActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="Username"
-        android:id="@+id/usernameLabel"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:textSize="60dp" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="Password"
-        android:id="@+id/passwordLabel"
-        android:textSize="60dp"
-        android:layout_alignBottom="@+id/password"
-        android:layout_toLeftOf="@+id/password"
-        android:layout_toStartOf="@+id/password" />
-
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:inputType="textPassword"
-        android:ems="10"
-        android:id="@+id/password"
-        android:textSize="60dp"
-        android:layout_below="@+id/usernameLabel"
-        android:layout_toRightOf="@+id/usernameLabel"
-        android:layout_marginLeft="73dp"
-        android:layout_marginStart="73dp"
-        android:text="rootroot" />
-
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/username"
-        android:layout_alignParentTop="true"
-        android:layout_alignLeft="@+id/password"
-        android:layout_alignStart="@+id/password"
-        android:layout_above="@+id/password"
-        android:layout_alignRight="@+id/password"
-        android:layout_alignEnd="@+id/password"
-        android:textSize="60dp"
-        android:text="root" />
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Login"
-        android:id="@+id/loginButton"
-        android:onClick="onStartClick"
-        android:layout_below="@id/password"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:textSize="50dp" />
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Sign Up"
-        android:id="@+id/RegisterButton"
-        android:textSize="50sp"
-        android:layout_alignTop="@+id/loginButton"
-        android:layout_toLeftOf="@+id/loginButton"
-        android:layout_toStartOf="@+id/loginButton"
-        android:onClick="Register" />
-</RelativeLayout>