diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2889b2f..2b4a152 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -14,7 +14,7 @@
     <uses-permission android:name="android.permission.CONTROL_LOCATION_UPDATES" />
     
     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher"
-        android:name="Zavody"
+                 android:name="Zavody"
     >
         <uses-library android:name="com.google.android.maps" />
         <activity android:name="MainActivity"
@@ -24,9 +24,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="cz.cvut.fel.nur.zavody.activity.NormalMode"
+        <activity android:name=".zavody.activity.NormalMode"
                   android:label="@string/ma_maps">
             <uses-library android:name="com.google.android.maps" />
         </activity>
+        <activity android:name=".activity.Friends"
+                  android:label="@string/ma_friends"/>
+        <activity android:name=".activity.Settings"
+                  android:label="@string/ma_settings"/>
+
     </application>
 </manifest>
diff --git a/src/cz/cvut/fel/nur/zavody/activity/Settings.java b/src/cz/cvut/fel/nur/zavody/activity/Settings.java
index 9874b66..b914da7 100644
--- a/src/cz/cvut/fel/nur/zavody/activity/Settings.java
+++ b/src/cz/cvut/fel/nur/zavody/activity/Settings.java
@@ -11,7 +11,7 @@
 import cz.cvut.fel.nur.zavody.R;
 
 /**
- *
+ * Na tohle je nejlepsi pouzit aktivitu PreferenceActivity a settings prepsat do XML a jenom ho nacist  
  * @author p4nther
  */
 public class Settings extends Activity {