diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/RaceColumnConstants.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/RaceColumnConstants.java
new file mode 100644
index 00000000000..e1ae25521ee
--- /dev/null
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/RaceColumnConstants.java
@@ -0,0 +1,12 @@
+package com.sap.sailing.domain.common.impl;
+
+public class RaceColumnConstants {
+
+    public static final String LEADERBOARD_NAME = "leaderboard_name";
+    public static final String LEADERBOARD_DISPLAY_NAME = "leaderboard_display_name";
+    public static final String RACE_COLUMNS = "race_columns";
+    public static final String RACE_COLUMN_NAME = "race_column_name";
+    public static final String EXPLICIT_FACTOR = "explicit_factor";
+    public static final String FACTOR = "factor";
+
+}
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/RaceColumnFactorImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/RaceColumnFactorImpl.java
new file mode 100644
index 00000000000..cd810fd8208
--- /dev/null
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/RaceColumnFactorImpl.java
@@ -0,0 +1,57 @@
+package com.sap.sailing.domain.base.impl;
+
+import java.util.HashMap;
+
+public class RaceColumnFactorImpl {
+
+    private final String leaderboard_name;
+    private final String leaderboard_display_name;
+    private final HashMap<String, RaceColumn> race_columns;
+
+    public RaceColumnFactorImpl(String leaderboard_name, String leaderboard_display_name) {
+        this.leaderboard_name = leaderboard_name;
+        this.leaderboard_display_name = leaderboard_display_name;
+        race_columns = new HashMap<>();
+    }
+
+    public String getLeaderboardName() {
+        return leaderboard_name;
+    }
+
+    public String getLeaderboardDisplayName() {
+        return leaderboard_display_name;
+    }
+
+    public HashMap<String, RaceColumn> getRaceColumns() {
+        return race_columns;
+    }
+
+    public void addRaceColumn(String race_column_name, Double explicit_factor, Double factor) {
+        race_columns.put(race_column_name, new RaceColumn(race_column_name, explicit_factor, factor));
+    }
+
+    public class RaceColumn {
+
+        private final String race_column_name;
+        private final Double explicit_factor;
+        private final Double factor;
+
+        public RaceColumn(String race_column_name, Double explicit_factor, Double factor) {
+            this.race_column_name = race_column_name;
+            this.explicit_factor = explicit_factor;
+            this.factor = factor;
+        }
+
+        public String getRaceColumnName() {
+            return race_column_name;
+        }
+
+        public Double getExplicitFactor() {
+            return explicit_factor;
+        }
+
+        public Double getFactor() {
+            return factor;
+        }
+    }
+}
diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/RaceColumnFactorJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/RaceColumnFactorJsonDeserializer.java
new file mode 100644
index 00000000000..51049583e32
--- /dev/null
+++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/RaceColumnFactorJsonDeserializer.java
@@ -0,0 +1,29 @@
+package com.sap.sailing.server.gateway.deserialization.impl;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+import com.sap.sailing.domain.base.impl.RaceColumnFactorImpl;
+import com.sap.sailing.domain.common.impl.RaceColumnConstants;
+import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
+import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
+
+public class RaceColumnFactorJsonDeserializer implements JsonDeserializer<RaceColumnFactorImpl> {
+
+    @Override
+    public RaceColumnFactorImpl deserialize(JSONObject object) throws JsonDeserializationException {
+        String leaderboard_name = (String) object.get(RaceColumnConstants.LEADERBOARD_NAME);
+        String leaderboard_display_name = (String) object.get(RaceColumnConstants.LEADERBOARD_DISPLAY_NAME);
+        RaceColumnFactorImpl raceColumnFactor = new RaceColumnFactorImpl(leaderboard_name, leaderboard_display_name);
+        JSONArray race_columns = (JSONArray) object.get(RaceColumnConstants.RACE_COLUMNS);
+        int size = race_columns.size();
+        for (int i = 0; i < size; i++) {
+            JSONObject data = (JSONObject) race_columns.get(i);
+            String race_column_name = (String) data.get(RaceColumnConstants.RACE_COLUMN_NAME);
+            Double explicit_factor = (Double) data.get(RaceColumnConstants.EXPLICIT_FACTOR);
+            Double factor = (Double) data.get(RaceColumnConstants.FACTOR);
+            raceColumnFactor.addRaceColumn(race_column_name, explicit_factor, factor);
+        }
+        return raceColumnFactor;
+    }
+}
diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
index 248172548a1..199ec7602e4 100644
--- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
+++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
@@ -57,6 +57,7 @@ import com.sap.sailing.domain.common.dto.LeaderboardDTO;
 import com.sap.sailing.domain.common.dto.LeaderboardEntryDTO;
 import com.sap.sailing.domain.common.dto.LeaderboardRowDTO;
 import com.sap.sailing.domain.common.dto.RaceColumnDTO;
+import com.sap.sailing.domain.common.impl.RaceColumnConstants;
 import com.sap.sailing.domain.common.racelog.RaceLogServletConstants;
 import com.sap.sailing.domain.common.racelog.tracking.DeviceMappingConstants;
 import com.sap.sailing.domain.common.security.Permission;
@@ -678,16 +679,16 @@ public class LeaderboardsResource extends AbstractSailingServerResource {
 
     private JSONObject getJsonForColumnFactors(final Leaderboard leaderboard, final Iterable<RaceColumn> raceColumns) {
         final JSONObject json = new JSONObject();
-        json.put("leaderboard_name", leaderboard.getName());
-        json.put("leaderboard_display_name", leaderboard.getDisplayName());
+        json.put(RaceColumnConstants.LEADERBOARD_NAME, leaderboard.getName());
+        json.put(RaceColumnConstants.LEADERBOARD_DISPLAY_NAME, leaderboard.getDisplayName());
         final JSONArray raceColumnsAsJson = new JSONArray();
-        json.put("race_columns", raceColumnsAsJson);
+        json.put(RaceColumnConstants.RACE_COLUMNS, raceColumnsAsJson);
         for (final RaceColumn rc : raceColumns) {
             final JSONObject raceColumnAsJson = new JSONObject();
             raceColumnsAsJson.add(raceColumnAsJson);
-            raceColumnAsJson.put("race_column_name", rc.getName());
-            raceColumnAsJson.put("explicit_factor", rc.getExplicitFactor());
-            raceColumnAsJson.put("factor", rc.getFactor());
+            raceColumnAsJson.put(RaceColumnConstants.RACE_COLUMN_NAME, rc.getName());
+            raceColumnAsJson.put(RaceColumnConstants.EXPLICIT_FACTOR, rc.getExplicitFactor());
+            raceColumnAsJson.put(RaceColumnConstants.FACTOR, rc.getFactor());
         }
         return json;
     }
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpGetRequest.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpGetRequest.java
index 68ba2be2597..517cf77141b 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpGetRequest.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpGetRequest.java
@@ -11,11 +11,11 @@ import android.content.Context;
 public class HttpGetRequest extends HttpRequest {
 
     public HttpGetRequest(URL requestUrl, Context context) {
-        super(requestUrl, context);
+        super(context, requestUrl);
     }
 
     public HttpGetRequest(URL url, HttpRequestProgressListener listener, Context context) {
-        super(url, listener, context);
+        super(context, url, listener);
     }
 
     @Override
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonGetRequest.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonGetRequest.java
index 78607cd9240..bba9f470bc4 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonGetRequest.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonGetRequest.java
@@ -10,8 +10,8 @@ import android.content.Context;
 public class HttpJsonGetRequest extends HttpRequest {
     public final static String ContentType = "application/json;charset=UTF-8";
 
-    public HttpJsonGetRequest(URL requestUrl, Context context) {
-        super(requestUrl, context);
+    public HttpJsonGetRequest(Context context, URL requestUrl) {
+        super(context, requestUrl);
     }
 
     @Override
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonPostRequest.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonPostRequest.java
index 28af17938f8..6e077db1a8b 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonPostRequest.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonPostRequest.java
@@ -16,16 +16,16 @@ public class HttpJsonPostRequest extends HttpRequest {
     private String requestBody;
     private String accessToken;
 
-    public HttpJsonPostRequest(URL requestUrl, Context context) {
-        this(requestUrl, null, context, null);
+    public HttpJsonPostRequest(Context context, URL requestUrl) {
+        this(context, requestUrl, null, null);
     }
 
-    public HttpJsonPostRequest(URL requestUrl, String body, Context context) {
-        this(requestUrl, body, context, null);
+    public HttpJsonPostRequest(Context context, URL requestUrl, String body) {
+        this(context, requestUrl, body, null);
     }
 
-    public HttpJsonPostRequest(URL requestUrl, String body, Context context, String accessToken) {
-        super(requestUrl, context);
+    public HttpJsonPostRequest(Context context, URL requestUrl, String body, String accessToken) {
+        super(context, requestUrl);
         this.requestBody = body;
         this.accessToken = accessToken;
     }
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpRequest.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpRequest.java
index 50f3ed82c48..7773386c963 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpRequest.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpRequest.java
@@ -46,11 +46,11 @@ public abstract class HttpRequest {
     private boolean isCancelled;
     protected SharedPreferences pref;
 
-    public HttpRequest(URL url, Context context) {
-        this(url, null, context);
+    public HttpRequest(Context context, URL url) {
+        this(context, url, null);
     }
 
-    public HttpRequest(URL url, HttpRequestProgressListener listener, Context context) {
+    public HttpRequest(Context context, URL url, HttpRequestProgressListener listener) {
         this.url = url;
         this.listener = listener;
         this.isCancelled = false;
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/LoginGetRequest.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/LoginGetRequest.java
index 51a745426e4..b400587220d 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/LoginGetRequest.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/LoginGetRequest.java
@@ -15,7 +15,7 @@ public class LoginGetRequest extends HttpRequest {
     private final LoginData loginData;
 
     public LoginGetRequest(URL url, Context context, LoginData login) {
-        super(url, context);
+        super(context, url);
         loginData = login;
     }
 
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/MessageSenderTask.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/MessageSenderTask.java
index 2b86375a0d1..9b36424ac6e 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/MessageSenderTask.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/MessageSenderTask.java
@@ -40,7 +40,7 @@ public class MessageSenderTask extends AsyncTask<Intent, Void, MessageSenderResu
         InputStream responseStream = null;
         try {
             ExLog.i(context, TAG, "Posting message: " + payload);
-            HttpRequest post = new HttpJsonPostRequest(new URL(url), payload, context);
+            HttpRequest post = new HttpJsonPostRequest(context, new URL(url), payload);
             responseStream = post.execute();
             ExLog.i(context, TAG, "Post successful for the following message: " + payload);
             result = new MessageSenderResult(intent, responseStream);
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/AuthCheckTask.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/AuthCheckTask.java
index 547ca6b78ff..d54c4ef6278 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/AuthCheckTask.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/AuthCheckTask.java
@@ -41,7 +41,7 @@ public class AuthCheckTask extends AsyncTask<Void, Void, Boolean> {
         Boolean authenticated = false;
         if (url != null) {
             try {
-                HttpRequest request = new HttpJsonGetRequest(url, context);
+                HttpRequest request = new HttpJsonGetRequest(context, url);
                 InputStream responseStream = request.execute();
 
                 JSONParser parser = new JSONParser();
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/LogoutTask.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/LogoutTask.java
index 16ee0a7cabe..d0df5475399 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/LogoutTask.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/LogoutTask.java
@@ -32,7 +32,7 @@ public class LogoutTask extends AsyncTask<String, Void, Void> {
     @Override
     protected Void doInBackground(String... params) {
         if (url != null && params != null && params.length > 0) {
-            HttpRequest request = new HttpJsonGetRequest(url, context);
+            HttpRequest request = new HttpJsonGetRequest(context, url);
             try {
                 request.execute();
             } catch (IOException e) {
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
index bb711c3d562..4ad3aef3508 100755
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
@@ -462,8 +462,7 @@ public class RegattaActivity extends AbstractRegattaActivity
         }
 
         try {
-            HttpJsonPostRequest request = new HttpJsonPostRequest(new URL(checkoutURLStr), checkoutData.toString(),
-                    this);
+            HttpJsonPostRequest request = new HttpJsonPostRequest(this, new URL(checkoutURLStr), checkoutData.toString());
             NetworkHelper.getInstance(this).executeHttpJsonRequestAsync(request,
                     new NetworkHelperSuccessListener() {
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
index 426a5e7b016..15425a241cc 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
@@ -128,8 +128,8 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
         try {
             JSONObject requestObject = CheckinHelper.getCheckinJson(checkinData.competitorId, checkinData.deviceUid,
                     "TODO push device ID!!", date.getTime());
-            HttpJsonPostRequest request = new HttpJsonPostRequest(new URL(checkinData.checkinURL),
-                    requestObject.toString(), getActivity());
+            HttpJsonPostRequest request = new HttpJsonPostRequest(getActivity(), new URL(checkinData.checkinURL),
+                    requestObject.toString());
             NetworkHelper.getInstance(getActivity())
                     .executeHttpJsonRequestAsync(request, new CheckinListener(checkinData.checkinDigest),
                             new CheckinErrorListener(checkinData.checkinDigest));
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable/factor_background_dark.xml b/mobile/com.sap.sailing.racecommittee.app/res/drawable/factor_background_dark.xml
new file mode 100644
index 00000000000..eba257d7112
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/drawable/factor_background_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/constant_light_gray"/>
+
+    <padding
+        android:left="5dp"
+        android:right="5dp"
+        android:top="@dimen/thin_line"/>
+
+    <corners
+        android:bottomLeftRadius="3dp"
+        android:bottomRightRadius="3dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable/factor_background_light.xml b/mobile/com.sap.sailing.racecommittee.app/res/drawable/factor_background_light.xml
new file mode 100644
index 00000000000..1340e87a546
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/drawable/factor_background_light.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/constant_black"/>
+
+    <padding
+        android:left="5dp"
+        android:right="5dp"
+        android:top="@dimen/thin_line"/>
+
+    <corners
+        android:bottomLeftRadius="3dp"
+        android:bottomRightRadius="3dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_column_factor_normal.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_column_factor_normal.xml
new file mode 100644
index 00000000000..3eb70750bc4
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_column_factor_normal.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="?attr/sap_gray_black_30">
+
+    <com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
+        android:id="@+id/header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:headerText="@string/race_factor"/>
+
+    <RelativeLayout
+        android:id="@+id/button_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="center_vertical">
+
+        <Button
+            android:id="@+id/set_column_factor"
+            style="?attr/button"
+            android:layout_width="@dimen/default_button_width"
+            android:layout_height="@dimen/default_button_height"
+            android:layout_centerInParent="true"
+            android:layout_margin="@dimen/unscheduled_confirm_button_margin"
+            android:text="@string/set_column_factor"
+            android:textSize="@dimen/textSize_18"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/button_bar"
+        android:layout_below="@id/header">
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_margin="@dimen/default_margin_twice">
+
+            <com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
+                android:layout_width="200dp"
+                android:layout_height="wrap_content"
+                app:floatLabelPaddingLeft="@dimen/float_label_padding"
+                app:floatLabelTextAppearance="?attr/floatLabel">
+
+                <EditText
+                    android:id="@+id/column_factor"
+                    style="?attr/editText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:layout_gravity="center_vertical"
+                    android:hint="@string/race_factor"
+                    android:inputType="numberDecimal"
+                    android:textAppearance="?attr/textNormal"
+                    android:textColor="?attr/white"/>
+            </com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
+        </RelativeLayout>
+    </RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_column_factor_xlarge.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_column_factor_xlarge.xml
new file mode 100644
index 00000000000..5c2e7514ab8
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_column_factor_xlarge.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:id="@+id/button_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="center_vertical"
+        android:background="?attr/sap_gray_black_30">
+
+        <Button
+            android:id="@+id/set_column_factor"
+            style="?attr/buttonSolidNormal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_margin="@dimen/unscheduled_confirm_button_margin"
+            android:text="@string/set_column_factor"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/button_bar"
+        android:background="?attr/sap_gray_black_30">
+
+        <com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            app:floatLabelPaddingLeft="@dimen/float_label_padding"
+            app:floatLabelTextAppearance="?attr/floatLabel">
+
+            <EditText
+                android:id="@+id/column_factor"
+                style="?attr/editText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:hint="@string/race_factor"
+                android:inputType="numberDecimal"
+                android:textAppearance="?attr/textNormal"
+                android:textColor="?attr/white"/>
+        </com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
+    </RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_area_item.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_area_item.xml
index 3c23cbde9a9..3f05645bb05 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_area_item.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_area_item.xml
@@ -1,8 +1,8 @@
 <?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="@dimen/navigation_drawer_cell_height">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/navigation_drawer_cell_height">
 
     <RelativeLayout
         android:id="@+id/panel_right"
@@ -24,7 +24,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:textAppearance="?attr/textXLarge"
-                tools:text="13:36" />
+                tools:text="13:36"/>
 
             <TextView
                 android:id="@+id/race_started"
@@ -32,7 +32,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/race_started"
-                android:textAppearance="?attr/textXSmall" />
+                android:textAppearance="?attr/textXSmall"/>
 
             <TextView
                 android:id="@+id/race_finished"
@@ -40,7 +40,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/race_finished"
-                android:textAppearance="?attr/textXSmall" />
+                android:textAppearance="?attr/textXSmall"/>
         </LinearLayout>
 
         <TextView
@@ -51,7 +51,7 @@
             android:text="@string/race_unscheduled"
             android:textColor="?attr/sap_light_gray"
             android:textSize="@dimen/textSize_18"
-            android:visibility="gone" />
+            android:visibility="gone"/>
 
         <ImageView
             android:id="@+id/update_badge"
@@ -62,7 +62,7 @@
             android:scaleType="matrix"
             android:src="@drawable/updated"
             android:visibility="gone"
-            tools:visibility="visible" />
+            tools:visibility="visible"/>
     </RelativeLayout>
 
     <RelativeLayout
@@ -76,7 +76,7 @@
             android:id="@+id/race_marker"
             android:layout_width="@dimen/obesity_line"
             android:layout_height="match_parent"
-            android:src="?attr/marker_race" />
+            android:src="?attr/marker_race"/>
 
         <LinearLayout
             android:id="@+id/additional_info"
@@ -93,7 +93,7 @@
                 android:layout_margin="5dp"
                 android:src="?attr/link_24dp"
                 android:visibility="gone"
-                tools:visibility="visible" />
+                tools:visibility="visible"/>
 
             <LinearLayout
                 android:id="@+id/race_flag"
@@ -110,7 +110,7 @@
                     android:layout_height="25dp"
                     android:layout_gravity="center"
                     android:scaleType="centerInside"
-                    tools:src="@drawable/flag_alpha_64dp" />
+                    tools:src="@drawable/flag_alpha_64dp"/>
 
                 <TextView
                     android:id="@+id/flag_timer"
@@ -119,7 +119,7 @@
                     android:layout_gravity="center"
                     android:drawableLeft="?attr/arrow_down"
                     android:textAppearance="?attr/textXSmall"
-                    tools:text="01:12" />
+                    tools:text="01:12"/>
             </LinearLayout>
         </LinearLayout>
 
@@ -141,7 +141,7 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:textAppearance="?attr/textNormal"
-                tools:text="Race 3" />
+                tools:text="Race 3"/>
 
             <TextView
                 android:id="@+id/depends_on"
@@ -152,13 +152,23 @@
                 android:textAppearance="?attr/textXSmall"
                 android:visibility="gone"
                 tools:text="5 minutes after ABC"
-                tools:visibility="visible" />
+                tools:visibility="visible"/>
         </LinearLayout>
     </RelativeLayout>
 
+    <TextView
+        android:id="@+id/explicit_factor"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:background="?attr/factor_background"
+        android:textAppearance="?attr/textXSmall"
+        android:textColor="?attr/white_invert"
+        tools:text="x 3.5"/>
+
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="@dimen/thin_line"
         android:layout_alignParentBottom="true"
-        android:background="?attr/black" />
+        android:background="?attr/black"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_setup_hor_2.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_setup_hor_2.xml
index d0673724c0e..fa04fc01147 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_setup_hor_2.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_setup_hor_2.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -10,6 +10,15 @@
         android:baselineAligned="false"
         android:orientation="horizontal">
 
+        <com.sap.sailing.racecommittee.app.ui.views.PanelButton
+            android:id="@+id/button_factor"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            app:buttonHeader="@string/race_factor"
+            app:buttonType="typeValue"
+            app:linePosition="right" />
+
         <com.sap.sailing.racecommittee.app.ui.views.PanelButton
             android:id="@+id/button_course"
             android:layout_width="0dp"
@@ -17,7 +26,7 @@
             android:layout_weight="1"
             app:buttonHeader="@string/course"
             app:buttonType="typeValue"
-            app:linePosition="right"/>
+            app:linePosition="right" />
 
         <com.sap.sailing.racecommittee.app.ui.views.PanelButton
             android:id="@+id/button_wind"
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_setup_ver.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_setup_ver.xml
index 53421900330..73c11e242f7 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_setup_ver.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_setup_ver.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -16,7 +15,7 @@
             android:layout_height="0dp"
             android:layout_weight="1"
             app:buttonHeader="@string/start_procedure"
-            app:buttonType="typeValue"/>
+            app:buttonType="typeValue" />
 
         <com.sap.sailing.racecommittee.app.ui.views.PanelButton
             android:id="@+id/button_mode"
@@ -51,6 +50,14 @@
             app:buttonSwitch=""
             app:buttonType="typeSwitch" />
 
+        <com.sap.sailing.racecommittee.app.ui.views.PanelButton
+            android:id="@+id/button_factor"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            app:buttonHeader="@string/race_factor"
+            app:buttonType="typeValue" />
+
         <com.sap.sailing.racecommittee.app.ui.views.PanelButton
             android:id="@+id/button_course"
             android:layout_width="match_parent"
@@ -66,7 +73,6 @@
             android:layout_weight="1"
             app:buttonHeader="@string/wind"
             app:buttonType="typeValue" />
-
     </LinearLayout>
 
     <View
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
index 7ccaf9b8572..cddb0855484 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
@@ -437,6 +437,8 @@
     <string name="preference_allow_dependent_races_header">Relative Startzeit</string>
     <string name="preference_allow_dependent_races_description">Aktiviert relative Startzeiten zwischen Rennen</string>
     <string name="preference_dependent_races_offset_header">Standard Offset der relativen Startzeit (Minuten)</string>
+    <string name="preference_allow_edit_race_factor_header">Rennfaktor ändern</string>
+    <string name="preference_allow_edit_race_factor_description">Rennleiter können den Rennfaktor je Rennen ändern</string>
     <string name="error_finished_time">Die ausgewählte Zielzeit liegt vor der Zeit, der ersten Schiffeinfahrt. Bitte überprüfe die Uhrzeit.</string>
     <string name="error_finishing_time">Die ausgewählte Zeit is vor dem Rennstart. Bitte überprüfe die Uhrzeit.</string>
     <string name="error_time_in_future">Die ausgewählte Zeit liegt in der Zukunft. Bitte überprüfe die Uhrzeit.</string>
@@ -500,11 +502,15 @@
 
     <string name="preference_non_public_events_header">Zeige nicht öffentliche Events</string>
     <string name="preference_non_public_events_summary">Lade alle Events, auch die nicht öffentlichen.</string>
+    <string name="race_factor">Faktor</string>
     <string name="options_menu_role">Rolle wechseln</string>
     <string name="reload_config">Konfiguration vom Server laden</string>
 
     <string name="abort_title">Rennen abbrechen</string>
     <string name="abort_hint">Welche laufenden Rennen möchten Sie abbrechen?</string>
     <string name="abort_dismiss">Verwerfen</string>
+    <string name="explicit_factor">x %1$s</string>
+    <string name="set_column_factor">Setze Faktor</string>
+    <string name="set_factor_error">Beim Setzen des Faktors ist ein Fehler aufgetreten: %s</string>
 
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml
index ef0ce0eb21a..e6bac7906c5 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml
@@ -14,6 +14,7 @@
     <item name="race_panel_time" type="layout">@layout/race_panel_time_xlarge</item>
     <item name="race_positioning" type="layout">@layout/race_tracking_list_normal</item>
     <item name="race_schedule_button" type="layout">@layout/race_schedule_button_xlarge</item>
+    <item name="race_column_factor" type="layout">@layout/race_column_factor_normal</item>
     <item name="race_schedule_procedure_pathfinder" type="layout">@layout/race_schedule_procedure_pathfinder_xlarge</item>
     <item name="race_schedule_procedure_timing" type="layout">@layout/race_schedule_procedure_timing_xlarge</item>
     <item name="toolbar" type="layout">@layout/toolbar_xlarge</item>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/attrs.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/attrs.xml
index 16dbbed26ba..dabbcdbf955 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/attrs.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/attrs.xml
@@ -39,6 +39,8 @@
     <attr name="editText" format="reference"/>
     <attr name="floatLabel" format="reference"/>
 
+    <attr name="factor_background" format="reference"/>
+
     <!-- drawable -->
     <attr name="add" format="reference"/>
     <attr name="access_time_18dp" format="reference"/>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
index 97c31927d6c..a9f3df3cd3b 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
@@ -97,6 +97,8 @@
     <bool name="preference_allow_dependent_races_default">true</bool>
     <string name="preference_dependent_races_offset_key" translatable="false">dependentRacesOffset</string>
     <integer name="preference_dependent_races_offset_default">5</integer>
+    <string name="preference_allow_edit_race_factor_key" translatable="false">raceFactor</string>
+    <bool name="preference_allow_edit_race_factor_default">true</bool>
 
     <string name="preference_allow_demo_key" translatable="false">allow_demo</string>
     <bool name="preference_allow_demo_default">false</bool>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
index 14bd788fd06..3656576642b 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
@@ -10,6 +10,7 @@
     <item name="login_listviews_button" type="layout">@layout/login_listviews_button_normal</item>
     <item name="photo_list_button" type="layout">@layout/photo_list_button_normal</item>
     <item name="photo_list_item" type="layout">@layout/photo_list_item_normal</item>
+    <item name="race_column_factor" type="layout">@layout/race_column_factor_normal</item>
     <item name="race_finished" type="layout">@layout/race_finished_normal</item>
     <item name="race_finished_buttons" type="layout">@layout/race_finished_buttons_hor</item>
     <item name="race_finished_desc" type="layout">@layout/race_finished_desc_hor</item>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
index 448dedfeab0..56c8a122899 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
@@ -459,6 +459,8 @@
     <string name="preference_allow_dependent_races_header">Relative Start Time (Minutes)</string>
     <string name="preference_allow_dependent_races_description">Enable Relative Start Time between Races</string>
     <string name="preference_dependent_races_offset_header">Default Relative Start Time Offset</string>
+    <string name="preference_allow_edit_race_factor_header">Race factor change</string>
+    <string name="preference_allow_edit_race_factor_description">Race managers can change the race factor per race</string>
     <string name="error_finished_time">The given finish time is earlier than the first finisher time. Please recheck the time.</string>
     <string name="error_finishing_time">The selected time is before the race start.</string>
     <string name="error_time_in_future">The given time is in future. Please recheck the time.</string>
@@ -528,10 +530,14 @@
 
     <string name="preference_non_public_events_header">Show Non Public Events</string>
     <string name="preference_non_public_events_summary">Load all events including the no public one.</string>
+    <string name="race_factor">Factor</string>
     <string name="options_menu_role">Change Regatta</string>
     <string name="reload_config">Reload Configuration from Server</string>
-
     <string name="abort_title">Abort Races</string>
     <string name="abort_hint">Which running races do you want to abort?</string>
     <string name="abort_dismiss">Dismiss</string>
+    <string name="race_factor_format" translatable="false">x #.####</string>
+    <string name="set_column_factor">Set Factor</string>
+    <string name="set_factor_error">There was an error while setting the factor: %s</string>
+
 </resources>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/themes_dark.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/themes_dark.xml
index bf6dadc24b5..ed25d019eb8 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/themes_dark.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/themes_dark.xml
@@ -52,6 +52,8 @@
         <item name="textPanelHeader">@style/AppTheme.Dark.Text.PanelHeader</item>
         <item name="floatLabel">@style/AppTheme.Dark.Text.FloatLabel</item>
 
+        <item name="factor_background">@drawable/factor_background_dark</item>
+
         <!-- drawable -->
         <item name="add">@drawable/ic_add_dark</item>
         <item name="access_time_18dp">@drawable/ic_access_time_white_18dp</item>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/themes_light.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/themes_light.xml
index cdcc04fafb9..e4c65ad21a9 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/themes_light.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/themes_light.xml
@@ -61,6 +61,8 @@
         <item name="textPanelHeader">@style/AppTheme.Light.Text.PanelHeader</item>
         <item name="floatLabel">@style/AppTheme.Light.Text.FloatLabel</item>
 
+        <item name="factor_background">@drawable/factor_background_light</item>
+
         <!-- drawables -->
         <item name="add">@drawable/ic_add_light</item>
         <item name="access_time_18dp">@drawable/ic_access_time_black_18dp</item>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_regatta_defaults.xml b/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_regatta_defaults.xml
index ea658af1641..f2e97d4ab23 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_regatta_defaults.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_regatta_defaults.xml
@@ -7,33 +7,39 @@
             android:defaultValue="@string/preference_racing_procedure_override_default"
             android:key="@string/preference_racing_procedure_override_key"
             android:summary="@string/override_default_start_procedure_type_select_description"
-            android:title="@string/override_default_start_procedure_type_select_header"/>
+            android:title="@string/override_default_start_procedure_type_select_header" />
 
         <ListPreference
             android:defaultValue="@string/preference_course_designer_override_default"
             android:key="@string/preference_course_designer_override_key"
-            android:title="@string/override_default_course_designer_type_select_header"/>
+            android:title="@string/override_default_course_designer_type_select_header" />
 
         <CheckBoxPreference
             android:defaultValue="@bool/preference_allow_dependent_races_default"
             android:key="@string/preference_allow_dependent_races_key"
             android:summary="@string/preference_allow_dependent_races_description"
-            android:title="@string/preference_allow_dependent_races_header"/>
+            android:title="@string/preference_allow_dependent_races_header" />
 
         <com.sap.sailing.racecommittee.app.ui.views.IntegerEditTextPreference
             android:defaultValue="@integer/preference_dependent_races_offset_default"
             android:key="@string/preference_dependent_races_offset_key"
             android:numeric="integer"
-            android:title="@string/preference_dependent_races_offset_header"/>
+            android:title="@string/preference_dependent_races_offset_header" />
 
         <SwitchPreference
             android:defaultValue="@bool/preference_heading_with_declination_subtracted_default"
             android:key="@string/preference_heading_with_declination_subtracted_key"
-            android:switchTextOn="@string/preference_heading_with_declination_subtracted_is_enabled"
-            android:switchTextOff="@string/preference_heading_with_declination_subtracted_is_disabled"
-            android:summaryOn="@string/preference_heading_with_declination_subtracted_summary_is_enabled"
             android:summaryOff="@string/preference_heading_with_declination_subtracted_summary_is_disabled"
-            android:title="@string/preference_heading_with_declination_subtracted_enabled"/>
+            android:summaryOn="@string/preference_heading_with_declination_subtracted_summary_is_enabled"
+            android:switchTextOff="@string/preference_heading_with_declination_subtracted_is_disabled"
+            android:switchTextOn="@string/preference_heading_with_declination_subtracted_is_enabled"
+            android:title="@string/preference_heading_with_declination_subtracted_enabled" />
+
+        <CheckBoxPreference
+            android:defaultValue="@bool/preference_allow_edit_race_factor_default"
+            android:key="@string/preference_allow_edit_race_factor_key"
+            android:summary="@string/preference_allow_edit_race_factor_description"
+            android:title="@string/preference_allow_edit_race_factor_header" />
     </PreferenceCategory>
 
     <PreferenceCategory android:title="RRS26">
@@ -42,13 +48,13 @@
             android:defaultValue="@string/preference_racing_procedure_classflag_default"
             android:key="@string/preference_racing_procedure_rrs26_classflag_key"
             android:summary="@string/empty"
-            android:title="@string/preference_racing_procedure_classflag_header"/>
+            android:title="@string/preference_racing_procedure_classflag_header" />
 
         <CheckBoxPreference
             android:defaultValue="@bool/preference_racing_procedure_rrs26_hasxray_default"
             android:key="@string/preference_racing_procedure_rrs26_hasxray_key"
             android:summary="@string/preference_racing_procedure_hasxray_description"
-            android:title="@string/preference_racing_procedure_hasxray_header"/>
+            android:title="@string/preference_racing_procedure_hasxray_header" />
 
         <CheckBoxPreference
             android:defaultValue="@bool/preference_racing_procedure_rrs26_resultentryenabled_default"
@@ -60,7 +66,7 @@
             android:defaultValue="@array/preference_racing_procedure_rrs26_startmode_flags_default"
             android:key="@string/preference_racing_procedure_rrs26_startmode_flags_key"
             android:summary="@string/empty"
-            android:title="@string/preference_racing_procedure_rrs26_startmode_flags_header"/>
+            android:title="@string/preference_racing_procedure_rrs26_startmode_flags_header" />
 
     </PreferenceCategory>
 
@@ -70,13 +76,13 @@
             android:defaultValue="@string/preference_racing_procedure_classflag_default"
             android:key="@string/preference_racing_procedure_gatestart_classflag_key"
             android:summary="@string/empty"
-            android:title="@string/preference_racing_procedure_classflag_header"/>
+            android:title="@string/preference_racing_procedure_classflag_header" />
 
         <CheckBoxPreference
             android:defaultValue="@bool/preference_racing_procedure_gatestart_hasxray_default"
             android:key="@string/preference_racing_procedure_gatestart_hasxray_key"
             android:summary="@string/preference_racing_procedure_hasxray_description"
-            android:title="@string/preference_racing_procedure_hasxray_header"/>
+            android:title="@string/preference_racing_procedure_hasxray_header" />
 
         <CheckBoxPreference
             android:defaultValue="@bool/preference_racing_procedure_gatestart_resultentryenabled_default"
@@ -88,13 +94,13 @@
             android:defaultValue="@bool/preference_racing_procedure_gatestart_haspathfinder_default"
             android:key="@string/preference_racing_procedure_gatestart_haspathfinder_key"
             android:summary="@string/preference_racing_procedure_gatestart_haspathfinder_description"
-            android:title="@string/preference_racing_procedure_gatestart_haspathfinder_header"/>
+            android:title="@string/preference_racing_procedure_gatestart_haspathfinder_header" />
 
         <CheckBoxPreference
             android:defaultValue="@bool/preference_racing_procedure_gatestart_hasadditionalgolfdowntime_default"
             android:key="@string/preference_racing_procedure_gatestart_hasadditionalgolfdowntime_key"
             android:summary="@string/preference_racing_procedure_gatestart_hasadditionalgolfdowntime_description"
-            android:title="@string/preference_racing_procedure_gatestart_hasadditionalgolfdowntime_header"/>
+            android:title="@string/preference_racing_procedure_gatestart_hasadditionalgolfdowntime_header" />
 
     </PreferenceCategory>
 
@@ -104,13 +110,13 @@
             android:defaultValue="@string/preference_racing_procedure_classflag_default"
             android:key="@string/preference_racing_procedure_ess_classflag_key"
             android:summary="@string/empty"
-            android:title="@string/preference_racing_procedure_classflag_header"/>
+            android:title="@string/preference_racing_procedure_classflag_header" />
 
         <CheckBoxPreference
             android:defaultValue="@bool/preference_racing_procedure_ess_hasxray_default"
             android:key="@string/preference_racing_procedure_ess_hasxray_key"
             android:summary="@string/preference_racing_procedure_hasxray_description"
-            android:title="@string/preference_racing_procedure_hasxray_header"/>
+            android:title="@string/preference_racing_procedure_hasxray_header" />
 
         <CheckBoxPreference
             android:defaultValue="@bool/preference_racing_procedure_ess_resultentryenabled_default"
@@ -126,13 +132,13 @@
             android:defaultValue="@string/preference_racing_procedure_classflag_default"
             android:key="@string/preference_racing_procedure_basic_classflag_key"
             android:summary="@string/empty"
-            android:title="@string/preference_racing_procedure_classflag_header"/>
+            android:title="@string/preference_racing_procedure_classflag_header" />
 
         <CheckBoxPreference
             android:defaultValue="@bool/preference_racing_procedure_basic_hasxray_default"
             android:key="@string/preference_racing_procedure_basic_hasxray_key"
             android:summary="@string/preference_racing_procedure_hasxray_description"
-            android:title="@string/preference_racing_procedure_hasxray_header"/>
+            android:title="@string/preference_racing_procedure_hasxray_header" />
 
         <CheckBoxPreference
             android:defaultValue="@bool/preference_racing_procedure_basic_resultentryenabled_default"
@@ -148,13 +154,13 @@
             android:defaultValue="@string/preference_racing_procedure_classflag_default"
             android:key="@string/preference_racing_procedure_league_classflag_key"
             android:summary="@string/empty"
-            android:title="@string/preference_racing_procedure_classflag_header"/>
+            android:title="@string/preference_racing_procedure_classflag_header" />
 
         <CheckBoxPreference
             android:defaultValue="@bool/preference_racing_procedure_league_hasxray_default"
             android:key="@string/preference_racing_procedure_league_hasxray_key"
             android:summary="@string/preference_racing_procedure_hasxray_description"
-            android:title="@string/preference_racing_procedure_hasxray_header"/>
+            android:title="@string/preference_racing_procedure_hasxray_header" />
 
         <CheckBoxPreference
             android:defaultValue="@bool/preference_racing_procedure_league_resultentryenabled_default"
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
index 0845520c5ab..2362c8bd529 100755
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
@@ -45,6 +45,7 @@ public class AppConstants {
     public final static String INTENT_ACTION_TOGGLE_PROCEDURE_MORE_MODE = "more_mode";
     public final static String INTENT_ACTION_TOGGLE_PROCEDURE_MORE_PATHFINDER = "more_pathfinder";
     public final static String INTENT_ACTION_TOGGLE_PROCEDURE_MORE_TIMING = "more_timing";
+    public final static String INTENT_ACTION_TOGGLE_FACTOR = "factor";
     public final static String INTENT_ACTION_TOGGLE_COURSE = "course";
     public final static String INTENT_ACTION_TOGGLE_WIND = "wind";
     public final static String INTENT_ACTION_TOGGLE_TIME = "time";
@@ -75,6 +76,7 @@ public class AppConstants {
     // clears all toggle buttons
     public final static String INTENT_ACTION_CLEAR_TOGGLE = PACKAGE_NAME + ".action.toggle.clear";
 
+    public final static String INTENT_ACTION_UPDATE_SCREEN = PACKAGE_NAME + ".action.update.screen";
     public final static String INTENT_ACTION_SHOW_MAIN_CONTENT = PACKAGE_NAME + ".action.show.main";
     public final static String INTENT_ACTION_SHOW_SUMMARY_CONTENT = PACKAGE_NAME + ".action.show.summary";
 
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
index 19d3192a3f8..74b616c42f5 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
@@ -480,6 +480,11 @@ public class AppPreferences {
             .getBoolean(R.bool.preference_heading_with_declination_subtracted_default));
     }
 
+    public boolean isRaceFactorChangeAllow() {
+        return preferences.getBoolean(context.getString(R.string.preference_allow_edit_race_factor_key), context.getResources()
+            .getBoolean(R.bool.preference_allow_edit_race_factor_default));
+    }
+
     public String showNonPublic() {
         return preferences.getBoolean(context.getString(R.string.preference_non_public_events_key), context.getResources()
             .getBoolean(R.bool.preference_non_public_events_default)) ? "true" : "false";
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
index f5bf0fb8920..71683a1d6cc 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
@@ -37,6 +37,7 @@ import com.sap.sailing.domain.base.impl.CompetitorImpl;
 import com.sap.sailing.domain.base.impl.CourseAreaImpl;
 import com.sap.sailing.domain.base.impl.FleetImpl;
 import com.sap.sailing.domain.base.impl.MarkImpl;
+import com.sap.sailing.domain.base.impl.RaceColumnFactorImpl;
 import com.sap.sailing.domain.base.impl.StrippedEventImpl;
 import com.sap.sailing.domain.base.racegroup.RaceGroup;
 import com.sap.sailing.domain.base.racegroup.SeriesWithRows;
@@ -254,4 +255,8 @@ public class OfflineDataManager extends DataManager {
         return null;
     }
 
+    @Override
+    public LoaderCallbacks<DataLoaderResult<RaceColumnFactorImpl>> createRaceColumnFactorLoader(LoadClient<RaceColumnFactorImpl> callback) {
+        return null;
+    }
 }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
index d0f9f44a117..98e9a8a43c8 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
@@ -28,6 +28,7 @@ import com.sap.sailing.domain.base.configuration.ConfigurationLoader;
 import com.sap.sailing.domain.base.configuration.DeviceConfiguration;
 import com.sap.sailing.domain.base.configuration.DeviceConfigurationIdentifier;
 import com.sap.sailing.domain.base.configuration.RegattaConfiguration;
+import com.sap.sailing.domain.base.impl.RaceColumnFactorImpl;
 import com.sap.sailing.domain.common.racelog.RaceLogServletConstants;
 import com.sap.sailing.racecommittee.app.AppConstants;
 import com.sap.sailing.racecommittee.app.AppPreferences;
@@ -51,6 +52,7 @@ import com.sap.sailing.racecommittee.app.data.parsers.DeviceConfigurationParser;
 import com.sap.sailing.racecommittee.app.data.parsers.EventsDataParser;
 import com.sap.sailing.racecommittee.app.data.parsers.ManagedRacesDataParser;
 import com.sap.sailing.racecommittee.app.data.parsers.MarksDataParser;
+import com.sap.sailing.racecommittee.app.data.parsers.RaceColumnsParser;
 import com.sap.sailing.racecommittee.app.domain.CoursePosition;
 import com.sap.sailing.racecommittee.app.domain.ManagedRace;
 import com.sap.sailing.racecommittee.app.domain.ManagedRaceIdentifier;
@@ -73,6 +75,7 @@ import com.sap.sailing.server.gateway.deserialization.impl.EventBaseJsonDeserial
 import com.sap.sailing.server.gateway.deserialization.impl.LeaderboardGroupBaseJsonDeserializer;
 import com.sap.sailing.server.gateway.deserialization.impl.NationalityJsonDeserializer;
 import com.sap.sailing.server.gateway.deserialization.impl.PersonJsonDeserializer;
+import com.sap.sailing.server.gateway.deserialization.impl.RaceColumnFactorJsonDeserializer;
 import com.sap.sailing.server.gateway.deserialization.impl.RegattaConfigurationJsonDeserializer;
 import com.sap.sailing.server.gateway.deserialization.impl.TeamJsonDeserializer;
 import com.sap.sailing.server.gateway.deserialization.impl.VenueJsonDeserializer;
@@ -85,6 +88,9 @@ import com.sap.sse.common.Util;
 public class OnlineDataManager extends DataManager {
     private static final String TAG = OnlineDataManager.class.getName();
 
+    public static final String LEADERBOARD = "leaderboard";
+    public static final String RACE_COLUMN = "raceColumn";
+
     protected OnlineDataManager(Context context, DataStore dataStore, SharedDomainFactory domainFactory) {
         super(context, dataStore, domainFactory);
     }
@@ -123,7 +129,7 @@ public class OnlineDataManager extends DataManager {
                 List<Util.Pair<String, Object>> params = new ArrayList<>();
                 params.add(new Util.Pair<String, Object>("showNonPublic", AppPreferences.on(context).showNonPublic()));
                 URL url = UrlHelper.generateUrl(preferences.getServerBaseURL(), "/sailingserver/api/v1/events", params);
-                return new OnlineDataLoader<Collection<EventBase>>(context, url, parser, handler);
+                return new OnlineDataLoader<>(context, url, parser, handler);
             }
         }, getContext());
     }
@@ -131,57 +137,53 @@ public class OnlineDataManager extends DataManager {
     @Override
     public LoaderCallbacks<DataLoaderResult<Collection<CourseArea>>> createCourseAreasLoader(
             final Serializable parentEventId, LoadClient<Collection<CourseArea>> callback) {
-        return new ImmediateDataLoaderCallbacks<Collection<CourseArea>>(context, callback,
-                new Callable<Collection<CourseArea>>() {
-                    @Override
-                    public Collection<CourseArea> call() throws Exception {
-                        if (dataStore.hasEvent(parentEventId)) {
-                            EventBase event = dataStore.getEvent(parentEventId);
-                            return dataStore.getCourseAreas(event);
-                        } else {
+        return new ImmediateDataLoaderCallbacks<>(context, callback, new Callable<Collection<CourseArea>>() {
+            @Override
+            public Collection<CourseArea> call() throws Exception {
+                if (dataStore.hasEvent(parentEventId)) {
+                    EventBase event = dataStore.getEvent(parentEventId);
+                    return dataStore.getCourseAreas(event);
+                } else {
 //                            throw new DataLoadingException(String.format(
 //                                    "Unable to load course areas for unknown event %s.", parentEventId));
-                            //TODO: Quickfix for #2889
-                            return null;
-                        }
-                    }
-                });
+                    //TODO: Quickfix for #2889
+                    return null;
+                }
+            }
+        });
     }
 
     @Override
     public LoaderCallbacks<DataLoaderResult<Collection<CourseArea>>> createCourseAreasLoader(
             final EventBase parentEvent, LoadClient<Collection<CourseArea>> callback) {
         // TODO Auto-generated method stub
-        return new ImmediateDataLoaderCallbacks<Collection<CourseArea>>(context, callback,
-                new Callable<Collection<CourseArea>>() {
-                    @Override
-                    public Collection<CourseArea> call() throws Exception {
+        return new ImmediateDataLoaderCallbacks<>(context, callback, new Callable<Collection<CourseArea>>() {
+            @Override
+            public Collection<CourseArea> call() throws Exception {
 
-                        return dataStore.getCourseAreas(parentEvent);
+                return dataStore.getCourseAreas(parentEvent);
 
-                    }
-                });
+            }
+        });
     }
 
     @Override
     public LoaderCallbacks<DataLoaderResult<Collection<ManagedRace>>> createRacesLoader(
             final Serializable courseAreaId, LoadClient<Collection<ManagedRace>> callback) {
-        return new DataLoaderCallbacks<Collection<ManagedRace>>(callback, new LoaderCreator<Collection<ManagedRace>>() {
+        return new DataLoaderCallbacks<>(callback, new LoaderCreator<Collection<ManagedRace>>() {
             @Override
             public Loader<DataLoaderResult<Collection<ManagedRace>>> create(int id, Bundle args) throws Exception {
                 ExLog.i(context, TAG, String.format("Creating races-OnlineDataLoader %d", id));
-                ConfigurationLoader<RegattaConfiguration> globalConfiguration = PreferencesRegattaConfigurationLoader
-                        .loadFromPreferences(preferences);
+                ConfigurationLoader<RegattaConfiguration> globalConfiguration = PreferencesRegattaConfigurationLoader.loadFromPreferences(preferences);
 
-                DataParser<Collection<ManagedRace>> parser = new ManagedRacesDataParser(preferences.getAuthor(),
-                        globalConfiguration, RaceGroupDeserializer.create(domainFactory,
-                                RegattaConfigurationJsonDeserializer.create()));
+                DataParser<Collection<ManagedRace>> parser = new ManagedRacesDataParser(preferences
+                    .getAuthor(), globalConfiguration, RaceGroupDeserializer.create(domainFactory, RegattaConfigurationJsonDeserializer.create()));
                 DataHandler<Collection<ManagedRace>> handler = new ManagedRacesDataHandler(OnlineDataManager.this);
                 List<Util.Pair<String, Object>> params = new ArrayList<>();
                 params.add(new Util.Pair<String, Object>(RaceLogServletConstants.PARAM_COURSE_AREA_FILTER, courseAreaId.toString()));
                 params.add(new Util.Pair<String, Object>(RaceLogServletConstants.PARAMS_CLIENT_UUID, MessageSendingService.uuid));
                 URL url = UrlHelper.generateUrl(preferences.getServerBaseURL(), "/sailingserver/rc/racegroups", params);
-                return new OnlineDataLoader<Collection<ManagedRace>>(context, url, parser, handler);
+                return new OnlineDataLoader<>(context, url, parser, handler);
             }
         }, getContext());
     }
@@ -189,7 +191,7 @@ public class OnlineDataManager extends DataManager {
     @Override
     public LoaderCallbacks<DataLoaderResult<Collection<Mark>>> createMarksLoader(final ManagedRace managedRace,
             LoadClient<Collection<Mark>> callback) {
-        return new DataLoaderCallbacks<Collection<Mark>>(callback, new LoaderCreator<Collection<Mark>>() {
+        return new DataLoaderCallbacks<>(callback, new LoaderCreator<Collection<Mark>>() {
             @Override
             public Loader<DataLoaderResult<Collection<Mark>>> create(int id, Bundle args) throws Exception {
                 ExLog.i(context, TAG, String.format("Creating marks-OnlineDataLoader %d", id));
@@ -208,7 +210,7 @@ public class OnlineDataManager extends DataManager {
                 params.add(new Util.Pair<String, Object>(RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME, raceColumnName));
                 params.add(new Util.Pair<String, Object>(RaceLogServletConstants.PARAMS_RACE_FLEET_NAME, fleetName));
                 URL url = UrlHelper.generateUrl(preferences.getServerBaseURL(), "/sailingserver/rc/marks", params);
-                return new OnlineDataLoader<Collection<Mark>>(context, url, parser, handler);
+                return new OnlineDataLoader<>(context, url, parser, handler);
             }
         }, getContext());
     }
@@ -216,13 +218,11 @@ public class OnlineDataManager extends DataManager {
     @Override
     public LoaderCallbacks<DataLoaderResult<CourseBase>> createCourseLoader(final ManagedRace managedRace,
             LoadClient<CourseBase> callback) {
-        return new DataLoaderCallbacks<CourseBase>(callback, new LoaderCreator<CourseBase>() {
+        return new DataLoaderCallbacks<>(callback, new LoaderCreator<CourseBase>() {
             @Override
             public Loader<DataLoaderResult<CourseBase>> create(int id, Bundle args) throws Exception {
                 ExLog.i(context, TAG, String.format("Creating Course-OnlineDataLoader %d", id));
-                JsonDeserializer<CourseBase> courseBaseDeserializer = new CourseBaseDeserializer(
-                        new WaypointDeserializer(new ControlPointDeserializer(new MarkDeserializer(domainFactory),
-                                new GateDeserializer(domainFactory, new MarkDeserializer(domainFactory)))));
+                JsonDeserializer<CourseBase> courseBaseDeserializer = new CourseBaseDeserializer(new WaypointDeserializer(new ControlPointDeserializer(new MarkDeserializer(domainFactory), new GateDeserializer(domainFactory, new MarkDeserializer(domainFactory)))));
                 DataParser<CourseBase> parser = new CourseBaseParser(courseBaseDeserializer);
                 DataHandler<CourseBase> handler = new CourseBaseHandler(OnlineDataManager.this, managedRace);
 
@@ -238,7 +238,7 @@ public class OnlineDataManager extends DataManager {
                 params.add(new Util.Pair<String, Object>(RaceLogServletConstants.PARAMS_RACE_FLEET_NAME, fleetName));
                 URL url = UrlHelper.generateUrl(preferences.getServerBaseURL(), "/sailingserver/rc/currentcourse", params);
 
-                return new OnlineDataLoader<CourseBase>(context, url, parser, handler);
+                return new OnlineDataLoader<>(context, url, parser, handler);
             }
         }, getContext());
     }
@@ -246,17 +246,13 @@ public class OnlineDataManager extends DataManager {
     @Override
     public LoaderCallbacks<DataLoaderResult<Collection<Competitor>>> createCompetitorsLoader(
             final ManagedRace managedRace, LoadClient<Collection<Competitor>> callback) {
-        return new DataLoaderCallbacks<Collection<Competitor>>(callback, new LoaderCreator<Collection<Competitor>>() {
+        return new DataLoaderCallbacks<>(callback, new LoaderCreator<Collection<Competitor>>() {
             @Override
             public Loader<DataLoaderResult<Collection<Competitor>>> create(int id, Bundle args) throws Exception {
                 ExLog.i(context, TAG, String.format("Creating Competitor-OnlineDataLoader %d", id));
-                JsonDeserializer<Competitor> competitorDeserializer = new CompetitorJsonDeserializer(
-                        domainFactory.getCompetitorStore(), new TeamJsonDeserializer(new PersonJsonDeserializer(
-                                new NationalityJsonDeserializer(domainFactory))), new BoatJsonDeserializer(
-                                new BoatClassJsonDeserializer(domainFactory)));
+                JsonDeserializer<Competitor> competitorDeserializer = new CompetitorJsonDeserializer(domainFactory.getCompetitorStore(), new TeamJsonDeserializer(new PersonJsonDeserializer(new NationalityJsonDeserializer(domainFactory))), new BoatJsonDeserializer(new BoatClassJsonDeserializer(domainFactory)));
                 DataParser<Collection<Competitor>> parser = new CompetitorsDataParser(competitorDeserializer);
-                DataHandler<Collection<Competitor>> handler = new CompetitorsDataHandler(OnlineDataManager.this,
-                        managedRace);
+                DataHandler<Collection<Competitor>> handler = new CompetitorsDataHandler(OnlineDataManager.this, managedRace);
 
                 ManagedRaceIdentifier identifier = managedRace.getIdentifier();
 
@@ -269,7 +265,7 @@ public class OnlineDataManager extends DataManager {
                 params.add(new Util.Pair<String, Object>(RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME, raceColumnName));
                 params.add(new Util.Pair<String, Object>(RaceLogServletConstants.PARAMS_RACE_FLEET_NAME, fleetName));
                 URL url = UrlHelper.generateUrl(preferences.getServerBaseURL(), "/sailingserver/rc/competitors", params);
-                return new OnlineDataLoader<Collection<Competitor>>(context, url, parser, handler);
+                return new OnlineDataLoader<>(context, url, parser, handler);
             }
         }, getContext());
     }
@@ -277,19 +273,17 @@ public class OnlineDataManager extends DataManager {
     @Override
     public LoaderCallbacks<DataLoaderResult<DeviceConfiguration>> createConfigurationLoader(
             final DeviceConfigurationIdentifier identifier, LoadClient<DeviceConfiguration> callback) {
-        return new DataLoaderCallbacks<DeviceConfiguration>(callback, new LoaderCreator<DeviceConfiguration>() {
+        return new DataLoaderCallbacks<>(callback, new LoaderCreator<DeviceConfiguration>() {
             @Override
             public Loader<DataLoaderResult<DeviceConfiguration>> create(int id, Bundle args) throws Exception {
                 ExLog.i(context, TAG, String.format("Creating Configuration-OnlineDataLoader %d", id));
                 DataHandler<DeviceConfiguration> handler = new NullDataHandler<DeviceConfiguration>();
-                DataParser<DeviceConfiguration> parser = new DeviceConfigurationParser(
-                        DeviceConfigurationJsonDeserializer.create());
+                DataParser<DeviceConfiguration> parser = new DeviceConfigurationParser(DeviceConfigurationJsonDeserializer.create());
                 String encodedIdentifier = identifier.getClientIdentifier();
                 List<Util.Pair<String, Object>> params = new ArrayList<>();
                 params.add(new Util.Pair<String, Object>("client", encodedIdentifier));
                 URL url = UrlHelper.generateUrl(preferences.getServerBaseURL(), "/sailingserver/rc/configuration", params);
-                return new OnlineDataLoader<DeviceConfiguration>(context,
-                    url, parser, handler);
+                return new OnlineDataLoader<>(context, url, parser, handler);
             }
         }, getContext());
     }
@@ -325,5 +319,25 @@ public class OnlineDataManager extends DataManager {
         return url;
     }
 
+    @Override
+    public LoaderCallbacks<DataLoaderResult<RaceColumnFactorImpl>> createRaceColumnFactorLoader(LoadClient<RaceColumnFactorImpl> callback) {
+        return new DataLoaderCallbacks<>(callback, new LoaderCreator<RaceColumnFactorImpl>() {
+            @Override
+            public Loader<DataLoaderResult<RaceColumnFactorImpl>> create(int id, Bundle args) throws Exception {
+                if (args == null || args.getString(LEADERBOARD) == null) {
+                    throw new IllegalArgumentException("You need an leaderboard as bundle arg (" + LEADERBOARD + ").");
+                }
+                ExLog.i(context, TAG, String.format("Creating RaceColumnFactorLoader %d", id));
+                DataHandler<RaceColumnFactorImpl> handler = new NullDataHandler<>();
+                DataParser<RaceColumnFactorImpl> parser = new RaceColumnsParser(new RaceColumnFactorJsonDeserializer());
 
+                List<Util.Pair<String, Object>> params = new ArrayList<>();
+                if (args.getString(RACE_COLUMN) != null) {
+                    params.add(new Util.Pair<String, Object>(RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME, args.getString(RACE_COLUMN)));
+                }
+                URL url = UrlHelper.generateUrl(preferences.getServerBaseURL(), "/sailingserver/api/v1/leaderboards/" + args.getString(LEADERBOARD) + "/racecolumnfactors", params);
+                return new OnlineDataLoader<>(context, url, parser, handler);
+            }
+        }, getContext());
+    }
 }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/ReadonlyDataManager.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/ReadonlyDataManager.java
index ea356c3090d..55c638dc39d 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/ReadonlyDataManager.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/ReadonlyDataManager.java
@@ -3,9 +3,6 @@ package com.sap.sailing.racecommittee.app.data;
 import java.io.Serializable;
 import java.util.Collection;
 
-import android.app.LoaderManager;
-import android.app.LoaderManager.LoaderCallbacks;
-
 import com.sap.sailing.domain.base.Competitor;
 import com.sap.sailing.domain.base.CourseArea;
 import com.sap.sailing.domain.base.CourseBase;
@@ -13,12 +10,16 @@ import com.sap.sailing.domain.base.EventBase;
 import com.sap.sailing.domain.base.Mark;
 import com.sap.sailing.domain.base.configuration.DeviceConfiguration;
 import com.sap.sailing.domain.base.configuration.DeviceConfigurationIdentifier;
+import com.sap.sailing.domain.base.impl.RaceColumnFactorImpl;
 import com.sap.sailing.racecommittee.app.data.clients.LoadClient;
 import com.sap.sailing.racecommittee.app.data.loaders.DataLoaderResult;
 import com.sap.sailing.racecommittee.app.domain.CoursePosition;
 import com.sap.sailing.racecommittee.app.domain.ManagedRace;
 import com.sap.sailing.racecommittee.app.ui.fragments.lists.PositionListFragment;
 
+import android.app.LoaderManager;
+import android.app.LoaderManager.LoaderCallbacks;
+
 /**
  * <p>
  * Interface for everything read related when working with data.
@@ -42,7 +43,7 @@ public interface ReadonlyDataManager {
      * 
      * @return the {@link DataStore}.
      */
-    public DataStore getDataStore();
+    DataStore getDataStore();
 
     /**
      * Creates a new {@link LoaderCallbacks} object for loading {@link EventBase}s.
@@ -53,8 +54,7 @@ public interface ReadonlyDataManager {
      *         {@link LoaderManager#initLoader(int, android.os.Bundle, LoaderCallbacks)} or
      *         {@link LoaderManager#restartLoader(int, android.os.Bundle, LoaderCallbacks)}.
      */
-    public LoaderCallbacks<DataLoaderResult<Collection<EventBase>>> createEventsLoader(
-            LoadClient<Collection<EventBase>> callback);
+    LoaderCallbacks<DataLoaderResult<Collection<EventBase>>> createEventsLoader(LoadClient<Collection<EventBase>> callback);
 
     /**
      * Creates a new {@link LoaderCallbacks} object for loading {@link CourseArea}s.
@@ -65,24 +65,20 @@ public interface ReadonlyDataManager {
      *         {@link LoaderManager#initLoader(int, android.os.Bundle, LoaderCallbacks)} or
      *         {@link LoaderManager#restartLoader(int, android.os.Bundle, LoaderCallbacks)}.
      */
-    public LoaderCallbacks<DataLoaderResult<Collection<CourseArea>>> createCourseAreasLoader(
-            Serializable parentEventId, LoadClient<Collection<CourseArea>> callback);
+    LoaderCallbacks<DataLoaderResult<Collection<CourseArea>>> createCourseAreasLoader(Serializable parentEventId,
+        LoadClient<Collection<CourseArea>> callback);
+
+    LoaderCallbacks<DataLoaderResult<Collection<CourseArea>>> createCourseAreasLoader(EventBase parentEvent,
+        LoadClient<Collection<CourseArea>> callback);
 
-    public LoaderCallbacks<DataLoaderResult<Collection<CourseArea>>> createCourseAreasLoader(
-            EventBase parentEvent, LoadClient<Collection<CourseArea>> callback);
-    
-    
     /**
      * Creates a new {@link LoaderCallbacks} object for loading racing referee positions.
      * 
-     * @param callback
-     *            {@link LoadClient} implementing your data handling code.
      * @return {@link LoaderCallbacks} to be used in
      *         {@link LoaderManager#initLoader(int, android.os.Bundle, LoaderCallbacks)} or
      *         {@link LoaderManager#restartLoader(int, android.os.Bundle, LoaderCallbacks)}.
      */
-    public LoaderCallbacks<DataLoaderResult<Collection<CoursePosition>>> createPositionLoader(
-			PositionListFragment positionListFragment);
+    LoaderCallbacks<DataLoaderResult<Collection<CoursePosition>>> createPositionLoader(PositionListFragment positionListFragment);
     
     /**
      * Creates a new {@link LoaderCallbacks} object for loading {@link ManagedRace}s of a specific {@link CourseArea}.
@@ -95,8 +91,8 @@ public interface ReadonlyDataManager {
      *         {@link LoaderManager#initLoader(int, android.os.Bundle, LoaderCallbacks)} or
      *         {@link LoaderManager#restartLoader(int, android.os.Bundle, LoaderCallbacks)}.
      */
-    public LoaderCallbacks<DataLoaderResult<Collection<ManagedRace>>> createRacesLoader(Serializable courseAreaId,
-            LoadClient<Collection<ManagedRace>> callback);
+    LoaderCallbacks<DataLoaderResult<Collection<ManagedRace>>> createRacesLoader(Serializable courseAreaId,
+        LoadClient<Collection<ManagedRace>> callback);
 
     /**
      * Creates a new {@link LoaderCallbacks} object for loading a race's {@link Mark}s.
@@ -109,8 +105,7 @@ public interface ReadonlyDataManager {
      *         {@link LoaderManager#initLoader(int, android.os.Bundle, LoaderCallbacks)} or
      *         {@link LoaderManager#restartLoader(int, android.os.Bundle, LoaderCallbacks)}.
      */
-    public LoaderCallbacks<DataLoaderResult<Collection<Mark>>> createMarksLoader(ManagedRace managedRace,
-            LoadClient<Collection<Mark>> callback);
+    LoaderCallbacks<DataLoaderResult<Collection<Mark>>> createMarksLoader(ManagedRace managedRace, LoadClient<Collection<Mark>> callback);
 
     /**
      * Creates a new {@link LoaderCallbacks} object for loading a race's {@link CourseBase}.
@@ -123,8 +118,7 @@ public interface ReadonlyDataManager {
      *         {@link LoaderManager#initLoader(int, android.os.Bundle, LoaderCallbacks)} or
      *         {@link LoaderManager#restartLoader(int, android.os.Bundle, LoaderCallbacks)}.
      */
-    public LoaderCallbacks<DataLoaderResult<CourseBase>> createCourseLoader(ManagedRace managedRace,
-            LoadClient<CourseBase> callback);
+    LoaderCallbacks<DataLoaderResult<CourseBase>> createCourseLoader(ManagedRace managedRace, LoadClient<CourseBase> callback);
 
     /**
      * Creates a new {@link LoaderCallbacks} object for loading {@link Competitor}s.
@@ -135,8 +129,8 @@ public interface ReadonlyDataManager {
      *         {@link LoaderManager#initLoader(int, android.os.Bundle, LoaderCallbacks)} or
      *         {@link LoaderManager#restartLoader(int, android.os.Bundle, LoaderCallbacks)}.
      */
-    public LoaderCallbacks<DataLoaderResult<Collection<Competitor>>> createCompetitorsLoader(ManagedRace managedRace,
-            LoadClient<Collection<Competitor>> callback);
+    LoaderCallbacks<DataLoaderResult<Collection<Competitor>>> createCompetitorsLoader(ManagedRace managedRace,
+        LoadClient<Collection<Competitor>> callback);
     
     /**
      * Creates a new {@link LoaderCallbacks} object for loading a client's configuration.
@@ -147,8 +141,22 @@ public interface ReadonlyDataManager {
      *         {@link LoaderManager#initLoader(int, android.os.Bundle, LoaderCallbacks)} or
      *         {@link LoaderManager#restartLoader(int, android.os.Bundle, LoaderCallbacks)}.
      */
-    public LoaderCallbacks<DataLoaderResult<DeviceConfiguration>> createConfigurationLoader(DeviceConfigurationIdentifier identifier,
-            LoadClient<DeviceConfiguration> callback);
+    LoaderCallbacks<DataLoaderResult<DeviceConfiguration>> createConfigurationLoader(DeviceConfigurationIdentifier identifier,
+        LoadClient<DeviceConfiguration> callback);
 
-    public String getMapUrl(String baseUrl, ManagedRace race, String eventId, boolean showWindCharts, boolean showStreamlets, boolean showSimulation, boolean showMapControls);
+    String getMapUrl(String baseUrl, ManagedRace race, String eventId, boolean showWindCharts, boolean showStreamlets, boolean showSimulation,
+        boolean showMapControls);
+
+    /**
+     * Create a new {@link LoaderCallbacks} object for loading the race columns (e.g. factors)
+     *
+     * @param leaderboard
+     * @param race_column
+     * @param callback
+     *
+     * @return {@link LoaderCallbacks} to be used in
+     *         {@link LoaderManager#initLoader(int, android.os.Bundle, LoaderCallbacks)} or
+     *         {@link LoaderManager#restartLoader(int, android.os.Bundle, LoaderCallbacks)}.
+     */
+    LoaderCallbacks<DataLoaderResult<RaceColumnFactorImpl>> createRaceColumnFactorLoader(LoadClient<RaceColumnFactorImpl> callback);
 }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/ManagedRacesDataParser.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/ManagedRacesDataParser.java
index 5b1b27ff356..dd12e0090eb 100755
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/ManagedRacesDataParser.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/ManagedRacesDataParser.java
@@ -61,7 +61,7 @@ public class ManagedRacesDataParser implements DataParser<Collection<ManagedRace
             for (RaceRow raceRow : series.getRaceRows()) {
                 Fleet fleet = raceRow.getFleet();
                 for (RaceCell cell : raceRow.getCells()) {
-                    ManagedRace race = createManagedRace(raceGroup, series, fleet, cell.getName(), cell.getRaceLog());
+                    ManagedRace race = createManagedRace(raceGroup, series, fleet, cell.getName(), cell.getRaceLog(), cell.getFactor(), cell.getExplicitFactor());
                     target.add(race);
                 }
             }
@@ -69,7 +69,7 @@ public class ManagedRacesDataParser implements DataParser<Collection<ManagedRace
     }
 
     private ManagedRace createManagedRace(RaceGroup raceGroup, SeriesBase series, Fleet fleet, String name,
-            RaceLog raceLog) {
+            RaceLog raceLog, double factor, Double explicitFactor) {
         ConfigurationLoader<RegattaConfiguration> configurationLoader = globalConfigurationLoader;
         RegattaConfiguration localConfiguration = raceGroup.getRegattaConfiguration();
         if (localConfiguration != null) {
@@ -77,7 +77,7 @@ public class ManagedRacesDataParser implements DataParser<Collection<ManagedRace
         }
         FleetIdentifier fleetIdentifier = new FleetIdentifierImpl(fleet, series, raceGroup);
         ManagedRaceIdentifier identifier = new ManagedRaceIdentifierImpl(name, fleetIdentifier);
-        return new ManagedRaceImpl(identifier, new ManagedRaceCalculator(raceLog, author, configurationLoader));
+        return new ManagedRaceImpl(identifier, new ManagedRaceCalculator(raceLog, author, configurationLoader), factor, explicitFactor);
     }
 
 }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/RaceColumnsParser.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/RaceColumnsParser.java
new file mode 100644
index 00000000000..bdc72e39f75
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/RaceColumnsParser.java
@@ -0,0 +1,26 @@
+package com.sap.sailing.racecommittee.app.data.parsers;
+
+import java.io.Reader;
+
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+
+import com.sap.sailing.domain.base.impl.RaceColumnFactorImpl;
+import com.sap.sailing.server.gateway.deserialization.impl.Helpers;
+import com.sap.sailing.server.gateway.deserialization.impl.RaceColumnFactorJsonDeserializer;
+
+public class RaceColumnsParser implements DataParser<RaceColumnFactorImpl> {
+
+    private RaceColumnFactorJsonDeserializer deserializer;
+
+    public RaceColumnsParser(RaceColumnFactorJsonDeserializer deserializer) {
+        this.deserializer = deserializer;
+    }
+
+    @Override
+    public RaceColumnFactorImpl parse(Reader reader) throws Exception {
+        Object parsedResult = JSONValue.parseWithException(reader);
+        JSONObject jsonObject = Helpers.toJSONObjectSafe(parsedResult);
+        return deserializer.deserialize(jsonObject);
+    }
+}
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/ManagedRace.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/ManagedRace.java
index 034693ee1ea..7743e00baac 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/ManagedRace.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/ManagedRace.java
@@ -104,4 +104,19 @@ public interface ManagedRace extends ManagedRaceIdentifier, Named, WithID {
      * @return result object
      */
     Result setFinishingTime(TimePoint finishingTime);
+
+    /**
+     * @return
+     */
+    double getFactor();
+
+    /**
+     * @return factor
+     */
+    Double getExplicitFactor();
+
+    /**
+     * @param factor
+     */
+    void setExplicitFactor(Double factor);
 }
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceImpl.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceImpl.java
index 3bb40859a56..009be0cf918 100755
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceImpl.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceImpl.java
@@ -31,18 +31,24 @@ public class ManagedRaceImpl implements ManagedRace {
     private List<MapMarker> mapMarkers;
     private CourseBase courseOnServer;
     private ManagedRaceCalculator calculator;
+    private double factor;
+    private Double explicitFactor;
 
-    public ManagedRaceImpl(ManagedRaceIdentifier identifier, RaceState state) {
-        this.state = state;
+    private ManagedRaceImpl(ManagedRaceIdentifier identifier, double factor, Double explicitFactor) {
         this.identifier = identifier;
         this.competitors = new ArrayList<>();
         this.courseOnServer = null;
+        this.factor = factor;
+        this.explicitFactor = explicitFactor;
     }
 
-    public ManagedRaceImpl(ManagedRaceIdentifier identifier, ManagedRaceCalculator calculator) {
-        this.identifier = identifier;
-        this.competitors = new ArrayList<>();
-        this.courseOnServer = null;
+    public ManagedRaceImpl(ManagedRaceIdentifier identifier, RaceState state) {
+        this(identifier, 0, null);
+        this.state = state;
+    }
+
+    public ManagedRaceImpl(ManagedRaceIdentifier identifier, ManagedRaceCalculator calculator, double factor, Double explicitFactor) {
+        this(identifier, factor, explicitFactor);
         this.calculator = calculator;
     }
 
@@ -177,6 +183,20 @@ public class ManagedRaceImpl implements ManagedRace {
         return result;
     }
 
+    public double getFactor() {
+        return factor;
+    }
+
+    @Override
+    public Double getExplicitFactor() {
+        return explicitFactor;
+    }
+
+    @Override
+    public void setExplicitFactor(Double factor) {
+        this.explicitFactor = factor;
+    }
+
     @Override
     public String toString() {
         return "ManagedRaceImpl [identifier=" + identifier + "]";
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/polling/RaceLogPollerTask.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/polling/RaceLogPollerTask.java
index f17f26ef7e6..10f24c58fa7 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/polling/RaceLogPollerTask.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/polling/RaceLogPollerTask.java
@@ -34,7 +34,7 @@ public class RaceLogPollerTask extends AsyncTask<Util.Pair<String, URL>, Polling
                 return null;
             }
             
-            HttpRequest request = new HttpJsonPostRequest(query.getB(), context);
+            HttpRequest request = new HttpJsonPostRequest(context, query.getB());
             InputStream responseStream = null;
             try {
                 responseStream = request.execute();
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/polling/RacePositionsPollerTask.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/polling/RacePositionsPollerTask.java
index 02d45daff17..504dd57216b 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/polling/RacePositionsPollerTask.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/polling/RacePositionsPollerTask.java
@@ -29,7 +29,7 @@ public class RacePositionsPollerTask extends AsyncTask<Util.Pair<String, URL>, P
                 return null;
             }
 
-            HttpRequest request = new HttpJsonGetRequest(query.getB(), context);
+            HttpRequest request = new HttpJsonGetRequest(context, query.getB());
             try {
                 InputStream responseStream = request.execute();
                 publishProgress(new PollingResult(true,
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
index fef49404e35..f3132b12290 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
@@ -84,7 +84,7 @@ public class LoginActivity extends BaseActivity
 
     // FIXME weird data redundancy by using different field for setting values makes everything so complex and buggy
     private String eventName = null;
-    private String courseName = null;
+    private String courseAreaName = null;
     private String positionName = null;
 
     private Serializable mSelectedEventId;
@@ -149,7 +149,7 @@ public class LoginActivity extends BaseActivity
             sign_in.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    ExLog.i(LoginActivity.this, TAG, "Logged in: " + eventName + " - " + courseName + " - " + positionName);
+                    ExLog.i(LoginActivity.this, TAG, "Logged in: " + eventName + " - " + courseAreaName + " - " + positionName);
                     login();
                 }
             });
@@ -199,19 +199,19 @@ public class LoginActivity extends BaseActivity
     }
 
     private void selectCourseArea(CourseArea courseArea) {
-        courseName = courseArea.getName();
+        courseAreaName = courseArea.getName();
         mSelectedCourseAreaUUID = courseArea.getId();
-        loginListViews.getAreaContainer().setHeaderText(courseName);
+        loginListViews.getCourseAreaContainer().setHeaderText(courseAreaName);
     }
 
     private boolean isCourseAreaSelected() {
-        return (courseName != null && mSelectedCourseAreaUUID != null);
+        return (courseAreaName != null && mSelectedCourseAreaUUID != null);
     }
 
     private void resetCourseArea() {
-        courseName = null;
+        courseAreaName = null;
         mSelectedCourseAreaUUID = null;
-        loginListViews.getAreaContainer().setHeaderText("");
+        loginListViews.getCourseAreaContainer().setHeaderText("");
         resetPosition();
     }
 
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
index d5edaf27b80..2b42456bd8f 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
@@ -87,6 +87,7 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
     private static final String RACE = "race";
 
     private static final int RacesLoaderId = 2;
+
     private ProgressBar mProgressSpinner;
 
     private IntentReceiver mReceiver;
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/racelist/ManagedRaceListAdapter.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/racelist/ManagedRaceListAdapter.java
index f394e0fdc55..55fbd28f6d9 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/racelist/ManagedRaceListAdapter.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/racelist/ManagedRaceListAdapter.java
@@ -1,5 +1,6 @@
 package com.sap.sailing.racecommittee.app.ui.adapters.racelist;
 
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.List;
 
@@ -71,7 +72,9 @@ public class ManagedRaceListAdapter extends ArrayAdapter<RaceListDataType> imple
     private RaceListDataType mSelectedRace;
     private ViewGroup panel_left;
     private ViewGroup panel_right;
+    private TextView explicit_factor;
     private int flag_size;
+    private DecimalFormat factor_format;
 
     public ManagedRaceListAdapter(Context context, List<RaceListDataType> viewItems) {
         super(context, 0);
@@ -82,6 +85,7 @@ public class ManagedRaceListAdapter extends ArrayAdapter<RaceListDataType> imple
         mResources = getContext().getResources();
         dateFormat = new SimpleDateFormat("kk:mm", getContext().getResources().getConfiguration().locale);
         flag_size = getContext().getResources().getInteger(R.integer.flag_size);
+        factor_format = new DecimalFormat(context.getString(R.string.race_factor_format));
     }
 
     @Override
@@ -220,6 +224,12 @@ public class ManagedRaceListAdapter extends ArrayAdapter<RaceListDataType> imple
                 }
             }
 
+            Double factor = race.getRace().getExplicitFactor();
+            if (factor != null) {
+                explicit_factor.setText(factor_format.format(factor));
+                explicit_factor.setVisibility(View.VISIBLE);
+            }
+
             updateFlag(race.getRace(), now);
         }
         return convertView;
@@ -279,6 +289,7 @@ public class ManagedRaceListAdapter extends ArrayAdapter<RaceListDataType> imple
         fleet_series = ViewHelper.get(layout, R.id.fleet_series);
         has_dependent_races = ViewHelper.get(layout, R.id.has_dependent_races);
         depends_on = ViewHelper.get(layout, R.id.depends_on);
+        explicit_factor = ViewHelper.get(layout, R.id.explicit_factor);
     }
 
     private void resetValues(View layout) {
@@ -320,6 +331,9 @@ public class ManagedRaceListAdapter extends ArrayAdapter<RaceListDataType> imple
                 depends_on.setTextColor(ThemeHelper.getColor(getContext(), R.attr.sap_light_gray));
                 depends_on.setVisibility(View.GONE);
             }
+            if (explicit_factor != null) {
+                explicit_factor.setVisibility(View.GONE);
+            }
             setMarker(0);
         }
     }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginListViews.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginListViews.java
index b03d1a6d4f0..1a65ad0de6c 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginListViews.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginListViews.java
@@ -30,7 +30,7 @@ public class LoginListViews extends LoggableDialogFragment implements View.OnCli
     private IntentListener mListener;
 
     private ToggleContainer mEventContainer;
-    private ToggleContainer mAreaContainer;
+    private ToggleContainer mCourseAreaContainer;
     private ToggleContainer mPositionContainer;
 
     public LoginListViews() {
@@ -41,8 +41,8 @@ public class LoginListViews extends LoggableDialogFragment implements View.OnCli
         return mEventContainer;
     }
 
-    public ToggleContainer getAreaContainer() {
-        return mAreaContainer;
+    public ToggleContainer getCourseAreaContainer() {
+        return mCourseAreaContainer;
     }
 
     public ToggleContainer getPositionContainer() {
@@ -65,7 +65,7 @@ public class LoginListViews extends LoggableDialogFragment implements View.OnCli
         TextView area_text = ViewHelper.get(view, R.id.selected_area);
         ArrayList<View> above_area = new ArrayList<>();
         above_area.add(event_layout);
-        mAreaContainer = new ToggleContainer(view, area_fragment, area_header, area_text, above_area);
+        mCourseAreaContainer = new ToggleContainer(view, area_fragment, area_header, area_text, above_area);
 
         FrameLayout position_fragment = ViewHelper.get(view, R.id.position_fragment);
         RelativeLayout position_header = ViewHelper.get(view, R.id.position_header);
@@ -90,9 +90,6 @@ public class LoginListViews extends LoggableDialogFragment implements View.OnCli
         if (mSignUp != null) {
             mSignUp.setOnClickListener(this);
         }
-
-//        onClick(event_header);
-
         return view;
     }
 
@@ -118,7 +115,7 @@ public class LoginListViews extends LoggableDialogFragment implements View.OnCli
 
         switch (view.getId()) {
             case R.id.event_header:
-                mAreaContainer.close();
+                mCourseAreaContainer.close();
                 mPositionContainer.close();
                 mEventContainer.toggle();
                 break;
@@ -126,12 +123,12 @@ public class LoginListViews extends LoggableDialogFragment implements View.OnCli
             case R.id.area_header:
                 mEventContainer.close();
                 mPositionContainer.close();
-                mAreaContainer.toggle();
+                mCourseAreaContainer.toggle();
                 break;
 
             case R.id.position_header:
                 mEventContainer.close();
-                mAreaContainer.close();
+                mCourseAreaContainer.close();
                 mPositionContainer.toggle();
                 break;
 
@@ -144,14 +141,14 @@ public class LoginListViews extends LoggableDialogFragment implements View.OnCli
 
     public void closeAll() {
         mEventContainer.close();
-        mAreaContainer.close();
+        mCourseAreaContainer.close();
         mPositionContainer.close();
         showButton();
     }
 
     private void showButton() {
         mSignUp.setVisibility(View.GONE);
-        if (mEventContainer.isClosed() && mAreaContainer.isClosed() && mPositionContainer.isClosed()) {
+        if (mEventContainer.isClosed() && mCourseAreaContainer.isClosed() && mPositionContainer.isClosed()) {
             mSignUp.setVisibility(View.VISIBLE);
         }
     }
@@ -246,7 +243,7 @@ public class LoginListViews extends LoggableDialogFragment implements View.OnCli
                         onClick(mEventContainer.getHeader());
                     }
                     if (AppConstants.INTENT_ACTION_TOGGLE_AREA.equals(data)) {
-                        onClick(mAreaContainer.getHeader());
+                        onClick(mCourseAreaContainer.getHeader());
                     }
                     if (AppConstants.INTENT_ACTION_TOGGLE_POSITION.equals(data)) {
                         onClick(mPositionContainer.getHeader());
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/SetupPanelFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/SetupPanelFragment.java
index 44494805647..a2f7f97ca6f 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/SetupPanelFragment.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/SetupPanelFragment.java
@@ -1,5 +1,7 @@
 package com.sap.sailing.racecommittee.app.ui.fragments.panels;
 
+import java.text.DecimalFormat;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -28,6 +30,7 @@ import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.CourseFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.GateStartPathFinderFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.GateStartTimingFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.LineStartModeFragment;
+import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.RaceFactorFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.StartProcedureFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.WindFragment;
 import com.sap.sailing.racecommittee.app.ui.utils.FlagsResources;
@@ -48,9 +51,12 @@ public class SetupPanelFragment extends BasePanelFragment {
     private PanelButton mButtonPathfinder;
     private PanelButton mButtonTiming;
     private PanelButton mButtonRaceGroup;
+    private PanelButton mButtonFactor;
     private PanelButton mButtonCourse;
     private PanelButton mButtonWind;
 
+    private DecimalFormat mFactorFormat;
+
     public SetupPanelFragment() {
         mReceiver = new IntentReceiver();
     }
@@ -74,6 +80,8 @@ public class SetupPanelFragment extends BasePanelFragment {
                 layout = inflater.inflate(R.layout.race_panel_setup, container, false);
         }
 
+        mFactorFormat = new DecimalFormat(container.getContext().getString(R.string.race_factor_format));
+
         mStateListener = new RaceStateChangedListener();
         mProcedureListener = new RaceProcedureChangedListener();
 
@@ -102,6 +110,11 @@ public class SetupPanelFragment extends BasePanelFragment {
             mButtonRaceGroup.setListener(new ButtonRaceGroupListener());
         }
 
+        mButtonFactor = ViewHelper.get(layout, R.id.button_factor);
+        if (mButtonFactor != null) {
+            mButtonFactor.setListener(new ButtonFactorListener());
+        }
+
         mButtonCourse = ViewHelper.get(layout, R.id.button_course);
         if (mButtonCourse != null) {
             mButtonCourse.setListener(new ButtonCourseListener());
@@ -128,6 +141,7 @@ public class SetupPanelFragment extends BasePanelFragment {
         IntentFilter filter = new IntentFilter();
         filter.addAction(AppConstants.INTENT_ACTION_TOGGLE);
         filter.addAction(AppConstants.INTENT_ACTION_CLEAR_TOGGLE);
+        filter.addAction(AppConstants.INTENT_ACTION_UPDATE_SCREEN);
         LocalBroadcastManager.getInstance(getActivity()).registerReceiver(mReceiver, filter);
 
         sendIntent(AppConstants.INTENT_ACTION_CLEAR_TOGGLE);
@@ -188,6 +202,15 @@ public class SetupPanelFragment extends BasePanelFragment {
             }
         }
 
+        if (mButtonFactor != null) {
+            mButtonFactor.setVisibility(preferences.isRaceFactorChangeAllow() ? View.VISIBLE : View.GONE);
+            if (getRace().getExplicitFactor() != null) {
+                mButtonFactor.setPanelText(mFactorFormat.format(getRace().getExplicitFactor()));
+            } else {
+                mButtonFactor.setPanelText(null);
+            }
+        }
+
         if (mButtonCourse != null) {
             mButtonCourse.setPanelText(getCourseName());
         }
@@ -332,11 +355,14 @@ public class SetupPanelFragment extends BasePanelFragment {
                 resetFragment(mButtonTiming.isLocked(), getFrameId(getActivity(), R.id.race_edit, R.id.race_content, false), GateStartTimingFragment.class);
                 mButtonTiming.setMarkerLevel(PanelButton.LEVEL_NORMAL);
             }
+            if (mButtonFactor != null && !mButtonFactor.equals(view)) {
+                resetFragment(mButtonFactor.isLocked(), getFrameId(getActivity(), R.id.race_edit, R.id.race_content, false), RaceFactorFragment.class);
+                mButtonFactor.setMarkerLevel(PanelButton.LEVEL_NORMAL);
+            }
             if (mButtonCourse != null && !mButtonCourse.equals(view)) {
                 resetFragment(mButtonCourse.isLocked(), getFrameId(getActivity(), R.id.race_edit, R.id.race_content, false), CourseFragment.class);
                 mButtonCourse.setMarkerLevel(PanelButton.LEVEL_NORMAL);
             }
-
             if (mButtonWind != null && !mButtonWind.equals(view)) {
                 resetFragment(mButtonWind.isLocked(), getFrameId(getActivity(), R.id.race_edit, R.id.race_content, false), WindFragment.class);
                 mButtonWind.setMarkerLevel(PanelButton.LEVEL_NORMAL);
@@ -423,7 +449,7 @@ public class SetupPanelFragment extends BasePanelFragment {
 
         @Override
         public void onChangedSwitch(PanelButton view, boolean isChecked) {
-
+            // no-op
         }
     }
 
@@ -524,6 +550,33 @@ public class SetupPanelFragment extends BasePanelFragment {
         }
     }
 
+    private class ButtonFactorListener implements PanelButton.PanelButtonClick {
+        private final String TAG = ButtonFactorListener.class.getName();
+
+        @Override
+        public void onClick(PanelButton view) {
+            sendIntent(AppConstants.INTENT_ACTION_TOGGLE, AppConstants.INTENT_ACTION_EXTRA, AppConstants.INTENT_ACTION_TOGGLE_FACTOR);
+            switch (view.toggleMarker()) {
+                case LEVEL_NORMAL:
+                    sendIntent(AppConstants.INTENT_ACTION_SHOW_MAIN_CONTENT);
+                    break;
+
+                case LEVEL_TOGGLED:
+                    replaceFragment(RaceFactorFragment.newInstance(BaseFragment.START_MODE_PLANNED));
+                    break;
+
+                default:
+                    ExLog.i(getActivity(), TAG, "Unknown return value");
+            }
+            view.disableToggle();
+        }
+
+        @Override
+        public void onChangedSwitch(PanelButton view, boolean isChecked) {
+            // no-op
+        }
+    }
+
     private class ButtonCourseListener implements PanelButton.PanelButtonClick {
         private final String TAG = ButtonCourseListener.class.getName();
 
@@ -536,7 +589,7 @@ public class SetupPanelFragment extends BasePanelFragment {
                     break;
 
                 case LEVEL_TOGGLED:
-                    replaceFragment(CourseFragment.newInstance(BaseFragment.START_MODE_PLANNED, getRace(), getActivity()));
+                    replaceFragment(CourseFragment.newInstance(BaseFragment.START_MODE_PLANNED, getRace()));
                     break;
 
                 default:
@@ -598,6 +651,8 @@ public class SetupPanelFragment extends BasePanelFragment {
                         uncheckMarker(mButtonPathfinder);
                     } else if (AppConstants.INTENT_ACTION_TOGGLE_PROCEDURE_MORE_TIMING.equals(data)) {
                         uncheckMarker(mButtonTiming);
+                    } else if (AppConstants.INTENT_ACTION_TOGGLE_FACTOR.equals(data)) {
+                        uncheckMarker(mButtonFactor);
                     } else if (AppConstants.INTENT_ACTION_TOGGLE_COURSE.equals(data)) {
                         uncheckMarker(mButtonCourse);
                     } else if (AppConstants.INTENT_ACTION_TOGGLE_WIND.equals(data)) {
@@ -607,6 +662,10 @@ public class SetupPanelFragment extends BasePanelFragment {
                     }
                 }
             }
+
+            if (AppConstants.INTENT_ACTION_UPDATE_SCREEN.equals(action)) {
+                refreshPanel();
+            }
         }
     }
 }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/CourseFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/CourseFragment.java
index db87e2e47e8..9b0e0223030 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/CourseFragment.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/CourseFragment.java
@@ -1,6 +1,5 @@
 package com.sap.sailing.racecommittee.app.ui.fragments.raceinfo;
 
-import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
 
@@ -14,7 +13,7 @@ import com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout;
 
 public abstract class CourseFragment extends BaseFragment {
 
-    public static RaceFragment newInstance(@START_MODE_VALUES int startMode, ManagedRace race, Context context) {
+    public static RaceFragment newInstance(@START_MODE_VALUES int startMode, ManagedRace race) {
         CourseDesignerMode mode = race.getState().getConfiguration().getDefaultCourseDesignerMode();
 
         RaceFragment fragment;
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MainScheduleFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MainScheduleFragment.java
index ff1c748ea96..4c4110270c5 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MainScheduleFragment.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MainScheduleFragment.java
@@ -120,11 +120,25 @@ public class MainScheduleFragment extends BaseFragment implements View.OnClickLi
         }
     }
 
+    // TODO bug 1267: @Peter, what about this method?
+    private void initFactor() {
+        if (preferences.isRaceFactorChangeAllow()) {
+            Runnable runnable = new Runnable() {
+                @Override
+                public void run() {
+                    openFragment(RaceFactorFragment.newInstance(START_MODE_PRESETUP));
+                }
+            };
+            SelectionItem factorItem = new SelectionItem(getString(R.string.race_factor), null, null, false, false, runnable);
+            mItems.add(factorItem);
+        }
+    }
+
     private void initCourse() {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
-                openFragment(CourseFragment.newInstance(START_MODE_PRESETUP, getRace(), getActivity()));
+                openFragment(CourseFragment.newInstance(START_MODE_PRESETUP, getRace()));
             }
         };
         SelectionItem courseItem = new SelectionItem(getString(R.string.course), null, null, false, false, runnable);
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/RaceFactorFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/RaceFactorFragment.java
new file mode 100644
index 00000000000..3cadc592580
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/RaceFactorFragment.java
@@ -0,0 +1,121 @@
+package com.sap.sailing.racecommittee.app.ui.fragments.raceinfo;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
+import java.util.UUID;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.sap.sailing.android.shared.services.sending.MessageSendingService;
+import com.sap.sailing.android.shared.util.AppUtils;
+import com.sap.sailing.android.shared.util.BroadcastManager;
+import com.sap.sailing.android.shared.util.ViewHelper;
+import com.sap.sailing.domain.common.impl.RaceColumnConstants;
+import com.sap.sailing.domain.common.racelog.RaceLogServletConstants;
+import com.sap.sailing.racecommittee.app.AppConstants;
+import com.sap.sailing.racecommittee.app.R;
+import com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout;
+
+public class RaceFactorFragment extends BaseFragment implements View.OnClickListener {
+
+    private static final String TAG = RaceFactorFragment.class.getName();
+
+    private HeaderLayout mHeader;
+    private EditText mFactor;
+
+    public static RaceFactorFragment newInstance(@START_MODE_VALUES int startMode) {
+        RaceFactorFragment fragment = new RaceFactorFragment();
+        Bundle args = new Bundle();
+        args.putInt(START_MODE, startMode);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final View layout = LayoutInflater.from(getActivity()).inflate(R.layout.race_column_factor, container, false);
+
+        mHeader = ViewHelper.get(layout, R.id.header);
+        if (mHeader != null) {
+            mHeader.setHeaderOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    goHome();
+                }
+            });
+        }
+
+        mFactor = ViewHelper.get(layout, R.id.column_factor);
+
+        Button button = ViewHelper.get(layout, R.id.set_column_factor);
+        if (button != null) {
+            button.setOnClickListener(this);
+        }
+
+        return layout;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        if (getView() != null && getArguments() != null) {
+            switch (getArguments().getInt(START_MODE, START_MODE_PRESETUP)) {
+                case START_MODE_PLANNED:
+                    if (AppUtils.with(getActivity()).isLand()) {
+                        mHeader.setVisibility(View.GONE);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        if (mFactor != null) {
+            DecimalFormat format = new DecimalFormat("#.####", new DecimalFormatSymbols(Locale.US));
+            String explicitFactor = null;
+            if (getRace().getExplicitFactor() != null) {
+                explicitFactor = format.format(getRace().getExplicitFactor());
+            }
+            mFactor.setText(explicitFactor);
+        }
+    }
+
+    @Override
+    public void onClick(final View v) {
+        final String factor = mFactor.getText().toString();
+        Uri.Builder uri = Uri.parse(preferences.getServerBaseURL()).buildUpon();
+        uri.appendPath("sailingserver");
+        uri.appendPath("api");
+        uri.appendPath("v1");
+        uri.appendPath("leaderboards");
+        uri.appendPath(getRace().getRaceGroup().getName());
+        uri.appendPath("racecolumnfactors");
+        uri.appendQueryParameter(RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME, getRace().getName());
+        uri.appendQueryParameter(RaceColumnConstants.EXPLICIT_FACTOR, factor);
+
+        getActivity().startService(MessageSendingService.createMessageIntent(getActivity(), uri.toString(), null, UUID.randomUUID(), "{}", null));
+
+        if (!TextUtils.isEmpty(factor)) {
+            getRace().setExplicitFactor(Double.parseDouble(factor));
+        } else {
+            getRace().setExplicitFactor(null);
+        }
+
+        if (isAdded()) {
+            BroadcastManager.getInstance(getActivity()).addIntent(new Intent(AppConstants.INTENT_ACTION_CLEAR_TOGGLE));
+            BroadcastManager.getInstance(getActivity()).addIntent(new Intent(AppConstants.INTENT_ACTION_SHOW_MAIN_CONTENT));
+            BroadcastManager.getInstance(getActivity()).addIntent(new Intent(AppConstants.INTENT_ACTION_UPDATE_SCREEN));
+        }
+    }
+}
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/views/PanelButton.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/views/PanelButton.java
index 7832810898f..825badf881e 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/views/PanelButton.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/views/PanelButton.java
@@ -85,6 +85,8 @@ public class PanelButton extends FrameLayout implements View.OnClickListener, Di
         setLinePosition(a.getInt(R.styleable.PanelButton_linePosition, -1));
 
         a.recycle();
+
+        setMarkerLevel(LEVEL_NORMAL);
     }
 
     public void setListener(PanelButtonClick listener) {