diff --git a/MemeProject/.idea/gradle.xml b/MemeProject/.idea/gradle.xml
index 1bbc21d..3ec5955 100644
--- a/MemeProject/.idea/gradle.xml
+++ b/MemeProject/.idea/gradle.xml
@@ -3,8 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
         <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
diff --git a/MemeProject/.idea/vcs.xml b/MemeProject/.idea/vcs.xml
index def6a6a..6c0b863 100644
--- a/MemeProject/.idea/vcs.xml
+++ b/MemeProject/.idea/vcs.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/MemeProject/app/app.iml b/MemeProject/app/app.iml
index d049220..f41a9f7 100644
--- a/MemeProject/app/app.iml
+++ b/MemeProject/app/app.iml
@@ -84,7 +84,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform (1)" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java
index dd518c6..955d8f0 100644
--- a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java
+++ b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java
@@ -1,11 +1,8 @@
 package madelyntav.c4q.nyc.memeproject;
 
-
-import android.app.Activity;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
+import android.widget.Button;
 import android.content.Context;
+import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -16,22 +13,20 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.Handler;
 import android.provider.MediaStore;
-import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.DragEvent;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -39,158 +34,160 @@
 import java.util.Date;
 
 
-public class EditPhoto extends Activity implements View.OnTouchListener {
-
-
-    private NotificationManager mNotificationManager;
-    private Bitmap returnedBitmap;
-    Bitmap bitmap, bm, uriBm, image;
-    private int delta_x;
-    private int delta_y;
-    public static ImageView imageView;
-    public static ImageView demoImage;
-    private int color;
-    private ColorPicker colorPicker;
-    private Button vanilla;
-    private Button demotivational;
-    private EditText editText, editText2, demoTitle, demoText;
-    private String TAG = "GallerySaving";
-    RelativeLayout memeLayout;
-    LinearLayout linearLayout2;
-    LinearLayout linearLayout3;
-    Button ten;
-    Button fifteen;
-    Button twenty;
-    Button twentyFive;
-    RelativeLayout root;
-    private boolean isVanilla = true;
-    public static EditPhoto getInstance() {
-        return instance;
-    }
-    static EditPhoto instance;
-    ImageButton share;
-    private Uri uri;
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_edit_photo);
-
 
-        colorPicker = (ColorPicker) findViewById(R.id.colorPicker);
-        imageView = (ImageView) findViewById(R.id.mImageView);
-        demoImage = (ImageView) findViewById(R.id.demotivationalImage);
-
-        root = (RelativeLayout) findViewById(R.id.root);
-        memeLayout = (RelativeLayout) findViewById(R.id.meme);
-        linearLayout2 = (LinearLayout) findViewById(R.id.linearLayout2);
-        linearLayout3 = (LinearLayout) findViewById(R.id.linearLayout3);
-        ten = (Button) findViewById(R.id.ten);
-        fifteen = (Button) findViewById(R.id.fifteen);
-        twenty = (Button) findViewById(R.id.twenty);
-        twentyFive = (Button) findViewById(R.id.twentyfive);
-        share = (ImageButton) findViewById(R.id.share);
-
-        demoTitle = (EditText) findViewById(R.id.demotivationalTitle);
-        demoText = (EditText) findViewById(R.id.demotivationalText);
-        editText = (EditText) findViewById(R.id.editText);
-        editText2 = (EditText) findViewById(R.id.editText2);
-        demoTitle = (EditText) findViewById(R.id.demotivationalTitle);
-        demoText = (EditText) findViewById(R.id.demotivationalText);
-        demoTitle.setVisibility(View.GONE);
-        demoText.setVisibility(View.GONE);
-        Typeface custom_font = Typeface.createFromAsset(getAssets(), "fonts/impact.ttf");
-        editText.setTypeface(custom_font);
-        editText2.setTypeface(custom_font);
-
-        editText.setOnTouchListener(this);
-        editText2.setOnTouchListener(this);
+    public class EditPhoto extends Activity implements View.OnTouchListener, View.OnDragListener {
+
+
+        Bitmap b;
+        Bitmap bitmap;
+        public static ImageView imageView;
+        private int color;
+        private ColorPicker colorPicker;
+        private Button vanilla;
+        private Button demotivational;
+        private EditText editText, editText2, demoTitle, demoText;
+        private ImageView demoImage;
+        private String TAG = "GallerySaving";
+        RelativeLayout memeLayout;
+        LinearLayout linearLayout2;
+        LinearLayout linearLayout3;
+        Button ten;
+        Button fifteen;
+        Button twenty;
+        Button twentyFive;
+        RelativeLayout root;
+        private boolean isVanilla = true;
+        public static EditPhoto getInstance() {
+            return instance;
+        }
+        static EditPhoto instance;
 
 
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            setContentView(R.layout.activity_edit_photo);
 
+            colorPicker = (ColorPicker) findViewById(R.id.colorPicker);
+            imageView = (ImageView) findViewById(R.id.mImageView);
+            demoImage = (ImageView) findViewById(R.id.demotivationalImage);
 
 
+                root = (RelativeLayout) findViewById(R.id.root);
+                linearLayout2 = (LinearLayout) findViewById(R.id.linearLayout2);
+                linearLayout3 = (LinearLayout) findViewById(R.id.linearLayout3);
+                ten = (Button) findViewById(R.id.ten);
+                fifteen = (Button) findViewById(R.id.fifteen);
+                twenty = (Button) findViewById(R.id.twenty);
+                twentyFive = (Button) findViewById(R.id.twentyfive);
 
 
+                vanilla = (Button) findViewById(R.id.vanilla);
+                demotivational = (Button) findViewById(R.id.demotivational);
 
 
-        //----------------------------GET IMAGE FROM PREVIOUS INTENT--------------------------//
+                editText = (EditText) findViewById(R.id.editText);
+                editText2 = (EditText) findViewById(R.id.editText2);
+                Typeface custom_font = Typeface.createFromAsset(getAssets(), "fonts/impact.ttf");
 
-        //opens pic in this activity
+                editText.setTypeface(custom_font);
+                editText2.setTypeface(custom_font);
 
-        uri = (Uri) getIntent().getExtras().get("image");
-        try {
-            uriBm = Bitmap.createBitmap(MediaStore.Images.Media.getBitmap(this.getContentResolver(), uri));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
 
+                editText.setOnTouchListener(this);
+                editText2.setOnTouchListener(this);
 
-        imageView.setImageBitmap(uriBm);
-        demoImage.setImageBitmap(uriBm);
 
-//        if (getIntent().hasExtra("byteArray")) {
-//            uriBm = BitmapFactory.decodeByteArray(getIntent().getByteArrayExtra("byteArray"), 0, getIntent().getByteArrayExtra("byteArray").length);
-//            imageView.setImageBitmap(uriBm);
-//            demoImage.setImageBitmap(uriBm);
-//
+                //Drag and drop layouts for drag and drop EditText feature
+//            LinearLayout textTop = (LinearLayout) findViewById(R.id.textTop);
+//            LinearLayout textMid = (LinearLayout) findViewById(R.id.textMid);
+//            LinearLayout textBot = (LinearLayout) findViewById(R.id.textBottom);
 //
-//        } else {
-//
-//            //retrieve passed uri
-//
-//            uri = (Uri) getIntent().getExtras().get("image");
-//            //retrieve bitmap uri from intent
-////            try {
-////                bitmap = MediaStore.Images.Media.getBitmap(this.getContentResolver(), uri);
-////
-////            } catch (IOException e) {
-////                e.printStackTrace();
-////            }
-////            //create bitmap for use within activity
-////            try {
-////                bitmap = Bitmap.createBitmap(MediaStore.Images.Media.getBitmap(this.getContentResolver(), uri));
-////            } catch (IOException e) {
-////                e.printStackTrace();
-////            }
-//
-//
-//            imageView.setImageURI(uri);
-//            demoImage.setImageURI(uri);
-////            Log.d(TAG,"bitmap height: "+ bitmap.getHeight()+"  width: "+bitmap.getWidth());
-//
-//        }
+//                textBot.setOnDragListener(this);
+//                textMid.setOnDragListener(this);
+//                textTop.setOnDragListener(this);
 
+               // imageView = (ImageView) findViewById(R.id.mImageView);
+                //demoImage = (ImageView) findViewById(R.id.demotivationalImage);
+                memeLayout = (RelativeLayout) findViewById(R.id.meme);
 
 
-        //-----------------------------SHARE BUTTON ONCLICKLISTENER---------------------------//
-
-        // Shares image via Email, Text, Bluetooth, etc...
-        ImageButton share = (ImageButton) findViewById(R.id.share);
-        share.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
+            //----------------------------GET IMAGE FROM PREVIOUS INTENT--------------------------//
 
+            //opens pic in this activity
+            if (getIntent().hasExtra("byteArray")) {
+                b = BitmapFactory.decodeByteArray(getIntent().getByteArrayExtra("byteArray"), 0, getIntent().getByteArrayExtra("byteArray").length);
+                //imageView = (ImageView) findViewById(R.id.mImageView);
                 vanilla = (Button) findViewById(R.id.vanilla);
                 editText = (EditText) findViewById(R.id.editText);
                 editText2 = (EditText) findViewById(R.id.editText2);
-                editText.setHint("");
-                editText2.setHint("");
-                //opens pic in this activity
-                if (getIntent().hasExtra("byteArray")) {
-                    Bundle extras = getIntent().getExtras();
-                    byte[] byteArray = extras.getByteArray("byteArray");
-                    bm = BitmapFactory.decodeByteArray(byteArray, 0, byteArray.length);
-                    imageView.setImageBitmap(bm);
+                demoTitle = (EditText) findViewById(R.id.demotivationalTitle);
+                demoText = (EditText) findViewById(R.id.demotivationalText);
+                imageView.setImageBitmap(b);
+                demoImage.setImageBitmap(b);
+
+
+            } else {
+
+                //retrieve passed uri
+                Uri uri = getIntent().getExtras().getParcelable("image");
+                //retrieve bitmap uri from intent
+                try {
+                    bitmap = MediaStore.Images.Media.getBitmap(this.getContentResolver(), uri);
+
+                } catch (IOException e) {
+                    e.printStackTrace();
                 }
+                //create bitmap for use within activity
+                try {
+                    bitmap = Bitmap.createBitmap(MediaStore.Images.Media.getBitmap(this.getContentResolver(), uri));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                imageView.setImageBitmap(bitmap);
+                demoImage.setImageBitmap(bitmap);
+            }
+
+            //-----------------------------SHARE BUTTON ONCLICKLISTENER---------------------------//
 
+            // Shares image via Email, Text, Bluetooth, etc...
                 ImageButton share = (ImageButton) findViewById(R.id.share);
                 share.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        String pathOfBmp = MediaStore.Images.Media.insertImage(getContentResolver(), uriBm, "title", null);
+
+                        imageView = (ImageView) findViewById(R.id.mImageView);
+                        vanilla = (Button) findViewById(R.id.vanilla);
+                        editText = (EditText) findViewById(R.id.editText);
+                        editText2 = (EditText) findViewById(R.id.editText2);
+                        editText.setHint("");
+                        editText2.setHint("");
+                        //opens pic in this activity
+                        if (getIntent().hasExtra("byteArray")) {
+                            Bundle extras = getIntent().getExtras();
+                            byte[] byteArray = extras.getByteArray("byteArray");
+                            Bitmap bm = BitmapFactory.decodeByteArray(byteArray, 0, byteArray.length);
+                            imageView.setImageBitmap(bm);
+                        }
+
+                        ImageButton share = (ImageButton) findViewById(R.id.share);
+                        share.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                String pathOfBmp = MediaStore.Images.Media.insertImage(getContentResolver(), b, "title", null);
+                                Uri bmpUri = Uri.parse(pathOfBmp);
+                                Intent attachIntent = new Intent(Intent.ACTION_SEND);
+                                attachIntent.putExtra(Intent.EXTRA_STREAM, bmpUri);
+                                attachIntent.setType("image/png");
+                                startActivity(attachIntent);
+                            }
+                        });
+
+                        b = getBitmapFromView(memeLayout);
+
+                        String pathOfBmp = MediaStore.Images.Media.insertImage(getContentResolver(), b, "title", null);
                         Uri bmpUri = Uri.parse(pathOfBmp);
+
                         Intent attachIntent = new Intent(Intent.ACTION_SEND);
                         attachIntent.putExtra(Intent.EXTRA_STREAM, bmpUri);
                         attachIntent.setType("image/png");
@@ -198,416 +195,444 @@ public void onClick(View v) {
                     }
                 });
 
-                uriBm = getBitmapFromView(memeLayout);
-
-                String pathOfBmp = MediaStore.Images.Media.insertImage(getContentResolver(), uriBm, "title", null);
-                Uri bmpUri = Uri.parse(pathOfBmp);
-
-                Intent attachIntent = new Intent(Intent.ACTION_SEND);
-                attachIntent.putExtra(Intent.EXTRA_STREAM, bmpUri);
-                attachIntent.setType("image/png");
-                startActivity(attachIntent);
-            }
-        });
-
-
-        instance = this;
-
-    }
-    //-----------------------------SHARE BUTTON ONCLICKLISTENER---------------------------//
-
-    // Shares image via Email, Text, Bluetooth, etc...
-    public void shareImage(View v) {
-        editText.setHint("");
-        editText2.setHint("");
-        bitmap = getBitmapFromView(memeLayout);
-
-        String pathOfBmp = MediaStore.Images.Media.insertImage(getContentResolver(), bitmap, "title", null);
-        Uri bmpUri = Uri.parse(pathOfBmp);
-        Intent attachIntent = new Intent(Intent.ACTION_SEND);
-        attachIntent.putExtra(Intent.EXTRA_STREAM, bmpUri);
-        attachIntent.setType("image/png");
-        startActivity(attachIntent);
-
-
-    }
-
-    //----------------------------VANILLA AND DEMOTIVATIONAL METHODS--------------------------//
-
-    //Sets vanilla meme editing view
-
-    //Sets demotivational meme editing view
-    public void demotivate(View v) {
-
-
-
-        memeLayout.setBackgroundColor(Color.BLACK);
-        memeLayout.setPadding(20, 20, 20, 20);
-        imageView.setVisibility(View.INVISIBLE);
-        editText.setVisibility(View.INVISIBLE);
-        editText2.setVisibility(View.INVISIBLE);
-        demoImage.setVisibility(View.VISIBLE);
-        demoTitle.setVisibility(View.VISIBLE);
-        demoText.setVisibility(View.VISIBLE);
-        ten.setVisibility(View.INVISIBLE);
-        fifteen.setVisibility(View.INVISIBLE);
-        twenty.setVisibility(View.INVISIBLE);
-        twentyFive.setVisibility(View.INVISIBLE);
-        colorPicker.setVisibility(View.INVISIBLE);
-        linearLayout2.setVisibility(View.GONE);
-        linearLayout3.setVisibility(View.GONE);
-
-    }
+                vanilla.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        isVanilla = true;
+                        vanillaM(view);
 
+                    }
+                });
 
-    //-------------------------------IMAGE STORE AND SAVE METHODS-----------------------------//
+                demotivational.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        isVanilla = false;
+                        demotivate(view);
 
-    //onClick method for the save button. Calls other methods to create the save image function
-    public void storeImage(View v) {
+                    }
+                });
 
+            instance = this;
 
-        editText.setCursorVisible(false);
-        editText2.setCursorVisible(false);
-        demoText.setCursorVisible(false);
-        demoTitle.setCursorVisible(false);
+            }
 
-        if (isVanilla) {
-            if (editText.getText().toString().equals("")) {
-                editText.setVisibility(View.GONE);
-            } else if (editText2.getText().toString().equals("")) {
-                editText2.setVisibility(View.GONE);
+        //----------------------------VANILLA AND DEMOTIVATIONAL METHODS--------------------------//
+
+
+        //Sets demotivational meme editing view
+        public void demotivate(View v) {
+
+            editText = (EditText) findViewById(R.id.editText);
+            editText2 = (EditText) findViewById(R.id.editText2);
+            memeLayout = (RelativeLayout) findViewById(R.id.meme);
+            demoImage = (ImageView) findViewById(R.id.demotivationalImage);
+            demoTitle = (EditText) findViewById(R.id.demotivationalTitle);
+            demoText = (EditText) findViewById(R.id.demotivationalText);
+
+
+            if (!isVanilla) {
+                memeLayout.setBackgroundColor(Color.BLACK);
+                memeLayout.setPadding(20, 20, 20, 20);
+                imageView.setVisibility(View.INVISIBLE);
+                editText.setVisibility(View.INVISIBLE);
+                editText2.setVisibility(View.INVISIBLE);
+                demoImage.setVisibility(View.VISIBLE);
+                demoTitle.setVisibility(View.VISIBLE);
+                demoText.setVisibility(View.VISIBLE);
+                ten.setVisibility(View.INVISIBLE);
+                fifteen.setVisibility(View.INVISIBLE);
+                twenty.setVisibility(View.INVISIBLE);
+                twentyFive.setVisibility(View.INVISIBLE);
+                colorPicker.setVisibility(View.INVISIBLE);
+                linearLayout2.setVisibility(View.GONE);
+                linearLayout3.setVisibility(View.GONE);
             }
+
         }
 
+        //-------------------------------IMAGE STORE AND SAVE METHODS-----------------------------//
 
-            image = getBitmapFromView(memeLayout);
+        //onClick method for the save button. Calls other methods to create the save image function
+        public void storeImage(View v) {
+            editText.setHint("");
+            editText2.setHint("");
+            editText.setCursorVisible(false);
+            editText2.setCursorVisible(false);
+            Bitmap image = getBitmapFromView(memeLayout);
             File pictureFile = createImageFile();
             addImageToFile(image, pictureFile);
+            Toast.makeText(this, "Saved to gallery", Toast.LENGTH_SHORT).show();
+        }
 
+        /**
+         * Create a File for saving an image
+         * Handles file name, and where to store it
+         */
+        private File createImageFile() {
+            String timeStamp = new SimpleDateFormat("MMddyyyy_HHmmss").format(new Date());
+            String imageName = "MEME_" + timeStamp + ".jpg";
 
-        editText.setCursorVisible(true);
-        editText2.setCursorVisible(true);
-        demoText.setCursorVisible(true);
-        demoTitle.setCursorVisible(true);
-
-
-
-        mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+            File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
+            File imageFile = new File(path, imageName);
+            Log.d("Path: ", path.getPath());
+            return imageFile;
 
+        }
 
-        NotificationCompat.Builder builder =  new NotificationCompat.Builder(this);
-        builder.setSmallIcon(R.drawable.logo);
+        private void addImageToFile(Bitmap image, File file) {
+            FileOutputStream fos = null;
+            //Tries to add the bitmap image to the file
+            try {
+                fos = new FileOutputStream(file);
+                image.compress(Bitmap.CompressFormat.PNG, 90, fos);
+
+
+            } catch (Exception e) {
+                Log.d(TAG, "trying to compress image did not work" + e.getMessage());
+            } finally {
+                try {
+                    if (fos != null) {
+                        fos.close(); //Closes the fileoutput stream
+                        //Scans the image file that was just created so user can immediately see it in Pictures
+                        try {
+                            Intent mediaScanIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+                            Uri uri = Uri.fromFile(file);
+                            mediaScanIntent.setData(uri);
+                            sendBroadcast(mediaScanIntent);
+                        } catch (Exception e) {
+                            Log.d("scanIntent", "Failed: ");
+                        }
+                    }
+                } catch (IOException e) {
+                    Log.d(TAG, "fos did not close " + e.getMessage());
+                }
+            }
 
-        Bitmap logo = BitmapFactory.decodeResource(getApplicationContext().getResources(),
-                R.drawable.logo);
+        }
 
-        builder.setLargeIcon(logo);
-        builder.setContentTitle("Meme-ify Me");
+        //------------------------------CREATE BITMAP FROM VIEW METHOD----------------------------//
 
+        //Takes the current view and creates a bitmap representing that view.
+        public Bitmap getBitmapFromView(View view) {
+            Bitmap returnedBitmap = Bitmap.createBitmap(view.getWidth(), view.getHeight(), Bitmap.Config.ARGB_8888);
+            Canvas canvas = new Canvas(returnedBitmap);
 
-        //Intent is created to bring you from current application context to "MainActivity" activity
-        Intent resultIntent = new Intent(Intent.ACTION_VIEW, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, resultIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+            Drawable bgDrawable = view.getBackground();
+            if (bgDrawable != null)
+                bgDrawable.draw(canvas);
+            else
+                canvas.drawColor(Color.WHITE);
+            view.draw(canvas);
+            return returnedBitmap;
+        }
 
-        //This code adds the pendingIntent to the builder which is what applies specifications to the notification !
-        builder.setContentIntent(pendingIntent);
-        builder.setVisibility(Notification.VISIBILITY_PUBLIC);
-        builder.setAutoCancel(true);
 
-        NotificationCompat.Style style = new NotificationCompat.BigPictureStyle().bigPicture(image).setSummaryText("Image has been saved to gallery");
-        builder.setStyle(style);
-        Notification notification = builder.build();
+        //---------------------------------DRAGGING EDITTEXT METHODS------------------------------//
 
+        // onTouch and onDrag work together to allow for views to be moved around within the layout
+        //to children of that layout
+        public boolean onTouch(View v, MotionEvent e) {
+            if (e.getAction() == MotionEvent.ACTION_DOWN) {//Action_Down means a pressed gesture had started, view has been set in motion
+                View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(v);//Creates an image that the system displays during the drag and drop operation.
+                v.startDrag(null, shadowBuilder, v, 0);
+                v.isInEditMode();
+                v.setVisibility(View.INVISIBLE);
+                return true;
+            } else {
+                return false;
+            }
+        }
 
-        mNotificationManager.notify(1234, notification);
-        Toast.makeText(this, "Saved to gallery", Toast.LENGTH_SHORT).show();
 
+        public boolean onDrag(View v, DragEvent e) {
+            if (e.getAction() == DragEvent.ACTION_DROP) {//if the shadow has been released within the view
+                View view = (View) e.getLocalState();
+                ViewGroup from = (ViewGroup) view.getParent();
 
+                LinearLayout to = (LinearLayout) v;
 
+                if((to.getResources().getInteger(Integer.valueOf(R.id.editText)) == (from.getResources().getInteger(Integer.valueOf(R.id.editText2))))) {
 
-    }
 
-    /**
-     * Create a File for saving an image
-     * Handles file name, and where to store it
-     */
-    private File createImageFile() {
-        String timeStamp = new SimpleDateFormat("MMddyyyy_HHmmss").format(new Date());
-        String imageName = "MEME_" + timeStamp + ".jpg";
 
-        File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
-        File imageFile = new File(path, imageName);
-        Log.d("Path: ", path.getPath());
-        return imageFile;
+                }
+                from.removeView(view);
+                to.addView(view);
+                view.setVisibility(View.VISIBLE);
 
-    }
 
-    private void addImageToFile(Bitmap image, File file) {
-        FileOutputStream fos = null;
-        //Tries to add the bitmap image to the file
-        try {
-            fos = new FileOutputStream(file);
-            image.compress(Bitmap.CompressFormat.PNG, 90, fos);
+                view.requestFocus();
+                InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
 
 
-        } catch (Exception e) {
-            Log.d(TAG, "trying to compress image did not work" + e.getMessage());
-        } finally {
-            try {
-                if (fos != null) {
-                    fos.close(); //Closes the fileoutput stream
-                    //Scans the image file that was just created so user can immediately see it in Pictures
-                    try {
-                        Intent mediaScanIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
-                        Uri uri = Uri.fromFile(file);
-                        mediaScanIntent.setData(uri);
-                        sendBroadcast(mediaScanIntent);
-                    } catch (Exception e) {
-                        Log.d("scanIntent", "Failed: ");
-                    }
-                }
-            } catch (IOException e) {
-                Log.d(TAG, "fos did not close " + e.getMessage());
             }
+            return true;
         }
 
-    }
 
-    //------------------------------CREATE BITMAP FROM VIEW METHOD----------------------------//
+        //----------------------------VANILLA EDITTEXT FONT SIZE METHODS--------------------------//
 
-    //Takes the current view and creates a bitmap representing that view.
-    public Bitmap getBitmapFromView(View view) {
-        view.setDrawingCacheEnabled(true);
-
-        returnedBitmap = view.getDrawingCache();
-//        Canvas canvas = new Canvas(returnedBitmap);
-//
-//        Drawable bgDrawable = view.getBackground();
-//        if (bgDrawable != null)
-//             bgDrawable.draw(canvas);
-//        else
-//            canvas.drawColor(Color.WHITE);
-//        view.draw(canvas);
-
-        return returnedBitmap;
-    }
 
+        // Sets vanilla font size to 10sp
+        public void setTen(View v) {
+            linearLayout2 = (LinearLayout) findViewById(R.id.linearLayout2);
+            linearLayout3 = (LinearLayout) findViewById(R.id.linearLayout3);
 
-    //---------------------------------DRAGGING EDITTEXT METHODS------------------------------//
-
-    // onTouch and onDrag work together to allow for views to be moved around within the layout
-    //to children of that layout
-    public boolean onTouch(final View view, MotionEvent event) {
-        final int X = (int) event.getRawX();
-        final int Y = (int) event.getRawY();
-        switch (event.getAction() & MotionEvent.ACTION_MASK) {
-            case MotionEvent.ACTION_DOWN:
-                RelativeLayout.LayoutParams lParams = (RelativeLayout.LayoutParams) view.getLayoutParams();
-                delta_x = X - lParams.leftMargin;
-                delta_y = Y - lParams.topMargin;
-                break;
-            case MotionEvent.ACTION_UP:
-                view.requestFocus();
-                InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
-                break;
-            case MotionEvent.ACTION_POINTER_DOWN:
-                break;
-            case MotionEvent.ACTION_POINTER_UP:
-                break;
-            case MotionEvent.ACTION_MOVE:
-                RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) view
-                        .getLayoutParams();
-                layoutParams.leftMargin = X - delta_x;
-                layoutParams.topMargin = Y - delta_y;
-                view.setLayoutParams(layoutParams);
-                break;
+            linearLayout2.setVisibility(View.GONE);
+            linearLayout3.setVisibility(View.VISIBLE);
+            editText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 10);
+            editText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 10);
         }
-        return true;
-    }
 
+        // Sets vanilla font size to 15sp
+        public void setFifteen(View v) {
+            linearLayout2 = (LinearLayout) findViewById(R.id.linearLayout2);
+            linearLayout3 = (LinearLayout) findViewById(R.id.linearLayout3);
+            linearLayout2.setVisibility(View.GONE);
+            linearLayout3.setVisibility(View.VISIBLE);
+            editText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
+            editText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
+        }
 
-    //----------------------------VANILLA EDITTEXT FONT SIZE METHODS--------------------------//
+        // Sets vanilla font size to 20sp
+        public void setTwenty(View v) {
+            linearLayout2 = (LinearLayout) findViewById(R.id.linearLayout2);
+            linearLayout3 = (LinearLayout) findViewById(R.id.linearLayout3);
+            linearLayout2.setVisibility(View.GONE);
+            linearLayout3.setVisibility(View.VISIBLE);
+            editText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
+            editText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
+        }
 
+        // Sets vanilla font size to 25sp
+        public void setTwentyFive(View v) {
+            linearLayout2 = (LinearLayout) findViewById(R.id.linearLayout2);
+            linearLayout3 = (LinearLayout) findViewById(R.id.linearLayout3);
+            linearLayout2.setVisibility(View.GONE);
+            linearLayout3.setVisibility(View.VISIBLE);
+            editText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 25);
+            editText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 25);
+        }
 
-    // Sets vanilla font size to 10sp
-    public void setTen(View v) {
-        linearLayout2.setVisibility(View.GONE);
-        linearLayout3.setVisibility(View.VISIBLE);
-        editText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 10);
-        editText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 10);
-    }
+        //---------------------------VANILLA EDITTEXT FONT COLOR METHODS--------------------------//
 
-    // Sets vanilla font size to 15sp
-    public void setFifteen(View v) {
-        linearLayout2.setVisibility(View.GONE);
-        linearLayout3.setVisibility(View.VISIBLE);
-        editText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
-        editText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
-    }
+        // Sets vanilla font to black
+        public void setBlack(View v) {
 
-    // Sets vanilla font size to 20sp
-    public void setTwenty(View v) {
-        linearLayout2.setVisibility(View.GONE);
-        linearLayout3.setVisibility(View.VISIBLE);
-        editText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
-        editText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
-    }
+            linearLayout3 = (LinearLayout) findViewById(R.id.linearLayout3);
+            linearLayout3.setVisibility(View.GONE);
+            editText.setVisibility(View.VISIBLE);
+            editText2.setVisibility(View.VISIBLE);
+        }
 
-    // Sets vanilla font size to 25sp
-    public void setTwentyFive(View v) {
-        linearLayout2.setVisibility(View.GONE);
-        linearLayout3.setVisibility(View.VISIBLE);
-        editText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 25);
-        editText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 25);
-    }
+        // Sets vanilla font to white
+        public void setWhite(View v) {
 
-      //----------------------------------IMAGE EFFECTS METHODS---------------------------------//
+            linearLayout3 = (LinearLayout) findViewById(R.id.linearLayout3);
+            linearLayout3.setVisibility(View.GONE);
+            editText.setVisibility(View.VISIBLE);
+            editText2.setVisibility(View.VISIBLE);
+            editText.setTextColor(Color.WHITE);
+            editText2.setTextColor(Color.WHITE);
+        }
 
+        // Sets vanilla font to red
+        public void setRed(View v) {
+            linearLayout3 = (LinearLayout) findViewById(R.id.linearLayout3);
+            linearLayout3.setVisibility(View.GONE);
+            editText.setVisibility(View.VISIBLE);
+            editText2.setVisibility(View.VISIBLE);
+            editText.setTextColor(Color.RED);
+            editText2.setTextColor(Color.RED);
+        }
 
-    // Applies engrave effect to image
-    public void clearImage(View view) {
-        Handler handler= new Handler();
-        handler.post(new Runnable() {
-            @Override
-            public void run() {
-                imageView.setImageBitmap(uriBm);
-                demoImage.setImageBitmap(uriBm);
-                Toast.makeText(EditPhoto.this, "Cleared", Toast.LENGTH_SHORT).show();
+        // Sets vanilla font to blue
+        public void setBlue(View v) {
 
-            }
-        });
+            linearLayout3 = (LinearLayout) findViewById(R.id.linearLayout3);
+            linearLayout3.setVisibility(View.GONE);
+            editText.setVisibility(View.VISIBLE);
+            editText2.setVisibility(View.VISIBLE);
+            editText.setTextColor(Color.BLUE);
+            editText2.setTextColor(Color.BLUE);
 
-    }
 
-    // Applies engrave effect to image
-    public void engravedImage(View view) {
-        new Handler().post(new Runnable() {
-            @Override
-            public void run() {
 
-                    Bitmap engraved = ApplyFilters.engrave(uriBm);
-                    imageView.setImageBitmap(engraved);
-                    demoImage.setImageBitmap(engraved);
+        }
 
-                Toast.makeText(EditPhoto.this, "Engraved", Toast.LENGTH_SHORT).show();
 
+        //----------------------------------IMAGE EFFECTS METHODS---------------------------------//
+
+        // Applies engrave effect to image
+        public void engravedImage(View view) {
+            if (getIntent().hasExtra("byteArray")) {
+                imageView.setImageBitmap(null);
+                demoImage.setImageBitmap(null);
+                Bitmap engraved = ApplyFilters.engrave(b);
+                imageView.setImageBitmap(engraved);
+                demoImage.setImageBitmap(engraved);
+            } else {
+                imageView.setImageBitmap(null);
+                demoImage.setImageBitmap(null);
+                Bitmap engraved = ApplyFilters.engrave(bitmap);
+                imageView.setImageBitmap(engraved);
+                demoImage.setImageBitmap(engraved);
             }
-        });
-
-    }
-
-    // Applies inverted colors effect to image
-    public void invertColors(View view) {
-        Handler handler= new Handler();
-        handler.post(new Runnable() {
-            @Override
-            public void run() {
-
-                    Bitmap inverted = ApplyFilters.doInvert(uriBm);
-                    imageView.setImageBitmap(inverted);
-                    demoImage.setImageBitmap(inverted);
-
-                Toast.makeText(EditPhoto.this, "Inverted", Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, "Engraved", Toast.LENGTH_SHORT).show();
+        }
 
+        // Applies inverted colors effect to image
+        public void invertColors(View view) {
+            if (getIntent().hasExtra("byteArray")) {
+                imageView.setImageBitmap(null);
+                demoImage.setImageBitmap(null);
+                Bitmap inverted = ApplyFilters.doInvert(b);
+                imageView.setImageBitmap(inverted);
+                demoImage.setImageBitmap(inverted);
+            } else {
+                imageView.setImageBitmap(null);
+                demoImage.setImageBitmap(null);
+                Bitmap inverted = ApplyFilters.doInvert(bitmap);
+                imageView.setImageBitmap(inverted);
+                demoImage.setImageBitmap(inverted);
             }
-        });
+            Toast.makeText(this,"Inverted",Toast.LENGTH_SHORT).show();
 
-    }
-
-    // Applies greyscale effect to image
-    public void greyscaleImage(View view) {
-        Handler handler=new Handler();
-        handler.post(new Runnable() {
-            @Override
-            public void run() {
-
-                    Bitmap greyscaled = ApplyFilters.doGreyscale(uriBm);
-                    imageView.setImageBitmap(greyscaled);
-                    demoImage.setImageBitmap(greyscaled);
+        }
 
-                Toast.makeText(EditPhoto.this, "Greyscale", Toast.LENGTH_SHORT).show();
+        // Applies greyscale effect to image
+        public void greyscaleImage(View view) {
+            if (getIntent().hasExtra("byteArray")) {
+                imageView.setImageBitmap(null);
+                demoImage.setImageBitmap(null);
+                Bitmap greyscaled = ApplyFilters.doGreyscale(b);
+                imageView.setImageBitmap(greyscaled);
+                demoImage.setImageBitmap(greyscaled);
+            } else {
+                imageView.setImageBitmap(null);
+                demoImage.setImageBitmap(null);
+                Bitmap greyscaled = ApplyFilters.doGreyscale(bitmap);
+                imageView.setImageBitmap(greyscaled);
+                demoImage.setImageBitmap(greyscaled);
             }
-        });
-
-    }
-
-    // Applies blue shading effect to image
-    public void shadingFilterBlue(View view) {
-
-            Bitmap blueShade = ApplyFilters.applyShadingFilter(uriBm, Color.BLUE);
-            imageView.setImageBitmap(blueShade);
-            demoImage.setImageBitmap(blueShade);
-
-        Toast.makeText(this, "Blue", Toast.LENGTH_SHORT).show();
-    }
-
-    // Applies red shading effect to image
-    public void shadingFilterRed(View view) {
-
-            Bitmap redShade = ApplyFilters.applyShadingFilter(uriBm, Color.RED);
-            imageView.setImageBitmap(redShade);
-            demoImage.setImageBitmap(redShade);
-
-        Toast.makeText(this, "Red", Toast.LENGTH_SHORT).show();
-    }
-
-    // Applies green shading effect to image
-    public void shadingFilterGreen(View view) {
-
-            Bitmap greenShade = ApplyFilters.applyShadingFilter(uriBm, Color.GREEN);
-            imageView.setImageBitmap(greenShade);
-            demoImage.setImageBitmap(greenShade);
+            Toast.makeText(this,"Greyscale",Toast.LENGTH_SHORT).show();
+        }
 
-        Toast.makeText(this, "Green", Toast.LENGTH_SHORT).show();
-    }
+        // Applies blue shading effect to image
+        public void shadingFilterBlue(View view) {
+            if (getIntent().hasExtra("byteArray")) {
+                imageView.setImageBitmap(null);
+                demoImage.setImageBitmap(null);
+                Bitmap blueShade = ApplyFilters.applyShadingFilter(b, Color.BLUE);
+                imageView.setImageBitmap(blueShade);
+                demoImage.setImageBitmap(blueShade);
+            } else {
+                imageView.setImageBitmap(null);
+                demoImage.setImageBitmap(null);
+                Bitmap blueShade = ApplyFilters.applyShadingFilter(bitmap, Color.BLUE);
+                imageView.setImageBitmap(blueShade);
+                demoImage.setImageBitmap(blueShade);
+            }
+            Toast.makeText(this,"Blue",Toast.LENGTH_SHORT).show();
+        }
 
+        // Applies red shading effect to image
+        public void shadingFilterRed(View view) {
+            if (getIntent().hasExtra("byteArray")) {
+                imageView.setImageBitmap(null);
+                demoImage.setImageBitmap(null);
+                Bitmap redShade = ApplyFilters.applyShadingFilter(b, Color.RED);
+                imageView.setImageBitmap(redShade);
+                demoImage.setImageBitmap(redShade);
+            } else {
+                imageView.setImageBitmap(null);
+                demoImage.setImageBitmap(null);
+                Bitmap redShade = ApplyFilters.applyShadingFilter(bitmap, Color.RED);
+                imageView.setImageBitmap(redShade);
+                demoImage.setImageBitmap(redShade);
+            }
+            Toast.makeText(this,"Red",Toast.LENGTH_SHORT).show();
+        }
 
-    public void choseColor(View v) {
-        color = colorPicker.getColor();
-        linearLayout3.setVisibility(View.GONE);
-        editText.setVisibility(View.VISIBLE);
-        editText2.setVisibility(View.VISIBLE);
-        editText.setTextColor(color);
-        editText2.setTextColor(color);
-    }
+        // Applies green shading effect to image
+        public void shadingFilterGreen(View view) {
+
+            if (getIntent().hasExtra("byteArray")) {
+                imageView.setImageBitmap(null);
+                demoImage.setImageBitmap(null);
+                Bitmap greenShade = ApplyFilters.applyShadingFilter(b, Color.GREEN);
+                imageView.setImageBitmap(greenShade);
+                demoImage.setImageBitmap(greenShade);
+            } else {
+                imageView.setImageBitmap(null);
+                demoImage.setImageBitmap(null);
+                Bitmap greenShade = ApplyFilters.applyShadingFilter(bitmap, Color.GREEN);
+                imageView.setImageBitmap(greenShade);
+                demoImage.setImageBitmap(greenShade);
+            }
+            Toast.makeText(this,"Green",Toast.LENGTH_SHORT).show();
+        }
 
+        public void clearImage(View view){
+            if (getIntent().hasExtra("byteArray")) {
+                imageView.setImageBitmap(null);
+                imageView.setImageBitmap(b);
+                demoImage.setImageBitmap(null);
+                demoImage.setImageBitmap(b);
+            } else {
+                imageView.setImageBitmap(null);
+                imageView.setImageBitmap(bitmap);
+                demoImage.setImageBitmap(null);
+                demoImage.setImageBitmap(bitmap);
+            }
+            Toast.makeText(this,"Normal",Toast.LENGTH_SHORT).show();
+        }
 
-    public void vanillaM(View v) {
-        editText.setVisibility(View.VISIBLE);
-        editText.setHintTextColor(Color.parseColor("#BF311F"));
-        editText2.setVisibility(View.VISIBLE);
-        editText2.setHintTextColor(Color.parseColor("#BF311F"));
-        memeLayout.setPadding(0, 0, 0, 0);
-        linearLayout2.setVisibility(View.VISIBLE);
-        imageView.setVisibility(View.VISIBLE);
-        demoImage.setVisibility(View.INVISIBLE);
-        demoTitle.setVisibility(View.GONE);
-        demoText.setVisibility(View.GONE);
-        ten.setVisibility(View.VISIBLE);
-        fifteen.setVisibility(View.VISIBLE);
-        twenty.setVisibility(View.VISIBLE);
-        twentyFive.setVisibility(View.VISIBLE);
-        colorPicker.setVisibility(View.VISIBLE);
-        memeLayout.setBackgroundColor(Color.parseColor("#CCCCCC"));
-
-        if (colorPicker.isSelected()) {
+        public void choseColor (View v) {
+            color = colorPicker.getColor();
+            linearLayout3 = (LinearLayout) findViewById(R.id.linearLayout3);
+            linearLayout3.setVisibility(View.GONE);
             editText.setVisibility(View.VISIBLE);
             editText2.setVisibility(View.VISIBLE);
-        } else {
-            editText.setVisibility(View.GONE);
-            editText2.setVisibility(View.GONE);
+            editText.setTextColor(color);
+            editText2.setTextColor(color);
         }
 
-
+        public void vanillaM(View v) {
+                linearLayout2 = (LinearLayout) findViewById(R.id.linearLayout2);
+                linearLayout3 = (LinearLayout) findViewById(R.id.linearLayout3);
+                editText = (EditText) findViewById(R.id.editText);
+                editText2 = (EditText) findViewById(R.id.editText2);
+                editText.setVisibility(View.VISIBLE);
+                editText2.setVisibility(View.VISIBLE);
+                memeLayout = (RelativeLayout) findViewById(R.id.meme);
+                memeLayout.setPadding(0, 0, 0, 0);
+                demoImage = (ImageView) findViewById(R.id.demotivationalImage);
+                demoTitle = (EditText) findViewById(R.id.demotivationalTitle);
+                demoText = (EditText) findViewById(R.id.demotivationalText);
+                linearLayout2.setVisibility(View.VISIBLE);
+                imageView.setVisibility(View.VISIBLE);
+                demoImage.setVisibility(View.INVISIBLE);
+                demoTitle.setVisibility(View.INVISIBLE);
+                demoText.setVisibility(View.INVISIBLE);
+                ten.setVisibility(View.VISIBLE);
+                fifteen.setVisibility(View.VISIBLE);
+                twenty.setVisibility(View.VISIBLE);
+                twentyFive.setVisibility(View.VISIBLE);
+                colorPicker.setVisibility(View.VISIBLE);
+                memeLayout.setBackgroundColor(Color.parseColor("#CCCCCC"));
+        }
+        public void setTopColor(int color) {
+            editText = (EditText) findViewById(R.id.editText);
+            editText2 = (EditText) findViewById(R.id.editText2);
+            editText.setTextColor(color);
+            editText.setHintTextColor(color);
+            editText.invalidate();
+            editText2.setTextColor(color);
+            editText2.setHintTextColor(color);
+            editText2.invalidate();
+        }
     }
 
-    public void setTopColor(int color) {
-        editText.setTextColor(color);
-        editText.setHintTextColor(color);
-        editText.invalidate();
-        editText2.setTextColor(color);
-        editText2.setHintTextColor(color);
-        editText2.invalidate();
-    }
-}
diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java
index 2618d2e..b6c6183 100644
--- a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java
+++ b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java
@@ -66,6 +66,14 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         Intent intent = new Intent(MainActivity.this, EditPhoto.class);
 
         if (requestCode == REQUEST_IMAGE_CAPTURE && resultCode == RESULT_OK) {
+
+            Bundle extras = data.getExtras();
+            Bitmap imageBitmap = (Bitmap) extras.get("data");
+            ByteArrayOutputStream bs = new ByteArrayOutputStream();
+            imageBitmap.compress(Bitmap.CompressFormat.JPEG, 50, bs);
+            intent.putExtra("byteArray", bs.toByteArray());
+            startActivity(intent);
+
 //            Bundle extras = data.getExtras();
 //            Bitmap imageBitmap = (Bitmap) extras.get("data");
 //            ByteArrayOutputStream bs = new ByteArrayOutputStream();
@@ -77,6 +85,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
 
 
+
         }
 
         if (requestCode == EXTERNAL_CONTENT_URI && resultCode == RESULT_OK & data!= null) {
@@ -89,7 +98,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             targetUri = data.getData();
             intent.putExtra("image", targetUri);
 
-
 //            Bitmap bitmap = null;
 //            ContentResolver cr = getContentResolver();
 //
@@ -102,16 +110,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 //            } catch (IOException e) {
 //                e.printStackTrace();
 //            }
-//
-//
-
 
         }
         //pass image to intent
         if (targetUri != null) {
             startActivity(intent);
         }
-
     }
-
 }
\ No newline at end of file
diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeList.java b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeList.java
index 4cff6ef..f8a4de1 100644
--- a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeList.java
+++ b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeList.java
@@ -71,9 +71,6 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
             }
         });
 
-
-
-
     }
 
     public void addItemsToArrays(ArrayList<Integer> images, ArrayList<String> titles) {
diff --git a/MemeProject/app/src/main/res/layout/activity_edit_photo.xml b/MemeProject/app/src/main/res/layout/activity_edit_photo.xml
index 0e3a58b..04e2ee1 100644
--- a/MemeProject/app/src/main/res/layout/activity_edit_photo.xml
+++ b/MemeProject/app/src/main/res/layout/activity_edit_photo.xml
@@ -274,7 +274,8 @@
             <EditText
                 style="@style/VanillaText"
                 android:id="@+id/editText2"
-                android:layout_alignParentBottom="true"/>
+                android:layout_alignParentTop="true"
+                android:layout_alignEnd="@+id/demotivationalText" />
 
             <!-- Demotivational EditTexts -->
             <EditText