diff --git a/libretroshare/src/pqi/pqihandler.cc b/libretroshare/src/pqi/pqihandler.cc
index 8fdb5fe81..882a1b773 100644
--- a/libretroshare/src/pqi/pqihandler.cc
+++ b/libretroshare/src/pqi/pqihandler.cc
@@ -30,6 +30,7 @@
 
 #include <sstream>
 #include "util/rsdebug.h"
+#include <stdlib.h>
 const int pqihandlerzone = 34283;
 
 /****
@@ -553,184 +554,99 @@ int     pqihandler::UpdateRates()
 	float avail_in = getMaxRate(true);
 	float avail_out = getMaxRate(false);
 
-	float avg_rate_in = avail_in/num_sm;
-	float avg_rate_out = avail_out/num_sm;
-
-	float indiv_in = getMaxIndivRate(true);
-	float indiv_out = getMaxIndivRate(false);
-
 	float used_bw_in = 0;
 	float used_bw_out = 0;
 
-	float extra_bw_in = 0;
-	float extra_bw_out = 0;
-
-	int maxxed_in = 0;
-	int maxxed_out = 0;
-
 	/* Lock once rates have been retrieved */
 	RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
 
-	// loop through modules....
+	int effectiveUploadsSm = 0;
+	int effectiveDownloadsSm = 0;
+	// loop through modules to get the used bandwith and the number of modules that are affectively transfering
+	//std::cerr << " Looping through modules" << std::endl;
 	for(it = mods.begin(); it != mods.end(); it++)
 	{
 		SearchModule *mod = (it -> second);
 		float crate_in = mod -> pqi -> getRate(true);
+		if (crate_in > 0.01 * avail_in || crate_in > 0.1)
+		{
+		    effectiveDownloadsSm ++;
+		}
+
 		float crate_out = mod -> pqi -> getRate(false);
+		if (crate_out > 0.01 * avail_out || crate_out > 0.1)
+		{
+		    effectiveUploadsSm ++;
+		}
 
 		used_bw_in += crate_in;
 		used_bw_out += crate_out;
-
-		if (crate_in > avg_rate_in)
-		{
-			if (mod -> pqi -> getMaxRate(true) == indiv_in)
-			{
-				maxxed_in++;
-			}
-			extra_bw_in +=  crate_in - avg_rate_in;
-		}
-		if (crate_out > avg_rate_out)
-		{
-			if (mod -> pqi -> getMaxRate(false) == indiv_out)
-			{
-				maxxed_out++;
-			}
-			extra_bw_out +=  crate_out - avg_rate_out;
-		}
-		//std::cerr << "\tSM(" << mod -> smi << ")";
-		//std::cerr << "In A: " << mod -> pqi -> getMaxRate(true);
-		//std::cerr << " C: " << crate_in;
-		//std::cerr << " && Out A: " << mod -> pqi -> getMaxRate(false);
-		//std::cerr << " C: " << crate_out << std::endl;
 	}
-	//std::cerr << "Totals (In) Used B/W " << used_bw_in;
-	//std::cerr << " Excess B/W " << extra_bw_in;
-	//std::cerr << " Available B/W " << avail_in << std::endl;
-	//std::cerr << "Totals (Out) Used B/W " << used_bw_out;
-	//std::cerr << " Excess B/W " << extra_bw_out;
-	//std::cerr << " Available B/W " << avail_out << std::endl;
+//	std::cerr << "Totals (In) Used B/W " << used_bw_in;
+//	std::cerr << " Available B/W " << avail_in;
+//	std::cerr << " Effective transfers " << effectiveDownloadsSm << std::endl;
+//	std::cerr << "Totals (Out) Used B/W " << used_bw_out;
+//	std::cerr << " Available B/W " << avail_out;
+//	std::cerr << " Effective transfers " << effectiveUploadsSm << std::endl;
 
 	locked_StoreCurrentRates(used_bw_in, used_bw_out);
 
-	if (used_bw_in > avail_in)
-	{
-		//std::cerr << "Decreasing Incoming B/W!" << std::endl;
-
-		// drop all above the avg down!
-		float fchg = (used_bw_in - avail_in) / (float) extra_bw_in;
-		for(it = mods.begin(); it != mods.end(); it++)
-		{
-			SearchModule *mod = (it -> second);
-			float crate_in = mod -> pqi -> getRate(true);
-			float new_max = avg_rate_in;
-			if (crate_in > avg_rate_in)
-			{
-				new_max = avg_rate_in + (1 - fchg) * 
-						(crate_in - avg_rate_in);
-			}
-			if (new_max > indiv_in)
-			{
-				new_max = indiv_in;
-			}
-			mod -> pqi -> setMaxRate(true, new_max);
-		}
+	//computing average rates for effective transfers
+	float max_in_effective = avail_in / num_sm;
+	if (effectiveDownloadsSm != 0) {
+	    max_in_effective = avail_in / effectiveDownloadsSm;
 	}
-	// if not maxxed already and using less than 95%
-	else if ((maxxed_in != num_sm) && (used_bw_in < 0.95 * avail_in))
-	{
-		//std::cerr << "Increasing Incoming B/W!" << std::endl;
-
-		// increase.
-		float fchg = (avail_in - used_bw_in) / avail_in;
-		for(it = mods.begin(); it != mods.end(); it++)
-		{
-			SearchModule *mod = (it -> second);
-			float crate_in = mod -> pqi -> getRate(true);
-			float max_in = mod -> pqi -> getMaxRate(true);
-
-			if (max_in == indiv_in)
-			{
-				// do nothing...
-			}
-			else
-			{
-				float new_max = max_in;
-				if (max_in < avg_rate_in)
-				{
-					new_max = avg_rate_in * (1 + fchg);
-				}
-				else if (crate_in > 0.5 * max_in)
-				{
-					new_max =  max_in * (1 + fchg);
-				}
-				if (new_max > indiv_in)
-				{
-					new_max = indiv_in;
-				}
-				mod -> pqi -> setMaxRate(true, new_max);
-			}
-		}
-
+	float max_out_effective = avail_out / num_sm;
+	if (effectiveUploadsSm != 0) {
+	    max_out_effective = avail_out / effectiveUploadsSm;
 	}
 
-
-	if (used_bw_out > avail_out)
-	{
-		//std::cerr << "Decreasing Outgoing B/W!" << std::endl;
-		// drop all above the avg down!
-		float fchg = (used_bw_out - avail_out) / (float) extra_bw_out;
-		for(it = mods.begin(); it != mods.end(); it++)
-		{
-			SearchModule *mod = (it -> second);
-			float crate_out = mod -> pqi -> getRate(false);
-			float new_max = avg_rate_out;
-			if (crate_out > avg_rate_out)
-			{
-				new_max = avg_rate_out + (1 - fchg) * 
-						(crate_out - avg_rate_out);
-			}
-			if (new_max > indiv_out)
-			{
-				new_max = indiv_out;
-			}
-			mod -> pqi -> setMaxRate(false, new_max);
-		}
+	//modify the outgoing rates if bandwith is not used well
+	float rate_out_modifier = 0;
+	if (used_bw_out / avail_out < 0.95) {
+	    rate_out_modifier = 0.001 * avail_out;
+	} else 	if (used_bw_out / avail_out > 1.05) {
+	    rate_out_modifier = - 0.001 * avail_out;
 	}
-	// if not maxxed already and using less than 95%
-	else if ((maxxed_out != num_sm) && (used_bw_out < 0.95 * avail_out))
+	if (rate_out_modifier != 0) {
+	    for(it = mods.begin(); it != mods.end(); it++)
+	    {
+		    SearchModule *mod = (it -> second);
+			mod -> pqi -> setMaxRate(false, mod -> pqi -> getMaxRate(false) + rate_out_modifier);
+	    }
+	}
+
+	//modify the incoming rates if bandwith is not used well
+	float rate_in_modifier = 0;
+	if (used_bw_in / avail_in < 0.95) {
+	    rate_in_modifier = 0.001 * avail_in;
+	} else 	if (used_bw_in / avail_in > 1.05) {
+	    rate_in_modifier = - 0.001 * avail_in;
+	}
+	if (rate_in_modifier != 0) {
+	    for(it = mods.begin(); it != mods.end(); it++)
+	    {
+		    SearchModule *mod = (it -> second);
+			mod -> pqi -> setMaxRate(true, mod -> pqi -> getMaxRate(true) + rate_in_modifier);
+	    }
+	}
+
+	//cap the rates
+	for(it = mods.begin(); it != mods.end(); it++)
 	{
-		//std::cerr << "Increasing Outgoing B/W!" << std::endl;
-		// increase.
-		float fchg = (avail_out - used_bw_out) / avail_out;
-		for(it = mods.begin(); it != mods.end(); it++)
-		{
-			SearchModule *mod = (it -> second);
-			float crate_out = mod -> pqi -> getRate(false);
-			float max_out = mod -> pqi -> getMaxRate(false);
-
-			if (max_out == indiv_out)
-			{
-				// do nothing...
-			}
-			else
-			{
-				float new_max = max_out;
-				if (max_out < avg_rate_out)
-				{
-					new_max = avg_rate_out * (1 + fchg);
-				}
-				else if (crate_out > 0.5 * max_out)
-				{
-					new_max =  max_out * (1 + fchg);
-				}
-				if (new_max > indiv_out)
-				{
-					new_max = indiv_out;
-				}
-				mod -> pqi -> setMaxRate(false, new_max);
-			}
+		SearchModule *mod = (it -> second);
+		if (mod -> pqi -> getMaxRate(false) < max_out_effective) {
+		    mod -> pqi -> setMaxRate(false, max_out_effective);
+		}
+		if (mod -> pqi -> getMaxRate(false) > avail_out) {
+		    mod -> pqi -> setMaxRate(false, avail_out);
+		}
+		if (mod -> pqi -> getMaxRate(true) < max_in_effective) {
+		    mod -> pqi -> setMaxRate(true, max_in_effective);
+		}
+		if (mod -> pqi -> getMaxRate(true) > avail_in) {
+		    mod -> pqi -> setMaxRate(true, avail_in);
 		}
-
 	}
 
 	return 1;
diff --git a/libretroshare/src/pqi/pqihandler.h b/libretroshare/src/pqi/pqihandler.h
index 169c7520f..dc3c85310 100644
--- a/libretroshare/src/pqi/pqihandler.h
+++ b/libretroshare/src/pqi/pqihandler.h
@@ -75,8 +75,9 @@ virtual int     SendRsRawItem(RsRawItem *);
 virtual RsRawItem *GetRsRawItem();
 
 	// rate control.
-void	setMaxIndivRate(bool in, float val);
-float	getMaxIndivRate(bool in);
+//indiv rate is deprecated
+//void	setMaxIndivRate(bool in, float val);
+//float	getMaxIndivRate(bool in);
 void	setMaxRate(bool in, float val);
 float	getMaxRate(bool in);
 
@@ -118,24 +119,24 @@ void	locked_StoreCurrentRates(float in, float out);
 	float rateTotal_out;
 };
 
-inline void pqihandler::setMaxIndivRate(bool in, float val)
-{
-	RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
-	if (in)
-		rateIndiv_in = val;
-	else
-		rateIndiv_out = val;
-	return;
-}
-
-inline float pqihandler::getMaxIndivRate(bool in)
-{
-	RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
-	if (in)
-		return rateIndiv_in;
-	else
-		return rateIndiv_out;
-}
+//inline void pqihandler::setMaxIndivRate(bool in, float val)
+//{
+//	RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
+//	if (in)
+//		rateIndiv_in = val;
+//	else
+//		rateIndiv_out = val;
+//	return;
+//}
+//
+//inline float pqihandler::getMaxIndivRate(bool in)
+//{
+//	RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
+//	if (in)
+//		return rateIndiv_in;
+//	else
+//		return rateIndiv_out;
+//}
 
 inline void pqihandler::setMaxRate(bool in, float val)
 {
diff --git a/libretroshare/src/pqi/pqipersongrp.cc b/libretroshare/src/pqi/pqipersongrp.cc
index 115a41515..4a78a0358 100644
--- a/libretroshare/src/pqi/pqipersongrp.cc
+++ b/libretroshare/src/pqi/pqipersongrp.cc
@@ -223,8 +223,7 @@ static const std::string pqih_ftr("PQIH_FTR");
 int     pqipersongrp::save_config()
 {
 	char line[512];
-	sprintf(line, "%f %f %f %f", getMaxRate(true), getMaxRate(false),
-	getMaxIndivRate(true), getMaxIndivRate(false));
+	sprintf(line, "%f %f", getMaxRate(true), getMaxRate(false));
 	if (config)
 	{
 		config -> setSetting(pqih_ftr, std::string(line));
@@ -240,14 +239,12 @@ int     pqipersongrp::load_config()
 		line = config -> getSetting(pqih_ftr);
 	}
 
-	float mri, mro, miri, miro;
-	
-	if (4 == sscanf(line.c_str(), "%f %f %f %f", &mri, &mro, &miri, &miro))
+	float mri, mro;
+
+	if (2 == sscanf(line.c_str(), "%f %f", &mri, &mro))
 	{
 		setMaxRate(true, mri);
 		setMaxRate(false, mro);
-		setMaxIndivRate(true, miri);
-		setMaxIndivRate(false, miro);
 	}
 	else
 	{
@@ -256,8 +253,6 @@ int     pqipersongrp::load_config()
 
 		setMaxRate(true,  500.0);
 		setMaxRate(false, 500.0);
-		setMaxIndivRate(true, 100.0);
-		setMaxIndivRate(false, 100.0);
 	}
 
 	return 1;
diff --git a/libretroshare/src/rsiface/rsiface.h b/libretroshare/src/rsiface/rsiface.h
index 1dc8326bb..87ae61979 100644
--- a/libretroshare/src/rsiface/rsiface.h
+++ b/libretroshare/src/rsiface/rsiface.h
@@ -171,7 +171,7 @@ class RsControl /* The Main Interface Class - for controlling the server */
 		/****************************************/
 		/* Config */
 
-		virtual int     ConfigSetDataRates( int total, int indiv ) = 0;
+		virtual int     ConfigSetDataRates( int totalDownload, int totalUpload ) = 0;
 		virtual int     ConfigGetDataRates( float &inKb, float &outKb) = 0;
 		virtual	int 	ConfigSetBootPrompt( bool on ) = 0;
 		virtual void    ConfigFinalSave( ) 			   = 0;
diff --git a/libretroshare/src/rsiface/rstypes.h b/libretroshare/src/rsiface/rstypes.h
index c6ef19d2b..7e4458dfb 100644
--- a/libretroshare/src/rsiface/rstypes.h
+++ b/libretroshare/src/rsiface/rstypes.h
@@ -126,7 +126,8 @@ class RsConfig
 	bool			firewalled;
 	bool			forwardPort;
 
-	int			maxDataRate;     /* kb */
+	int			maxDownloadDataRate;     /* kb */
+	int			maxUploadDataRate;     /* kb */
 	int			maxIndivDataRate; /* kb */
 
 	int			promptAtBoot; /* popup the password prompt */
diff --git a/libretroshare/src/rsserver/p3face-config.cc b/libretroshare/src/rsserver/p3face-config.cc
index 3f15cbd1d..16dcca0fb 100644
--- a/libretroshare/src/rsserver/p3face-config.cc
+++ b/libretroshare/src/rsserver/p3face-config.cc
@@ -41,7 +41,7 @@ const int p3facemsgzone = 11453;
 /* RsIface Config */
 /* Config */
 
-int     RsServer::ConfigSetDataRates( int total, int indiv ) /* in kbrates */
+int     RsServer::ConfigSetDataRates( int totalDownload, int totalUpload ) /* in kbrates */
 {
 	/* fill the rsiface class */
 	RsIface &iface = getIface();
@@ -50,10 +50,8 @@ int     RsServer::ConfigSetDataRates( int total, int indiv ) /* in kbrates */
 	lockRsCore();     /* LOCK */
 	iface.lockData(); /* LOCK */
 
-        pqih -> setMaxRate(true, total);
-	pqih -> setMaxRate(false, total);
-	pqih -> setMaxIndivRate(true, indiv);
-	pqih -> setMaxIndivRate(false, indiv);
+	pqih -> setMaxRate(true, totalDownload);
+	pqih -> setMaxRate(false, totalUpload);
 
 	pqih -> save_config();
 
@@ -120,8 +118,9 @@ int RsServer::UpdateAllConfig()
 	config.extPort = ntohs(pstate.serveraddr.sin_port);
 
 	/* data rates */
-	config.maxDataRate = (int) pqih -> getMaxRate(true);     /* kb */
-	config.maxIndivDataRate  = (int) pqih -> getMaxIndivRate(true);/* kb */
+	config.maxDownloadDataRate = (int) pqih -> getMaxRate(true);     /* kb */
+	config.maxUploadDataRate = (int) pqih -> getMaxRate(false);     /* kb */
+
 	config.promptAtBoot = true; /* popup the password prompt */      
 
 	/* update network configuration */
diff --git a/libretroshare/src/rsserver/p3face.h b/libretroshare/src/rsserver/p3face.h
index b8e7a53d1..d17665a42 100644
--- a/libretroshare/src/rsserver/p3face.h
+++ b/libretroshare/src/rsserver/p3face.h
@@ -137,7 +137,7 @@ class RsServer: public RsControl, public RsThread
 		/* Config */
 
 		virtual int 	ConfigGetDataRates(float &inKb, float &outKb);
-		virtual int     ConfigSetDataRates( int total, int indiv );
+		virtual int     ConfigSetDataRates( int totalDownload, int totalUpload );
 		virtual int     ConfigSetBootPrompt( bool on );
 
 		virtual void    ConfigFinalSave( );
diff --git a/retroshare-gui/src/gui/PeersDialog.cpp b/retroshare-gui/src/gui/PeersDialog.cpp
index b39895e8b..538994654 100644
--- a/retroshare-gui/src/gui/PeersDialog.cpp
+++ b/retroshare-gui/src/gui/PeersDialog.cpp
@@ -654,7 +654,9 @@ void PeersDialog::insertChat()
 {
 	if (!rsMsgs->chatAvailable())
 	{
-//		std::cerr << "no chat available." << std::endl ;
+#ifdef PEERS_DEBUG
+		std::cerr << "no chat available." << std::endl ;
+#endif
 		return;
 	}
 
diff --git a/retroshare-gui/src/gui/Preferences/ServerDialog.cpp b/retroshare-gui/src/gui/Preferences/ServerDialog.cpp
index 396474fe7..47459ef5e 100644
--- a/retroshare-gui/src/gui/Preferences/ServerDialog.cpp
+++ b/retroshare-gui/src/gui/Preferences/ServerDialog.cpp
@@ -91,12 +91,6 @@ ServerDialog::save(QString &errmsg)
 }
 
 
-/** Change of maxDataRate limits the Individual Data Rate */
-void ServerDialog::setMaximumIndivRate(int maximum) {
-  ui.indivRate->setMaximum(maximum);
-}
-
-
 /** Loads the settings for this page */
 void ServerDialog::load()
 {
@@ -142,15 +136,8 @@ void ServerDialog::load()
 
 	rsiface->lockData(); /* Lock Interface */
 
-	ui.totalRate->setValue(rsiface->getConfig().maxDataRate);
-	ui.indivRate->setValue(rsiface->getConfig().maxIndivDataRate);
-
-	// It makes no sense to set the total transfer rate lower than the individual rate.
-	// Avoid this by setting the upper limit for individual rate to total transfer rate now,
-	// and every time the user changes the total transfer rate.
-	ui.indivRate->setMaximum(rsiface->getConfig().maxDataRate);
-	QObject::connect(ui.totalRate, 	SIGNAL 	(valueChanged(int)),
-			 this, 		SLOT 	(setMaximumIndivRate(int)));
+	ui.totalDownloadRate->setValue(rsiface->getConfig().maxDownloadDataRate);
+	ui.totalUploadRate->setValue(rsiface->getConfig().maxUploadDataRate);
 
 	rsiface->unlockData(); /* UnLock Interface */
 
@@ -371,7 +358,7 @@ void ServerDialog::saveAddresses()
 	  rsPeers->setExtAddress(rsPeers->getOwnId(), ui.extAddress->text().toStdString(), ui.extPort->value());
 	}
 
-	rsicontrol->ConfigSetDataRates( ui.totalRate->value(),  ui.indivRate->value() );
+	rsicontrol->ConfigSetDataRates( ui.totalDownloadRate->value(), ui.totalUploadRate->value() );
 	load();
 }
 
diff --git a/retroshare-gui/src/gui/Preferences/ServerDialog.h b/retroshare-gui/src/gui/Preferences/ServerDialog.h
index 0723d5b05..185965192 100644
--- a/retroshare-gui/src/gui/Preferences/ServerDialog.h
+++ b/retroshare-gui/src/gui/Preferences/ServerDialog.h
@@ -50,7 +50,6 @@ private slots:
   void saveAddresses();
   void toggleUPnP();
   void toggleIpDetermination(bool) ;
-  void setMaximumIndivRate(int);
   
 private:
   /** A RshareSettings object used for saving/loading settings */
diff --git a/retroshare-gui/src/gui/Preferences/ServerDialog.ui b/retroshare-gui/src/gui/Preferences/ServerDialog.ui
index e2792b34c..92b7adf7b 100644
--- a/retroshare-gui/src/gui/Preferences/ServerDialog.ui
+++ b/retroshare-gui/src/gui/Preferences/ServerDialog.ui
@@ -1,170 +1,171 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>ServerDialog</class>
- <widget class="QWidget" name="ServerDialog" >
-  <property name="geometry" >
+ <widget class="QWidget" name="ServerDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>405</width>
-    <height>357</height>
+    <width>467</width>
+    <height>448</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="palette" >
+  <property name="palette">
    <palette>
     <active>
-     <colorrole role="WindowText" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="WindowText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>0</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Button" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Button">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>208</red>
         <green>208</green>
         <blue>208</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Light" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Light">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>255</red>
         <green>255</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Midlight" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Midlight">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>247</red>
         <green>247</green>
         <blue>247</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Dark" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Dark">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>104</red>
         <green>104</green>
         <blue>104</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Mid" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Mid">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>139</red>
         <green>139</green>
         <blue>139</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Text" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Text">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>0</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="BrightText" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="BrightText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>255</red>
         <green>255</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="ButtonText" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="ButtonText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>0</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Base" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Base">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>255</red>
         <green>255</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Window" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Window">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>240</red>
         <green>240</green>
         <blue>240</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Shadow" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Shadow">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>0</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Highlight" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Highlight">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>128</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="HighlightedText" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="HighlightedText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>255</red>
         <green>255</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Link" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Link">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="LinkVisited" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="LinkVisited">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>255</red>
         <green>0</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="AlternateBase" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="AlternateBase">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>231</red>
         <green>231</green>
         <blue>231</blue>
@@ -173,153 +174,153 @@
      </colorrole>
     </active>
     <inactive>
-     <colorrole role="WindowText" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="WindowText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>0</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Button" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Button">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>208</red>
         <green>208</green>
         <blue>208</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Light" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Light">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>255</red>
         <green>255</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Midlight" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Midlight">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>247</red>
         <green>247</green>
         <blue>247</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Dark" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Dark">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>104</red>
         <green>104</green>
         <blue>104</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Mid" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Mid">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>139</red>
         <green>139</green>
         <blue>139</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Text" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Text">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>0</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="BrightText" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="BrightText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>255</red>
         <green>255</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="ButtonText" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="ButtonText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>0</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Base" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Base">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>255</red>
         <green>255</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Window" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Window">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>240</red>
         <green>240</green>
         <blue>240</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Shadow" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Shadow">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>0</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Highlight" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Highlight">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>192</red>
         <green>192</green>
         <blue>192</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="HighlightedText" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="HighlightedText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>0</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Link" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Link">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="LinkVisited" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="LinkVisited">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>255</red>
         <green>0</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="AlternateBase" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="AlternateBase">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>231</red>
         <green>231</green>
         <blue>231</blue>
@@ -328,153 +329,153 @@
      </colorrole>
     </inactive>
     <disabled>
-     <colorrole role="WindowText" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="WindowText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>104</red>
         <green>104</green>
         <blue>104</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Button" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Button">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>208</red>
         <green>208</green>
         <blue>208</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Light" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Light">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>255</red>
         <green>255</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Midlight" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Midlight">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>247</red>
         <green>247</green>
         <blue>247</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Dark" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Dark">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>104</red>
         <green>104</green>
         <blue>104</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Mid" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Mid">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>139</red>
         <green>139</green>
         <blue>139</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Text" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Text">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>104</red>
         <green>104</green>
         <blue>104</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="BrightText" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="BrightText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>255</red>
         <green>255</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="ButtonText" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="ButtonText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>104</red>
         <green>104</green>
         <blue>104</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Base" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Base">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>240</red>
         <green>240</green>
         <blue>240</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Window" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Window">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>240</red>
         <green>240</green>
         <blue>240</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Shadow" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Shadow">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>0</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Highlight" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Highlight">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>128</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="HighlightedText" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="HighlightedText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>255</red>
         <green>255</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="Link" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="Link">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>0</red>
         <green>0</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="LinkVisited" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="LinkVisited">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>255</red>
         <green>0</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
-     <colorrole role="AlternateBase" >
-      <brush brushstyle="SolidPattern" >
-       <color alpha="255" >
+     <colorrole role="AlternateBase">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
         <red>231</red>
         <green>231</green>
         <blue>231</blue>
@@ -484,86 +485,74 @@
     </disabled>
    </palette>
   </property>
-  <property name="contextMenuPolicy" >
+  <property name="contextMenuPolicy">
    <enum>Qt::NoContextMenu</enum>
   </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
+  <layout class="QGridLayout">
+   <property name="margin">
     <number>6</number>
    </property>
-   <property name="topMargin" >
-    <number>6</number>
-   </property>
-   <property name="rightMargin" >
-    <number>6</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>6</number>
-   </property>
-   <property name="horizontalSpacing" >
+   <property name="spacing">
     <number>0</number>
    </property>
-   <property name="verticalSpacing" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="groupBox_2" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Network Configuration (takes effect after restart)</string>
      </property>
-     <layout class="QHBoxLayout" >
+     <layout class="QHBoxLayout">
       <item>
-       <layout class="QVBoxLayout" >
+       <layout class="QVBoxLayout">
         <item>
-         <widget class="QComboBox" name="netModeComboBox" >
+         <widget class="QComboBox" name="netModeComboBox">
           <item>
-           <property name="text" >
+           <property name="text">
             <string>Automatic</string>
            </property>
           </item>
           <item>
-           <property name="text" >
+           <property name="text">
             <string>Firewalled</string>
            </property>
           </item>
           <item>
-           <property name="text" >
+           <property name="text">
             <string>Forwarded Port</string>
            </property>
           </item>
          </widget>
         </item>
         <item>
-         <layout class="QHBoxLayout" >
+         <layout class="QHBoxLayout">
           <item>
-           <widget class="QComboBox" name="dhtComboBox" >
+           <widget class="QComboBox" name="dhtComboBox">
             <item>
-             <property name="text" >
+             <property name="text">
               <string>DHT Enabled</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>DHT Disabled</string>
              </property>
             </item>
            </widget>
           </item>
           <item>
-           <widget class="QComboBox" name="discComboBox" >
+           <widget class="QComboBox" name="discComboBox">
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Discovery Enabled</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Discovery Disabled</string>
              </property>
             </item>
@@ -575,10 +564,10 @@
       </item>
       <item>
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
@@ -589,42 +578,42 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QTabWidget" name="tabWidget" >
-     <property name="currentIndex" >
+   <item row="1" column="0">
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
        <string>Network Configuration</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="0" column="0" >
-        <widget class="QGroupBox" name="groupBox" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+      <layout class="QGridLayout">
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="groupBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="title" >
+         <property name="title">
           <string>Network Configuration</string>
          </property>
-         <layout class="QVBoxLayout" >
+         <layout class="QVBoxLayout" name="verticalLayout">
           <item>
-           <layout class="QHBoxLayout" >
+           <layout class="QHBoxLayout">
             <item>
-             <layout class="QVBoxLayout" >
+             <layout class="QVBoxLayout">
               <item>
-               <widget class="QLabel" name="label" >
-                <property name="text" >
+               <widget class="QLabel" name="label">
+                <property name="text">
                  <string>Local Address</string>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QLabel" name="label_2" >
-                <property name="text" >
+               <widget class="QLabel" name="label_2">
+                <property name="text">
                  <string>External Address</string>
                 </property>
                </widget>
@@ -632,49 +621,49 @@
              </layout>
             </item>
             <item>
-             <layout class="QGridLayout" >
-              <item row="0" column="0" >
-               <widget class="QLineEdit" name="localAddress" />
+             <layout class="QGridLayout">
+              <item row="0" column="0">
+               <widget class="QLineEdit" name="localAddress"/>
               </item>
-              <item row="0" column="1" >
-               <widget class="QLabel" name="label_5" >
-                <property name="text" >
+              <item row="0" column="1">
+               <widget class="QLabel" name="label_5">
+                <property name="text">
                  <string>Port:</string>
                 </property>
                </widget>
               </item>
-              <item row="0" column="2" >
-               <widget class="QSpinBox" name="localPort" >
-                <property name="minimum" >
+              <item row="0" column="2">
+               <widget class="QSpinBox" name="localPort">
+                <property name="minimum">
                  <number>0</number>
                 </property>
-                <property name="maximum" >
+                <property name="maximum">
                  <number>65535</number>
                 </property>
-                <property name="value" >
+                <property name="value">
                  <number>7812</number>
                 </property>
                </widget>
               </item>
-              <item row="1" column="0" >
-               <widget class="QLineEdit" name="extAddress" />
+              <item row="1" column="0">
+               <widget class="QLineEdit" name="extAddress"/>
               </item>
-              <item row="1" column="1" >
-               <widget class="QLabel" name="label_4" >
-                <property name="text" >
+              <item row="1" column="1">
+               <widget class="QLabel" name="label_4">
+                <property name="text">
                  <string>Port:</string>
                 </property>
                </widget>
               </item>
-              <item row="1" column="2" >
-               <widget class="QSpinBox" name="extPort" >
-                <property name="minimum" >
+              <item row="1" column="2">
+               <widget class="QSpinBox" name="extPort">
+                <property name="minimum">
                  <number>0</number>
                 </property>
-                <property name="maximum" >
+                <property name="maximum">
                  <number>65535</number>
                 </property>
-                <property name="value" >
+                <property name="value">
                  <number>7812</number>
                 </property>
                </widget>
@@ -683,54 +672,41 @@
             </item>
            </layout>
           </item>
-          <item>
-           <spacer>
-            <property name="orientation" >
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" >
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_2" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
        <string>IP Service</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="0" column="0" >
-        <widget class="QGroupBox" name="groupBox_4" >
-         <property name="title" >
+      <layout class="QGridLayout">
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="groupBox_4">
+         <property name="title">
           <string>IP check service</string>
          </property>
-         <layout class="QGridLayout" >
-          <item row="0" column="0" >
-           <widget class="QCheckBox" name="allowIpDeterminationCB" >
-            <property name="toolTip" >
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="allowIpDeterminationCB">
+            <property name="toolTip">
              <string>If you unckeck this, RetroShare can only determine your IP 
 when you connect to somebody. Leaving this checked helps 
 connecting when you have few friends. It also helps if you're 
 behind a firewall or a VPN.</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Allow RetroShare to ask my ip to these websites:</string>
             </property>
-            <property name="checked" >
+            <property name="checked">
              <bool>false</bool>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QListWidget" name="IPServersLV" >
-            <property name="editTriggers" >
+          <item row="1" column="0">
+           <widget class="QListWidget" name="IPServersLV">
+            <property name="editTriggers">
              <set>QAbstractItemView::NoEditTriggers</set>
             </property>
            </widget>
@@ -742,51 +718,42 @@ behind a firewall or a VPN.</string>
      </widget>
     </widget>
    </item>
-   <item row="2" column="0" >
-    <widget class="QGroupBox" name="groupBox_3" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+   <item row="2" column="0">
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Transfer Rates</string>
      </property>
-     <layout class="QHBoxLayout" >
+     <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
+       <layout class="QHBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="leftMargin" >
-         <number>0</number>
-        </property>
-        <property name="topMargin" >
-         <number>0</number>
-        </property>
-        <property name="rightMargin" >
-         <number>0</number>
-        </property>
-        <property name="bottomMargin" >
+        <property name="margin">
          <number>0</number>
         </property>
         <item>
-         <widget class="QLabel" name="label_14" >
-          <property name="text" >
-           <string>Total Rate (KB/s) </string>
+         <widget class="QLabel" name="label_14">
+          <property name="text">
+           <string>Download (KB/s) </string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QSpinBox" name="totalRate" >
-          <property name="minimum" >
+         <widget class="QSpinBox" name="totalDownloadRate">
+          <property name="minimum">
            <number>1</number>
           </property>
-          <property name="maximum" >
+          <property name="maximum">
            <number>12500</number>
           </property>
-          <property name="value" >
+          <property name="value">
            <number>1</number>
           </property>
          </widget>
@@ -794,57 +761,32 @@ behind a firewall or a VPN.</string>
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
+       <layout class="QHBoxLayout" name="_2">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="leftMargin" >
-         <number>0</number>
-        </property>
-        <property name="topMargin" >
-         <number>0</number>
-        </property>
-        <property name="rightMargin" >
-         <number>0</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>0</number>
-        </property>
         <item>
-         <widget class="QLabel" name="label_12" >
-          <property name="text" >
-           <string>Per Person  </string>
+         <widget class="QLabel" name="label_15">
+          <property name="text">
+           <string>Upload (KB/s) </string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QSpinBox" name="indivRate" >
-          <property name="minimum" >
+         <widget class="QSpinBox" name="totalUploadRate">
+          <property name="minimum">
            <number>1</number>
           </property>
-          <property name="maximum" >
+          <property name="maximum">
            <number>12500</number>
           </property>
-          <property name="value" >
+          <property name="value">
            <number>1</number>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item>
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>
@@ -854,11 +796,8 @@ behind a firewall or a VPN.</string>
   <tabstop>localAddress</tabstop>
   <tabstop>localPort</tabstop>
   <tabstop>extPort</tabstop>
-  <tabstop>totalRate</tabstop>
-  <tabstop>indivRate</tabstop>
+  <tabstop>totalDownloadRate</tabstop>
  </tabstops>
- <resources>
-  <include location="../images.qrc" />
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/rsiface/rsiface.h b/retroshare-gui/src/rsiface/rsiface.h
index 1dc8326bb..87ae61979 100644
--- a/retroshare-gui/src/rsiface/rsiface.h
+++ b/retroshare-gui/src/rsiface/rsiface.h
@@ -171,7 +171,7 @@ class RsControl /* The Main Interface Class - for controlling the server */
 		/****************************************/
 		/* Config */
 
-		virtual int     ConfigSetDataRates( int total, int indiv ) = 0;
+		virtual int     ConfigSetDataRates( int totalDownload, int totalUpload ) = 0;
 		virtual int     ConfigGetDataRates( float &inKb, float &outKb) = 0;
 		virtual	int 	ConfigSetBootPrompt( bool on ) = 0;
 		virtual void    ConfigFinalSave( ) 			   = 0;
diff --git a/retroshare-gui/src/rsiface/rstypes.h b/retroshare-gui/src/rsiface/rstypes.h
index c6ef19d2b..8245fb232 100644
--- a/retroshare-gui/src/rsiface/rstypes.h
+++ b/retroshare-gui/src/rsiface/rstypes.h
@@ -126,8 +126,8 @@ class RsConfig
 	bool			firewalled;
 	bool			forwardPort;
 
-	int			maxDataRate;     /* kb */
-	int			maxIndivDataRate; /* kb */
+	int			maxDownloadDataRate;     /* kb */
+	int			maxUploadDataRate;     /* kb */
 
 	int			promptAtBoot; /* popup the password prompt */