diff --git a/.gitignore b/.gitignore
index c5e7b45..bdb94d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ CipherTxt/out
 */*.iml
 .idea
 gen
+out/*
diff --git a/CipherTxt/AndroidManifest.xml b/CipherTxt/AndroidManifest.xml
index 7e348c8..427aba0 100644
--- a/CipherTxt/AndroidManifest.xml
+++ b/CipherTxt/AndroidManifest.xml
@@ -3,7 +3,7 @@
       package="com.joshuahou.ciphertxt"
       android:versionCode="1"
       android:versionName="1.0">
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
+    <application android:icon="@drawable/icon" android:label="@string/app_name">
 
 
         <activity android:name="com.joshuahou.ciphertxt.CipherTxtMain">
diff --git a/CipherTxt/res/drawable-hdpi/icon.png b/CipherTxt/res/drawable-hdpi/icon.png
index 8074c4c..eb20a1f 100644
Binary files a/CipherTxt/res/drawable-hdpi/icon.png and b/CipherTxt/res/drawable-hdpi/icon.png differ
diff --git a/CipherTxt/res/drawable-ldpi/icon.png b/CipherTxt/res/drawable-ldpi/icon.png
index 1095584..7206f6c 100644
Binary files a/CipherTxt/res/drawable-ldpi/icon.png and b/CipherTxt/res/drawable-ldpi/icon.png differ
diff --git a/CipherTxt/res/drawable-mdpi/icon.png b/CipherTxt/res/drawable-mdpi/icon.png
index a07c69f..161469c 100644
Binary files a/CipherTxt/res/drawable-mdpi/icon.png and b/CipherTxt/res/drawable-mdpi/icon.png differ
diff --git a/CipherTxt/res/layout/main.xml b/CipherTxt/res/layout/main.xml
index 53fc878..896ebeb 100644
--- a/CipherTxt/res/layout/main.xml
+++ b/CipherTxt/res/layout/main.xml
@@ -34,14 +34,17 @@
         <Button android:id="@+id/encryptbutton"
             android:text="@string/encrypt"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:onClick="encryptButtonClick"/>
         <Button android:id="@+id/decryptbutton"
                 android:text="@string/decrypt"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"
+                android:onClick="decryptButtonClick"/>
         <Button android:id="@+id/copybutton"
                 android:text="@string/copy"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"
+                android:onClick="copyButtonClick"/>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/CipherTxt/src/com/joshuahou/ciphertxt/CipherTxtMain.java b/CipherTxt/src/com/joshuahou/ciphertxt/CipherTxtMain.java
index 8991422..cfb7c2b 100644
--- a/CipherTxt/src/com/joshuahou/ciphertxt/CipherTxtMain.java
+++ b/CipherTxt/src/com/joshuahou/ciphertxt/CipherTxtMain.java
@@ -3,8 +3,8 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.text.ClipboardManager;
+import android.util.Base64;
 import android.view.View;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
@@ -12,32 +12,24 @@ public class CipherTxtMain extends Activity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
+    }
 
-        final EditText editText = (EditText) findViewById(R.id.message);
-        final Button encryptButton = (Button) findViewById(R.id.encryptbutton);
-        encryptButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
-                String password = ((EditText) findViewById(R.id.password)).getText().toString();
-                editText.setText(encrypt(password, editText.getText().toString()));
-            }
-        });
-
-        final Button decryptButton = (Button) findViewById(R.id.decryptbutton);
-        decryptButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
-                String password = ((EditText) findViewById(R.id.password)).getText().toString();
-                editText.setText(decrypt(password, editText.getText().toString()));
-            }
-        });
+    public void decryptButtonClick(View button) {
+        EditText editText = (EditText) findViewById(R.id.message);
+        String password = ((EditText) findViewById(R.id.password)).getText().toString();
+        editText.setText(decrypt(password, editText.getText().toString()));
+    }
 
-        final ClipboardManager clipboardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-        final Button copyButton = (Button) findViewById(R.id.copybutton);
-        copyButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
-                clipboardManager.setText(editText.getText());
-            }
-        });
+    public void encryptButtonClick(View button) {
+        EditText editText = (EditText) findViewById(R.id.message);
+        String password = ((EditText) findViewById(R.id.password)).getText().toString();
+        editText.setText(encrypt(password, editText.getText().toString()));
+    }
 
+    public void copyButtonClick(View button) {
+        EditText editText = (EditText) findViewById(R.id.message);
+        ClipboardManager clipboardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+        clipboardManager.setText(editText.getText());
     }
 
     private boolean validate(String password, String message) {
@@ -56,7 +48,8 @@ private String encrypt(String password, String message) {
         if (!validate(password, message)) {
             return message;
         }
-        return String.format("(%s)", xor(password, message));
+        String encryptedMessage = Base64.encodeToString(xor(message.getBytes(), password.getBytes()), Base64.NO_WRAP);
+        return String.format("%s", encryptedMessage);
     }
 
     private String decrypt(String password, String message) {
@@ -64,23 +57,22 @@ private String decrypt(String password, String message) {
             return message;
         }
         String encrypted = message.trim();
-        if (encrypted.charAt(0) != '(' || encrypted.charAt(encrypted.length() - 1) != ')') {
+
+        try {
+            byte[] decoded = Base64.decode(encrypted, Base64.NO_WRAP);
+            return new String(xor(decoded, password.getBytes()));
+        } catch (IllegalArgumentException e) {
             Toast.makeText(CipherTxtMain.this, "Improperly formatted message block.", Toast.LENGTH_SHORT).show();
             return message;
         }
-
-        encrypted = encrypted.substring(1, encrypted.length() - 1);
-        return xor(password, encrypted);
     }
 
-    private String xor(String password, String message) {
-        byte[] messageBytes = message.getBytes();
-        byte[] passwordBytes = password.getBytes();
-        byte[] encryptedBytes = new byte[messageBytes.length];
+    private byte[] xor(byte[] message, byte[] password) {
+        byte[] out = new byte[message.length];
 
-        for (int i = 0; i < messageBytes.length; i++) {
-            encryptedBytes[i] = (byte) (messageBytes[i] ^ passwordBytes[i % passwordBytes.length]);
+        for (int i = 0; i < message.length; i++) {
+            out[i] = (byte) (message[i] ^ password[i % password.length]);
         }
-        return new String(encryptedBytes);
+        return out;
     }
 }
\ No newline at end of file