diff --git a/data/gui/online/user_search.stkgui b/data/gui/online/user_search.stkgui
index 66bf74922..8bab756a6 100644
--- a/data/gui/online/user_search.stkgui
+++ b/data/gui/online/user_search.stkgui
@@ -1,6 +1,6 @@
 <stkgui>
 	<div x="1%" y="0%" width="98%" height="99%" layout="vertical-row" >
-	
+		<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 	    <header text_align="center" height="fit" text="User search" align="center"/>
 	    
 	    <spacer width="10" height="10"/>
@@ -18,5 +18,5 @@
 	    </box>
 	       
 	</div>
-	<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+	
 </stkgui>
diff --git a/src/states_screens/dialogs/user_info_dialog.cpp b/src/states_screens/dialogs/user_info_dialog.cpp
index 12561a1a0..4d45ee47d 100644
--- a/src/states_screens/dialogs/user_info_dialog.cpp
+++ b/src/states_screens/dialogs/user_info_dialog.cpp
@@ -51,7 +51,6 @@ UserInfoDialog::UserInfoDialog(uint32_t visiting_id)
     m_profile = ProfileManager::get()->getProfileByID(visiting_id);
     m_name_widget = getWidget<LabelWidget>("name");
     assert(m_name_widget != NULL);
-    //const Server * server = ProfileManager::get()->getServerByID(m_visiting_id);
     m_name_widget->setText(m_profile->getUserName(),false);
     m_info_widget = getWidget<LabelWidget>("info");
     assert(m_info_widget != NULL);
diff --git a/src/states_screens/online_profile_friends.cpp b/src/states_screens/online_profile_friends.cpp
index 15efd6231..5469c5879 100644
--- a/src/states_screens/online_profile_friends.cpp
+++ b/src/states_screens/online_profile_friends.cpp
@@ -78,7 +78,6 @@ void OnlineProfileFriends::init()
     m_visiting_profile->fetchFriends();
     m_waiting_for_friends = true;
     m_friends_list_widget->clear();
-    m_friends_list_widget->addItem("spacer", L"");
     m_friends_list_widget->addItem("loading", Messages::fetchingFriends());
 }   // init
 // -----------------------------------------------------------------------------
@@ -90,7 +89,7 @@ void OnlineProfileFriends::eventCallback(Widget* widget, const std::string& name
     {
         OnlineUserSearch * instance = OnlineUserSearch::getInstance();
         instance->setSearchString(m_search_box_widget->getText().trim());
-        StateManager::get()->pushScreen(instance);
+        StateManager::get()->replaceTopMostScreen(instance);
     }
     else if (name == m_friends_list_widget->m_properties[GUIEngine::PROP_ID])
     {