         inputTextField.inputAccessoryView = inputAccessory
         inputPicker.addTarget(self, action: #selector(RowView.didTapInputPickerButton(_:)), forControlEvents: .TouchUpInside)
 
-        addSubview(buttonStackView)
+        let containerView = UIView()
+        containerView.setContentHuggingPriority(1000, forAxis: .Vertical)
+        addSubview(containerView)
+        containerView.snp_makeConstraints { (make) in
+            make.left.equalTo(kHorizontalMargin)
+            make.top.equalTo(kVerticalMargin)
+            make.bottom.equalTo(-kVerticalMargin)
+        }
+        
+        containerView.addSubview(buttonStackView)
         setupButtonStackView()
         buttonStackView.snp_makeConstraints { (make) in
-            make.left.equalTo(self).offset(kHorizontalMargin)
-            make.top.equalTo(self).offset(kVerticalMargin)
+            make.left.equalTo(containerView)
+            make.top.equalTo(containerView)
             make.height.equalTo(28)
-        }
-        
-        deleteButton.addTarget(self, action: #selector(RowView.didTapDeleteButton(_:)), forControlEvents: UIControlEvents.TouchUpInside)
-        addSubview(deleteButton)
-        deleteButton.snp_makeConstraints { (make) in
-            make.width.equalTo(24)
-            make.height.equalTo(24)
-            make.centerY.equalTo(buttonStackView)
-            make.right.equalTo(self).offset(-8).priority(990)
-            make.left.equalTo(buttonStackView.snp_right).priority(750)
-        }
-                
-        addSubview(inputStackView)
+            make.right.equalTo(containerView).priority(1000)
+        }
+        
+        containerView.addSubview(inputStackView)
         inputStackView.snp_makeConstraints { (make) in
-            make.left.equalTo(self).offset(kHorizontalMargin)
-            make.right.equalTo(self).offset(-kHorizontalMargin).priority(990)
+            make.left.equalTo(containerView)
+            make.right.equalTo(containerView)
             make.top.equalTo(buttonStackView.snp_bottom).offset(0)
             self.stackViewHeightConstraint = make.height.equalTo(0).constraint
-            self.stackViewBottomMarginConstraint = make.bottom.equalTo(self).offset(-kVerticalMargin).constraint
+            self.stackViewBottomMarginConstraint = make.bottom.equalTo(containerView).constraint
         }
         
         addSubview(separatorView)

            make.bottom.equalTo(self)
            make.height.equalTo(1)
        }
    }
    
    func configureViews() {

    
    let comparisonButton: UIButton = {
        let button = UIButton(type: .Custom)
        button.setContentHuggingPriority(500, forAxis: UILayoutConstraintAxis.Horizontal)
        button.setContentCompressionResistancePriority(500, forAxis: UILayoutConstraintAxis.Horizontal)
        button.clipsToBounds = true
        button.titleLabel?.lineBreakMode = .ByTruncatingTail;
        button.contentHorizontalAlignment = .Left
        button.setTitleColor(UIColor.magentaColor(), forState: UIControlState.Normal)
        return button
