diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..afbdab3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
diff --git a/FzDestroyer.iml b/FzDestroyer.iml
new file mode 100644
index 0000000..2a02201
--- /dev/null
+++ b/FzDestroyer.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/app/src/main/java/destroyer/friendzone/com/fzdestroyer/Infos.java b/app/src/main/java/destroyer/friendzone/com/fzdestroyer/Infos.java
new file mode 100644
index 0000000..4336b85
--- /dev/null
+++ b/app/src/main/java/destroyer/friendzone/com/fzdestroyer/Infos.java
@@ -0,0 +1,42 @@
+package destroyer.friendzone.com.fzdestroyer;
+
+import android.app.Activity;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * Created by KZ.
+ */
+public class Infos extends Activity {
+
+    private ListView listaInfo ;
+    private String[] tutajinformacje;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_infos);
+
+        listaInfo = (ListView) findViewById(R.id.listaInfo);
+        initResources();
+
+    }
+
+    private void initResources() {
+        Resources res = getResources();
+        tutajinformacje = res.getStringArray(R.array.tutajinformacje);
+        initListaInfo();
+    }
+    private void initListaInfo() {
+        listaInfo.setBackgroundColor(Color.RED);
+        listaInfo.setAdapter(new ArrayAdapter<String>(getApplicationContext(), android.R.layout.simple_list_item_1, tutajinformacje));
+    }
+}
+
diff --git a/app/src/main/java/destroyer/friendzone/com/fzdestroyer/MenuActivity.java b/app/src/main/java/destroyer/friendzone/com/fzdestroyer/MenuActivity.java
index 7f3e1cb..a17b0c0 100644
--- a/app/src/main/java/destroyer/friendzone/com/fzdestroyer/MenuActivity.java
+++ b/app/src/main/java/destroyer/friendzone/com/fzdestroyer/MenuActivity.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageButton;
@@ -11,6 +12,8 @@ public class MenuActivity extends Activity
 {
     ImageButton przycisk_czatu;
     ImageButton przycisk_ustawien;
+    ImageButton przycisk_pomocy;
+    ImageButton przycisk_info;
     Intent intent;
     Activity aktywnosc = this;
 
@@ -21,12 +24,15 @@ protected void onCreate(Bundle savedInstanceState)
         setContentView(R.layout.activity_menu);
 
         przycisk_czatu = (ImageButton) findViewById(R.id.przycisk_czatu);
-        przycisk_czatu.setOnClickListener(new View.OnClickListener()
-        {
+        przycisk_czatu.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v)
-            {
+            public void onClick(View v) {
                 intent = new Intent(aktywnosc, Czat.class);
+                SharedPreferences settings = getSharedPreferences("PREF", 0);
+                if (settings.getString("profil", "").equals("882998035056017"))
+                    intent.putExtra("profil_odbiorcy", "900358920032103");
+                else
+                    intent.putExtra("profil_odbiorcy", "882998035056017");
                 startActivity(intent);
             }
         });
@@ -41,5 +47,25 @@ public void onClick(View v)
                 startActivity(intent);
             }
         });
+        przycisk_pomocy = (ImageButton) findViewById(R.id.przycisk_pomocy);
+        przycisk_pomocy.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v) {
+                intent = new Intent(aktywnosc, Pomoc.class);
+                startActivity(intent);
+            }
+        });
+
+        przycisk_info = (ImageButton) findViewById(R.id.przycisk_info);
+        przycisk_info.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v) {
+                intent = new Intent(aktywnosc, Infos.class);
+                startActivity(intent);
+            }
+        });
+
     }
 }
diff --git a/app/src/main/java/destroyer/friendzone/com/fzdestroyer/Pomoc.java b/app/src/main/java/destroyer/friendzone/com/fzdestroyer/Pomoc.java
new file mode 100644
index 0000000..7d7f128
--- /dev/null
+++ b/app/src/main/java/destroyer/friendzone/com/fzdestroyer/Pomoc.java
@@ -0,0 +1,37 @@
+package destroyer.friendzone.com.fzdestroyer;
+
+import android.app.Activity;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
+public class Pomoc extends Activity{
+
+    private ListView listaHelp ;
+    private String[] tutajpomusz;;
+
+
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_pomoc);
+
+
+            listaHelp = (ListView) findViewById(R.id.listHelp);
+            initResources1();
+
+        }
+
+    private void initResources1() {
+        Resources res = getResources();
+        tutajpomusz = res.getStringArray(R.array.tutajpomusz);
+        initListaHelp();
+    }
+    private void initListaHelp() {
+        listaHelp.setBackgroundColor(Color.RED);
+        listaHelp.setAdapter(new ArrayAdapter<String>(getApplicationContext(),android.R.layout.simple_list_item_1,tutajpomusz));
+    }
+
+}
+
diff --git a/app/src/main/res/AndroidManifest.xml b/app/src/main/res/AndroidManifest.xml
new file mode 100644
index 0000000..7d32f8e
--- /dev/null
+++ b/app/src/main/res/AndroidManifest.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="destroyer.friendzone.com.fzdestroyer" >
+
+    <!-- pozwól na polaczenie z internetem -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.facebook.FacebookActivity"
+            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+
+        <meta-data
+            android:name="com.facebook.sdk.ApplicationName"
+            android:value="@string/app_name" />
+        <meta-data
+            android:name="com.facebook.sdk.ApplicationId"
+            android:value="@string/app_id" />
+
+        <activity
+            android:name=".Czat"
+            android:label="@string/title_activity_czat" >
+        </activity>
+
+        <provider
+            android:name="com.facebook.FacebookContentProvider"
+            android:authorities="com.facebook.app.FacebookContentProvider1426928514282008"
+            android:exported="true" />
+
+        <activity
+            android:name=".MenuActivity"
+            android:label="@string/title_activity_menu" >
+        </activity>
+        <activity
+            android:name=".Ustawienia"
+            android:label="@string/title_activity_ustawienia" >
+        </activity>
+        <activity
+            android:name="Infos"
+            android:label="Informacje"
+            android:theme="@android:style/Theme.Black">
+        </activity>
+        <activity
+            android:name="Pomoc"
+            android:label="Pomoc"
+            android:theme="@android:style/Theme.Black">
+        </activity>
+
+
+    </application>
+
+</manifest>
diff --git a/app/src/main/res/drawable/czat.png b/app/src/main/res/drawable/czat.png
new file mode 100644
index 0000000..0a9789f
Binary files /dev/null and b/app/src/main/res/drawable/czat.png differ
diff --git a/app/src/main/res/drawable/gradient0.png b/app/src/main/res/drawable/gradient0.png
new file mode 100644
index 0000000..b1950d8
Binary files /dev/null and b/app/src/main/res/drawable/gradient0.png differ
diff --git a/app/src/main/res/drawable/gradient1.png b/app/src/main/res/drawable/gradient1.png
new file mode 100644
index 0000000..34af6ac
Binary files /dev/null and b/app/src/main/res/drawable/gradient1.png differ
diff --git a/app/src/main/res/drawable/gradient10.png b/app/src/main/res/drawable/gradient10.png
new file mode 100644
index 0000000..faa5dbd
Binary files /dev/null and b/app/src/main/res/drawable/gradient10.png differ
diff --git a/app/src/main/res/drawable/gradient11.png b/app/src/main/res/drawable/gradient11.png
new file mode 100644
index 0000000..36f4d7a
Binary files /dev/null and b/app/src/main/res/drawable/gradient11.png differ
diff --git a/app/src/main/res/drawable/gradient12.png b/app/src/main/res/drawable/gradient12.png
new file mode 100644
index 0000000..c01917b
Binary files /dev/null and b/app/src/main/res/drawable/gradient12.png differ
diff --git a/app/src/main/res/drawable/gradient13.png b/app/src/main/res/drawable/gradient13.png
new file mode 100644
index 0000000..7cac540
Binary files /dev/null and b/app/src/main/res/drawable/gradient13.png differ
diff --git a/app/src/main/res/drawable/gradient14.png b/app/src/main/res/drawable/gradient14.png
new file mode 100644
index 0000000..036aa9e
Binary files /dev/null and b/app/src/main/res/drawable/gradient14.png differ
diff --git a/app/src/main/res/drawable/gradient15.png b/app/src/main/res/drawable/gradient15.png
new file mode 100644
index 0000000..ede64b6
Binary files /dev/null and b/app/src/main/res/drawable/gradient15.png differ
diff --git a/app/src/main/res/drawable/gradient2.png b/app/src/main/res/drawable/gradient2.png
new file mode 100644
index 0000000..769a4f8
Binary files /dev/null and b/app/src/main/res/drawable/gradient2.png differ
diff --git a/app/src/main/res/drawable/gradient3.png b/app/src/main/res/drawable/gradient3.png
new file mode 100644
index 0000000..003f491
Binary files /dev/null and b/app/src/main/res/drawable/gradient3.png differ
diff --git a/app/src/main/res/drawable/gradient4.png b/app/src/main/res/drawable/gradient4.png
new file mode 100644
index 0000000..cf2eb2a
Binary files /dev/null and b/app/src/main/res/drawable/gradient4.png differ
diff --git a/app/src/main/res/drawable/gradient5.png b/app/src/main/res/drawable/gradient5.png
new file mode 100644
index 0000000..6043241
Binary files /dev/null and b/app/src/main/res/drawable/gradient5.png differ
diff --git a/app/src/main/res/drawable/gradient6.png b/app/src/main/res/drawable/gradient6.png
new file mode 100644
index 0000000..fba791a
Binary files /dev/null and b/app/src/main/res/drawable/gradient6.png differ
diff --git a/app/src/main/res/drawable/gradient7.png b/app/src/main/res/drawable/gradient7.png
new file mode 100644
index 0000000..48b0981
Binary files /dev/null and b/app/src/main/res/drawable/gradient7.png differ
diff --git a/app/src/main/res/drawable/gradient8.png b/app/src/main/res/drawable/gradient8.png
new file mode 100644
index 0000000..622fd29
Binary files /dev/null and b/app/src/main/res/drawable/gradient8.png differ
diff --git a/app/src/main/res/drawable/gradient9.png b/app/src/main/res/drawable/gradient9.png
new file mode 100644
index 0000000..2aa8cdc
Binary files /dev/null and b/app/src/main/res/drawable/gradient9.png differ
diff --git a/app/src/main/res/drawable/help.png b/app/src/main/res/drawable/help.png
new file mode 100644
index 0000000..60b48ff
Binary files /dev/null and b/app/src/main/res/drawable/help.png differ
diff --git a/app/src/main/res/drawable/info.png b/app/src/main/res/drawable/info.png
new file mode 100644
index 0000000..8f57ea2
Binary files /dev/null and b/app/src/main/res/drawable/info.png differ
diff --git a/app/src/main/res/drawable/nie.png b/app/src/main/res/drawable/nie.png
new file mode 100644
index 0000000..9daf813
Binary files /dev/null and b/app/src/main/res/drawable/nie.png differ
diff --git a/app/src/main/res/drawable/tak.png b/app/src/main/res/drawable/tak.png
new file mode 100644
index 0000000..aec1907
Binary files /dev/null and b/app/src/main/res/drawable/tak.png differ
diff --git a/app/src/main/res/drawable/ustawienia_aplikacji.png b/app/src/main/res/drawable/ustawienia_aplikacji.png
new file mode 100644
index 0000000..6b4c73e
Binary files /dev/null and b/app/src/main/res/drawable/ustawienia_aplikacji.png differ
diff --git a/app/src/main/res/drawable/wyslij.png b/app/src/main/res/drawable/wyslij.png
new file mode 100644
index 0000000..860ef8b
Binary files /dev/null and b/app/src/main/res/drawable/wyslij.png differ
diff --git a/app/src/main/res/layout/activity_infos.xml b/app/src/main/res/layout/activity_infos.xml
new file mode 100644
index 0000000..3cfce98
--- /dev/null
+++ b/app/src/main/res/layout/activity_infos.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:padding="15dp"
+    android:background="@drawable/gradient5"
+    android:textColor="#00FFFF">
+
+
+
+    <ListView
+
+        android:id="@+id/listaInfo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fastScrollEnabled="true"
+        android:fastScrollAlwaysVisible="true"
+        android:focusable="true"
+        android:visibility="visible"
+        android:theme="@style/AppTheme"
+        android:textFilterEnabled="false"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:textColor="#000000">
+
+
+    </ListView>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_pomoc.xml b/app/src/main/res/layout/activity_pomoc.xml
new file mode 100644
index 0000000..57a9e8a
--- /dev/null
+++ b/app/src/main/res/layout/activity_pomoc.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/gradient5">
+
+    <ListView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fastScrollEnabled="true"
+        android:fastScrollAlwaysVisible="true"
+        android:id="@+id/listHelp"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:visibility="visible" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_ustawienia.xml b/app/src/main/res/layout/activity_ustawienia.xml
index 5ba2c13..a951d66 100644
--- a/app/src/main/res/layout/activity_ustawienia.xml
+++ b/app/src/main/res/layout/activity_ustawienia.xml
@@ -17,12 +17,14 @@
         android:id="@+id/opis_tekst" />
 
     <EditText
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:background="@drawable/ovalborder"
         android:inputType="textAutoComplete|textAutoCorrect"
-        android:layout_toRightOf="@+id/opis_tekst"
-        android:layout_toEndOf="@+id/opis_tekst"
-        android:id="@+id/pole_opisu" />
+        android:id="@+id/pole_opisu"
+        android:layout_below="@+id/opis_tekst"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
 
     <!-- wybor orientacji seksualnej -->
     <TextView
@@ -30,14 +32,16 @@
         android:layout_height="wrap_content"
         android:text="@string/orientacja"
         android:id="@+id/orientacja_tekst"
-        android:layout_below="@+id/opis_tekst" />
+        android:layout_below="@+id/pole_opisu"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
     <Spinner
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/wybor_orientacji"
-        android:layout_below="@+id/pole_opisu"
-        android:layout_toRightOf="@+id/orientacja_tekst"
-        android:layout_toEndOf="@+id/orientacja_tekst" />
+        android:layout_below="@+id/orientacja_tekst"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
 
     <!-- wybor daty urodzenia jesli jej nie podano -->
     <TextView
@@ -74,38 +78,42 @@
         android:id="@+id/zasieg_tekst"
         android:text="@string/zasieg" />
     <EditText
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/wybor_dnia"
-        android:layout_toRightOf="@+id/zasieg_tekst"
-        android:layout_toEndOf="@+id/zasieg_tekst"
+        android:background="@drawable/ovalborder"
         android:inputType="numberDecimal"
-        android:id="@+id/pole_zasiegu" />
+        android:id="@+id/pole_zasiegu"
+        android:layout_below="@+id/zasieg_tekst"
+        android:layout_alignRight="@+id/wybor_miesiaca"
+        android:layout_alignEnd="@+id/wybor_miesiaca" />
 
     <!-- pole na miejscowosc uzytkownika programu -->
     <TextView
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/zasieg_tekst"
         android:id="@+id/miejscowosc_tekst"
-        android:text="@string/miejscowosc" />
+        android:text="@string/miejscowosc"
+        android:layout_below="@+id/pole_zasiegu"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
     <EditText
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/zasieg_tekst"
-        android:layout_toRightOf="@+id/miejscowosc_tekst"
-        android:layout_toEndOf="@+id/miejscowosc_tekst"
+        android:background="@drawable/ovalborder"
         android:id="@+id/miejscowosc_pole"
-        android:inputType="textAutoCorrect|textAutoComplete" />
+        android:inputType="textAutoCorrect|textAutoComplete"
+        android:layout_below="@+id/miejscowosc_tekst"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
 
     <!-- przycisk do zatwierdzenia zmian odpowiednich pol profilu -->
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/miejscowosc_tekst"
-        android:layout_toRightOf="@+id/miejscowosc_tekst"
-        android:layout_toEndOf="@+id/miejscowosc_tekst"
         android:text="@string/zapisz_zmiany"
         android:id="@+id/zapisz_zmiany"
-        android:onClick="zaaktualizujDane"/>
+        android:onClick="zaaktualizujDane"
+        android:layout_below="@+id/miejscowosc_pole"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="37dp" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_okno_czatu.xml b/app/src/main/res/layout/fragment_okno_czatu.xml
index ffefcd3..2a974c9 100644
--- a/app/src/main/res/layout/fragment_okno_czatu.xml
+++ b/app/src/main/res/layout/fragment_okno_czatu.xml
@@ -2,31 +2,14 @@
              xmlns:tools="http://schemas.android.com/tools"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
-             tools:context="destroyer.friendzone.com.fzdestroyer.OknoCzatu"
-             android:background="@drawable/gradient0">
-
-    <!-- obszar rozmowy (czatu) -->
-    <ListView
-        android:fastScrollEnabled="true"
-        android:fastScrollAlwaysVisible="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/rozmowa"
-        android:focusable="false"
-        android:layout_alignParentTop="true"
-        android:layout_toRightOf="@+id/obrazek_akceptacji"
-        android:layout_toEndOf="@+id/obrazek_akceptacji"
-        android:layout_toLeftOf="@+id/obrazek_odrzucenia"
-        android:layout_toStartOf="@+id/obrazek_odrzucenia">
-    </ListView>
+             tools:context="destroyer.friendzone.com.fzdestroyer.OknoCzatu">
 
     <!-- przycisk akceptacji znajomosci -->
     <ImageButton
         android:layout_width="50sp"
         android:layout_height="50sp"
         android:id="@+id/obrazek_akceptacji"
-        android:background="@drawable/tak"
-        android:layout_marginTop="130sp"/>
+        android:background="@drawable/tak"/>
 
     <!-- przycisk odrzucenia znajomosci -->
     <ImageButton
@@ -34,15 +17,16 @@
         android:layout_height="50sp"
         android:id="@+id/obrazek_odrzucenia"
         android:background="@drawable/nie"
+        android:layout_above="@+id/nowa_wiadomosc"
         android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="130sp"/>
+        android:layout_alignParentEnd="true" />
 
     <!-- tekst do wpisania nowej wiadomosci -->
     <EditText
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/rozmowa"
+        android:background="@drawable/ovalborder"
+        android:layout_below="@+id/obrazek_akceptacji"
         android:inputType="text"
         android:id="@+id/nowa_wiadomosc" />
 
@@ -52,9 +36,23 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/przycisk_wyslania_wiadomosci"
-        android:layout_below="@+id/rozmowa"
-        android:layout_toRightOf="@+id/nowa_wiadomosc"
-        android:layout_toEndOf="@+id/nowa_wiadomosc"
-        android:background="@drawable/wyslij" />
+        android:background="@drawable/wyslij"
+        android:layout_below="@+id/nowa_wiadomosc"
+        android:layout_centerHorizontal="true" />
+
+    <!-- obszar rozmowy (czatu) -->
+    <ListView
+        android:fastScrollEnabled="true"
+        android:fastScrollAlwaysVisible="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/rozmowa"
+        android:focusable="false"
+        android:scrollingCache="false"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/przycisk_wyslania_wiadomosci">
+    </ListView>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/wiadomosc_czatu.xml b/app/src/main/res/layout/wiadomosc_czatu.xml
index cce4f25..5b25ac6 100644
--- a/app/src/main/res/layout/wiadomosc_czatu.xml
+++ b/app/src/main/res/layout/wiadomosc_czatu.xml
@@ -8,29 +8,29 @@
         android:layout_width="50sp"
         android:layout_height="50sp"
         android:id="@+id/zdjecie_rozmowcy"
-        android:visibility="invisible" />
+        android:visibility="visible" />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/wiadomosc_rozmowcy"
         android:layout_toEndOf="@+id/zdjecie_rozmowcy"
         android:layout_toRightOf="@+id/zdjecie_rozmowcy"
-        android:visibility="invisible" />
+        android:visibility="visible" />
 
     <!-- zdjecie i nasza wiadomosc wyrownane do prawej strony -->
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="50sp"
+        android:layout_height="50sp"
         android:id="@+id/nasze_zdjecie"
         android:layout_toLeftOf="@+id/nasza_wiadomosc"
         android:layout_toStartOf="@+id/nasza_wiadomosc"
-        android:visibility="invisible" />
+        android:visibility="visible" />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/nasza_wiadomosc"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:visibility="invisible" />
+        android:visibility="visible" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/menu/menu_infos.xml b/app/src/main/res/menu/menu_infos.xml
new file mode 100644
index 0000000..6e3aeec
--- /dev/null
+++ b/app/src/main/res/menu/menu_infos.xml
@@ -0,0 +1,7 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="destroyer.friendzone.com.fzdestroyer.InfosActivity">
+    <item android:id="@+id/action_settings" android:title="@string/action_settings"
+        android:orderInCategory="100" app:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 35475aa..522625c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,4 +30,26 @@
     <string name="zasieg">Zasięg:</string>
     <string name="tak">Tak</string>
     <string name="nie">Nie</string>
+    <string name="title_activity_infos">InfosActivity</string>
+    <string-array name="tutajinformacje">
+        <item>Aplikacja do chatowania</item>
+        <item>Wersja 0.0.0.1</item>
+        <item>Zapełnianie</item>
+        <item>Listy</item>
+        <item>w</item>
+        <item>celach</item>
+        <item>chyba</item>
+        <item>testowych</item>
+        <item>ale</item>
+        <item>to</item>
+        <item>bez</item>
+        <item>sensu</item>
+        <item>.</item>
+    </string-array>
+    <string-array name="tutajpomusz">
+        <item>Pomocy nie ma</item>
+        <item>Bo i po co</item>
+        <item>Hahahhahahahah</item>
+        <item>Umrzyj!</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/wygladlisty.xml b/app/src/main/res/values/wygladlisty.xml
new file mode 100644
index 0000000..75349b3
--- /dev/null
+++ b/app/src/main/res/values/wygladlisty.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="item_number_bg_color">#ECECEC</color>
+    <color name="item_number_font_color">#000000</color>
+</resources>
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..09bab55
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,23 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+ANDROID_BUILD_TARGET_SDK_VERSION=21
+ANDROID_BUILD_TOOLS_VERSION=21.1.2
+ANDROID_BUILD_SDK_VERSION=21
+ANDROID_BUILD_MIN_SDK_VERSION=14
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega