diff --git a/core/models.py b/core/models.py
index 6cbdc4e..7755866 100644
--- a/core/models.py
+++ b/core/models.py
@@ -5,6 +5,7 @@ from io import BytesIO
 from django.conf import settings
 from django.core.files.uploadedfile import InMemoryUploadedFile
 from django.db import models, transaction
+from django.dispatch import receiver
 
 from django_images.models import Image as BaseImage, Thumbnail
 from taggit.managers import TaggableManager
@@ -49,3 +50,7 @@ class Pin(models.Model):
     def __unicode__(self):
         return '%s - %s' % (self.submitter, self.published)
 
+
+@receiver(models.signals.post_delete, sender=Pin)
+def delete_pin_images(sender, instance, **kwargs):
+    instance.image.delete()
diff --git a/pinry/settings/base.py b/pinry/settings/base.py
index f342ecf..e90825a 100644
--- a/pinry/settings/base.py
+++ b/pinry/settings/base.py
@@ -133,3 +133,6 @@ IMAGE_SIZES = {
     'standard': {'size': [600, 0]},
     'square': {'crop': True, 'size': [125, 125]},
 }
+
+# User custom settings
+IMAGE_AUTO_DELETE = True
diff --git a/pinry/static/css/lightbox.css b/pinry/static/css/lightbox.css
index a55f160..528eaa4 100644
--- a/pinry/static/css/lightbox.css
+++ b/pinry/static/css/lightbox.css
@@ -22,6 +22,7 @@
 }
 
 .lightbox-wrapper img {
+    max-width: 600px;
     display: none;
     -webkit-border-top-right-radius: 3px;
      -webkit-border-top-left-radius: 3px;
diff --git a/pinry/templates/includes/lightbox.html b/pinry/templates/includes/lightbox.html
index 46f0283..ba7dd1e 100644
--- a/pinry/templates/includes/lightbox.html
+++ b/pinry/templates/includes/lightbox.html
@@ -3,7 +3,7 @@
         <div class="lightbox-background">
             <div class="lightbox-wrapper">
                 <div class="lightbox-image-wrapper">
-                    <img class="lightbox-image" src="{{image.standard.image}}" />
+                    <img class="lightbox-image" src="{{image.image}}" />
                 </div>
                 <div class="lightbox-data clearfix">
                 {{#if description}}