diff --git a/TODO.txt b/TODO.txt
index e1a146737..3113de6d4 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -39,6 +39,7 @@ E        [X] "Friends details" should show both PGP key and RS certs in differen
              It should specify clearly which one should be used to make friends.
 E        [X] addFriend does not work when the cert contains signatures.
 E        [X] PGP signatures are not transmited by discovery2. 
+         [ ] Default appearance style on Ubuntu should be GTK (to allow correct tooltips)
       
        Messages
 H        [ ] distant messages should be made async-ed
@@ -64,10 +65,11 @@ M			[ ] popularity calculation seems wrong. To reproduce: create a new channel a
        Chat lobbies
 H        [X] Chat lobbies should use Identities. That's a significant change, probably not backward compatible. 
          [X] Remove deprecated code in rschatitems.
-		   [ ] remove "change nickname" from drop menu
+		   [X] remove "change nickname" from drop menu
       
 		 Settings
-		   [ ] remove HiddenNode fom config->server netWork mode drop menu, or disable it in non hidden mode.
+		   [X] remove HiddenNode fom config->server netWork mode drop menu, or disable it in non hidden mode.
+			[ ] Default max upload should be a large number. Not 50KB/s!!
 
        Chat
          [X] Distant chat window should show GXS avatars
diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
index 9de02c70c..ef31807ac 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
@@ -219,7 +219,7 @@ void ChatLobbyDialog::init()
     rsIdentity->getIdDetails(gxs_id,details) ;
 
     ui.chatWidget->setName(QString::fromUtf8(details.mNickname.c_str()));
-    ui.chatWidget->addToolsAction(ui.actionChangeNickname);
+    //ui.chatWidget->addToolsAction(ui.actionChangeNickname);
     ui.chatWidget->setDefaultExtraFileFlags(RS_FILE_REQ_ANONYMOUS_ROUTING);
 
     lastUpdateListTime = 0;
@@ -336,7 +336,7 @@ void ChatLobbyDialog::addChatMsg(const ChatMessage& msg)
             name = QString::fromUtf8(msg.peer_alternate_nickname.c_str()) + " (" + QString::fromStdString(gxs_id.toStdString()) + ")" ;
 
         ui.chatWidget->addChatMsg(msg.incoming, name, sendTime, recvTime, message, ChatWidget::MSGTYPE_NORMAL);
-		emit messageReceived(msg.incoming, id(), sendTime, name, message) ;
+		emit messageReceived(msg.incoming, id(), sendTime, name, message) ;
 
         // This is a trick to translate HTML into text.
         QTextEdit editor;