diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index de41685b6b..523661cacd 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -132,7 +132,7 @@
         <activity android:name="net.osmand.plus.osmo.SettingsOsMoActivity" android:configChanges="keyboardHidden|orientation"></activity>
         <activity android:name="net.osmand.plus.osmo.OsMoGroupsActivity">
             <intent-filter>
-                <data android:scheme="http" android:host="osmo.mobi" />
+                <data android:scheme="http" android:host="m.osmo.mobi" />
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE"></category>
diff --git a/OsmAnd/res/layout/osmo_connect_to_device.xml b/OsmAnd/res/layout/osmo_connect_to_device.xml
index a202255d3a..a8b1c08ada 100644
--- a/OsmAnd/res/layout/osmo_connect_to_device.xml
+++ b/OsmAnd/res/layout/osmo_connect_to_device.xml
@@ -2,8 +2,8 @@
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="3dp"
-    android:paddingRight="3dp"
+    android:paddingLeft="7dp"
+    android:paddingRight="7dp"
     android:stretchColumns="1" >
 
     <TableRow>
diff --git a/OsmAnd/res/layout/osmo_create_group.xml b/OsmAnd/res/layout/osmo_create_group.xml
index d51a96a2ea..e26fcb876d 100644
--- a/OsmAnd/res/layout/osmo_create_group.xml
+++ b/OsmAnd/res/layout/osmo_create_group.xml
@@ -2,8 +2,8 @@
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="3dp"
-    android:paddingRight="3dp"
+    android:paddingLeft="7dp"
+    android:paddingRight="7dp"
     android:stretchColumns="1" >
 
     <TableRow>
diff --git a/OsmAnd/res/layout/osmo_edit_device.xml b/OsmAnd/res/layout/osmo_edit_device.xml
index 1bd33dcabb..699786ad47 100644
--- a/OsmAnd/res/layout/osmo_edit_device.xml
+++ b/OsmAnd/res/layout/osmo_edit_device.xml
@@ -1,52 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="fill_parent"
-    android:layout_marginLeft="5dp"
-    android:orientation="vertical" >
+    android:layout_height="wrap_content"
+    android:paddingLeft="7dp"
+    android:paddingRight="7dp"
+    android:stretchColumns="1" >
 
-    <TableLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:stretchColumns="1" >
+    <TableRow>
 
-        <TableRow>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/osmo_connect_to_device_name" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/osmo_connect_to_device_name" />
+        <EditText
+            android:id="@+id/Name"
+            android:layout_width="180dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:text="" >
 
-            <EditText
-                android:id="@+id/Name"
-                android:layout_width="180dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:text="" >
+            <requestFocus />
+        </EditText>
+    </TableRow>
 
-                <requestFocus />
-            </EditText>
-        </TableRow>
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
 
-        <TableRow
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/osmo_edit_color" >
+        </TextView>
+
+        <Spinner
+            android:id="@+id/ColorSpinner"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content" >
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp" >
+        </Spinner>
+    </TableRow>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/osmo_edit_color" >
-            </TextView>
-
-            <Spinner
-                android:id="@+id/ColorSpinner"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp" >
-            </Spinner>
-        </TableRow>
-    </TableLayout>
-
-</LinearLayout>
\ No newline at end of file
+</TableLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
index 970aa4e979..fd56e5d7ba 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
@@ -629,6 +629,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 	private void createGroup() {
 		if(osMoPlugin.getService().getRegisteredUserName() == null) {
 			signin();
+			return;
 		}
 		Builder builder = new AlertDialog.Builder(this);
 		builder.setTitle(R.string.osmo_create_group);
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoIntentHandler.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoIntentHandler.java
index aa1833b8e1..5a813f2f01 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoIntentHandler.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoIntentHandler.java
@@ -24,7 +24,7 @@ public class OsMoIntentHandler extends AsyncTask<Intent, Void, String> {
 			for (Intent intent : params) {
 				String scheme = intent.getScheme();
 				Uri data = intent.getData();
-				if ("http".equals(scheme) && data.getHost().equals("osmo.mobi")) {
+				if ("http".equals(scheme) && data.getHost().equals("m.osmo.mobi")) {
 					String path = data.getPath();
 					String lastPath = path.substring(path.lastIndexOf('/') + 1);
 					if(lastPath.equals("login")) {
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoService.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoService.java
index 1c0237095d..7e42e4cdcf 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoService.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoService.java
@@ -38,8 +38,9 @@ public class OsMoService implements OsMoReactor {
 	private ConcurrentLinkedQueue<String> commands = new ConcurrentLinkedQueue<String>();
 	private OsmandApplication app;
 	private static final Log log = PlatformUtil.getLog(OsMoService.class);
-	public static final String SHARE_TRACKER_URL = "http://osmo.mobi/connect?id=";
-	public static final String SHARE_GROUP_URL = "http://osmo.mobi/join?id=";
+	public static final String SHARE_TRACKER_URL = "http://m.osmo.mobi/connect?id=";
+	public static final String SHARE_GROUP_URL = "http://m.osmo.mobi/join?id=";
+	public static final String TRACK_URL = "http://test1342.osmo.mobi/u/";
 	private String lastRegistrationError = null;  
 	
 	
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoTracker.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoTracker.java
index be16437712..cf0ebc84f1 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoTracker.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoTracker.java
@@ -42,7 +42,7 @@ public class OsMoTracker implements OsMoReactor {
 		if (!isEnabledTracker()) {
 			return null;
 		}
-		return "http://test1342.osmo.mobi/u/" + sessionURL;
+		return OsMoService.TRACK_URL + sessionURL;
 	}
 	
 	public boolean isEnabledTracker() {