diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: PAULs_LPPMON_PLUGINS
-# Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Apr 25 14:28:34 2013
+# Generated by qmake (2.01a) (Qt 4.8.4) on: Wed May 22 07:43:41 2013
 # Project:  PAULs_LPPMON_PLUGINS.pro
 # Template: subdirs
 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile PAULs_LPPMON_PLUGINS.pro
diff --git a/PAULs_LPPMON_PLUGINS.pro.user b/PAULs_LPPMON_PLUGINS.pro.user
--- a/PAULs_LPPMON_PLUGINS.pro.user
+++ b/PAULs_LPPMON_PLUGINS.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.1, 2013-05-21T07:15:43. -->
+<!-- Written by Qt Creator 2.4.1, 2013-05-22T07:47:54. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
diff --git a/rmapplugin/Makefile b/rmapplugin/Makefile
--- a/rmapplugin/Makefile
+++ b/rmapplugin/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: librmapplugin.so.1.0.0
-# Generated by qmake (2.01a) (Qt 4.8.4) on: Fri Apr 26 08:31:53 2013
+# Generated by qmake (2.01a) (Qt 4.8.4) on: Wed May 22 07:43:41 2013
 # Project:  rmapplugin.pro
 # Template: lib
 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro
diff --git a/rmapplugin/params.h b/rmapplugin/params.h
--- a/rmapplugin/params.h
+++ b/rmapplugin/params.h
@@ -39,6 +39,10 @@
 #define SID_SBM2_BP1_F1 30
 #define SID_SBM2_BP2_F1 33
 
-#define RMAP_DEFAULT_SOURCE_ADDRESS 1
+//*****
+// RMAP
+#define DEFAULT_DESTINATION_KEY 2
+#define DEFAULT_SOURCE 1
+#define DEFAULT_TARGET 254
 
 #endif // PARAMS_H
diff --git a/rmapplugin/rmapoperations.h b/rmapplugin/rmapoperations.h
--- a/rmapplugin/rmapoperations.h
+++ b/rmapplugin/rmapoperations.h
@@ -2,6 +2,7 @@
 #define RMAPOPERATIONS_H
 
 #include "qhexspinbox.h"
+#include <params.h>
 
 #define READ_WRITE_MAX_COUNTS 4096                      // in words
 #define RMAP_MAX_DATA_LENGTH 4*READ_WRITE_MAX_COUNTS    // in bytes, shall be lower than the limit size of SPW packet of the GRESB bridge
@@ -10,10 +11,6 @@
 #define RMAP_DATA_CRC_LENGTH 1                          // in bytes => ECSS
 #define RMAP_MAX_PACKET_LENGTH RMAP_READ_REPLY_HEADER_LENGTH + RMAP_MAX_DATA_LENGTH + RMAP_DATA_CRC_LENGTH
 
-#define DEFAULT_DESTINATION_KEY 2
-#define DEFAULT_SOURCE 0
-#define DEFAULT_TARGET 254
-
 static const unsigned char RMAP_CRCTable[] = {
    0x00, 0x91, 0xe3, 0x72, 0x07, 0x96, 0xe4, 0x75,
    0x0e, 0x9f, 0xed, 0x7c, 0x09, 0x98, 0xea, 0x7b,
diff --git a/rmapplugin/rmappluginui.cpp b/rmapplugin/rmappluginui.cpp
--- a/rmapplugin/rmappluginui.cpp
+++ b/rmapplugin/rmappluginui.cpp
@@ -79,7 +79,6 @@ rmapPluginUI::rmapPluginUI(QWidget *pare
     gresbVirtualLinkSpinBox->setRange(0, 4);
     gresbVirtualLinkSpinBox->setValue(1);
     rmapSourceLogicalAddressSpinBox->setRange(0, 255);
-    rmapSourceLogicalAddressSpinBox->setValue(RMAP_DEFAULT_SOURCE_ADDRESS);
     rmapTargetLogicalAddressSpinBox->setRange(0, 255);
     spwLinkSpinBox->setRange(0, 2);
     spwLinkSpinBox->setValue(0);
@@ -104,6 +103,9 @@ rmapPluginUI::rmapPluginUI(QWidget *pare
     bridgeSelection_LAYOUT->addWidget(selectGRESB_BUTTON, 0, 0, 1, 1);
     bridgeSelection_LAYOUT->addWidget(selectStarDundee_BUTTON, 0, 1, 1, 1);
 
+    bridgeSelection_LAYOUT->setRowStretch(1, 1);
+    bridgeSelection_LAYOUT->setColumnStretch(2, 1);
+
     generalParameters_LAYOUT->addWidget(logEnableCheckBox, 0, 0, 1, 1);
     generalParameters_LAYOUT->addWidget(logFileChooseButton, 0, 1, 1, 1);
     generalParameters_LAYOUT->addWidget(rmapSourceLogicalAddressLabel, 1, 0, 0);
diff --git a/rmapplugin/wfpage.cpp b/rmapplugin/wfpage.cpp
--- a/rmapplugin/wfpage.cpp
+++ b/rmapplugin/wfpage.cpp
@@ -10,8 +10,10 @@ WFPage::WFPage(QWidget *parent) :
     wfPlot_b2 = new WFPlot();
     wfPlot_b3 = new WFPlot();
     //
-    wfPlot_v->customPlot->setTitle("v");
-    wfPlot_e1->customPlot->setTitle("e1");
+    //wfPlot_v->customPlot->setTitle("v");
+    wfPlot_v->customPlot->setGraphName(0, "v");
+    //wfPlot_e1->customPlot->setTitle("e1");
+    wfPlot_e1->customPlot->setGraphName(0, "e1");
     wfPlot_e2->customPlot->setTitle("e2");
     wfPlot_b1->customPlot->setTitle("b1");
     wfPlot_b2->customPlot->setTitle("b2");
diff --git a/rmapplugin/wfplot.cpp b/rmapplugin/wfplot.cpp
--- a/rmapplugin/wfplot.cpp
+++ b/rmapplugin/wfplot.cpp
@@ -38,6 +38,7 @@ void WFPlot::displayOnPlot(short *data, 
 
     customPlot->setGraphData(0, qListX, qListY);
     customPlot->rescaleAxis();
+    customPlot->setGraphName(0, "v");
 }