diff --git a/README.md b/README.md
index eea3822..d8f17cd 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,9 @@ This project is a front end to gammu[1] and it provides a Qt based GUI
 solution for sending ussd codes.
 
 A screenshot of the application can be seen from the following link:
-https://github.com/mhogomchungu/ussd-gui/blob/master/ussd-gui.jpeg
+https://github.com/mhogomchungu/ussd-gui/blob/master/icons/ussd-gui.jpeg
+
+download page is: https://github.com/mhogomchungu/ussd-gui/releases
 
 [1] http://wammu.eu/gammu/
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 937c17e..ff1b8e4 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -96,7 +96,7 @@ MainWindow::MainWindow( QWidget * parent ) : QMainWindow( parent ),
 
 	if( !m_gsm.init() ){
 
-		m_ui->textEditResult->setText( tr( "Status: ERROR 1: " ) + m_gsm.lastError() ) ;
+		m_ui->textEditResult->setText( QObject::tr( "Status: ERROR 1: " ) + m_gsm.lastError() ) ;
 
 		this->disableSending() ;
 	}
diff --git a/translations.ts/default.ts b/translations.ts/default.ts
index 0fc664f..196328e 100644
--- a/translations.ts/default.ts
+++ b/translations.ts/default.ts
@@ -4,127 +4,112 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="14"/>
+        <location filename="../src/mainwindow.ui" line="14"/>
         <source>ussd-gui</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="27"/>
+        <location filename="../src/mainwindow.ui" line="27"/>
         <source>&amp;Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="46"/>
+        <location filename="../src/mainwindow.ui" line="46"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="69"/>
+        <location filename="../src/mainwindow.ui" line="69"/>
         <source>Input: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="88"/>
+        <location filename="../src/mainwindow.ui" line="88"/>
         <source>USSD Server Response.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="133"/>
+        <location filename="../src/mainwindow.ui" line="133"/>
         <source>&amp;Convert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="219"/>
-        <source>Status: ERROR 1: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="238"/>
+        <location filename="../src/mainwindow.cpp" line="210"/>
         <source>Status: ERROR 2: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="115"/>
-        <location filename="../mainwindow.cpp" line="187"/>
+        <location filename="../src/mainwindow.cpp" line="111"/>
+        <location filename="../src/mainwindow.cpp" line="172"/>
         <source>Empty History.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="226"/>
+        <location filename="../src/mainwindow.cpp" line="204"/>
         <source>Status: Connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="305"/>
+        <location filename="../src/mainwindow.cpp" line="277"/>
         <source>Status: Sending A Request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="313"/>
-        <source>Status: ERROR 3: </source>
+        <location filename="../src/mainwindow.cpp" line="293"/>
+        <source>Status: ERROR 3: no response within 30 seconds.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="317"/>
-        <source>Status: Waiting For A Reply ...</source>
+        <location filename="../src/mainwindow.cpp" line="387"/>
+        <source>Status: ERROR 5: Connection Was Terminated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="200"/>
-        <source>Status: Connecting </source>
+        <location filename="../src/mainwindow.cpp" line="391"/>
+        <source>Status: ERROR 5: Another Client Replied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="327"/>
-        <source>Status: ERROR 6: no response within 30 seconds.</source>
+        <location filename="../src/mainwindow.cpp" line="395"/>
+        <source>Status: ERROR 5: USSD Code Is Not Supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="394"/>
-        <source>Status: No Action Needed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="398"/>
-        <source>Status: Action Needed.</source>
+        <location filename="../src/mainwindow.cpp" line="399"/>
+        <source>Status: ERROR 5: Connection Timeout.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="402"/>
-        <source>Status: ERROR 7: Connection Was Terminated.</source>
+        <location filename="../src/mainwindow.cpp" line="403"/>
+        <location filename="../src/mainwindow.cpp" line="406"/>
+        <source>Status: ERROR 5: Unknown Error Has Occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="406"/>
-        <source>Status: ERROR 7: Another Client Replied.</source>
+        <location filename="../src/mainwindow.cpp" line="283"/>
+        <source>Status: Waiting For A Reply ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="410"/>
-        <source>Status: ERROR 7: USSD Code Is Not Supported.</source>
+        <location filename="../src/mainwindow.cpp" line="185"/>
+        <source>Status: Connecting </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="414"/>
-        <source>Status: ERROR 7: Connection Timeout.</source>
+        <location filename="../src/mainwindow.cpp" line="379"/>
+        <source>Status: No Action Needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="418"/>
-        <location filename="../mainwindow.cpp" line="421"/>
-        <source>Status: ERROR 7: Unknown Error Has Occured.</source>
+        <location filename="../src/mainwindow.cpp" line="383"/>
+        <source>Status: Action Needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="500"/>
+        <location filename="../src/mainwindow.cpp" line="318"/>
         <source>Status: ERROR 4: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="508"/>
-        <source>Status: ERROR 5: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -133,5 +118,10 @@
         <source>Status: ERROR 100: Failed To Parse Response.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/mainwindow.cpp" line="99"/>
+        <source>Status: ERROR 1: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/ussd-gui.pro.user b/ussd-gui.pro.user
index 96739ec..1c07e5c 100644
--- a/ussd-gui.pro.user
+++ b/ussd-gui.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.4.2, 2015-08-05T09:31:24. -->
+<!-- Written by QtCreator 3.4.2, 2015-08-05T09:47:26. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>