diff --git a/MVMCoreUI/Atoms/Views/ListItemWithImage.swift b/MVMCoreUI/Atoms/Views/ListItemWithImage.swift
index 5a383452..55b63edb 100644
--- a/MVMCoreUI/Atoms/Views/ListItemWithImage.swift
+++ b/MVMCoreUI/Atoms/Views/ListItemWithImage.swift
@@ -1,5 +1,5 @@
 //
-//  StandardListItemWithImage.swift
+//  ListItemWithImage.swift
 //  MVMCoreUI
 //
 //  Created by Christiano, Kevin on 6/20/19.
@@ -69,7 +69,7 @@ import UIKit
         leftContainer.addSubview(message)
         leftContainer.addSubview(button)
         
-        leftContainer.topAnchor.constraint(equalTo: topAnchor).isActive = true
+        leftContainer.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
         leftContainer.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
         
         bottomAnchor.constraint(greaterThanOrEqualTo: leftContainer.bottomAnchor).isActive = true
@@ -91,17 +91,17 @@ import UIKit
         buttonTopConstraint?.isActive = true
         
         button.leadingAnchor.constraint(equalTo: leftContainer.leadingAnchor).isActive = true
-        button.bottomAnchor.constraint(equalTo: leftContainer.bottomAnchor).isActive = true
+        leftContainer.bottomAnchor.constraint(equalTo: button.bottomAnchor).isActive = true
         leftContainer.trailingAnchor.constraint(greaterThanOrEqualTo: button.trailingAnchor).isActive = true
         
         imageLoader.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
         layoutMarginsGuide.trailingAnchor.constraint(equalTo: imageLoader.trailingAnchor).isActive = true
         imageLeadingConstraint = imageLoader.leadingAnchor.constraint(equalTo: leftContainer.trailingAnchor, constant: 16)
         imageLeadingConstraint?.isActive = true
-        imageLoader.topAnchor.constraint(greaterThanOrEqualTo: topAnchor).isActive = true
+        imageLoader.topAnchor.constraint(greaterThanOrEqualTo: layoutMarginsGuide.topAnchor).isActive = true
         
-        bottomAnchor.constraint(greaterThanOrEqualTo: imageLoader.bottomAnchor).isActive = true
-        let imageloaderBottom = imageLoader.bottomAnchor.constraint(equalTo: bottomAnchor)
+        layoutMarginsGuide.bottomAnchor.constraint(greaterThanOrEqualTo: imageLoader.bottomAnchor).isActive = true
+        let imageloaderBottom = imageLoader.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor)
         imageloaderBottom.priority = UILayoutPriority(249)
         imageloaderBottom.isActive = true
     }