         super.init(frame: frame)
         isAccessibilityElement = true
         accessibilityIdentifier = "TopSite"
-
         contentView.addSubview(titleLabel)
         contentView.addSubview(faviconBG)
         contentView.addSubview(imageView)
         contentView.addSubview(selectedOverlay)
 
         titleLabel.snp.makeConstraints { make in
-            make.left.equalTo(self).offset(TopSiteCellUX.TitleOffset)
-            make.right.equalTo(self).offset(-TopSiteCellUX.TitleOffset)
+            make.left.equalTo(contentView).offset(TopSiteCellUX.TitleOffset)
+            make.right.equalTo(contentView).offset(-TopSiteCellUX.TitleOffset)
             make.height.equalTo(TopSiteCellUX.TitleHeight)
-            make.bottom.equalTo(self)
+            make.bottom.equalTo(contentView)
         }
 
         imageView.snp.makeConstraints { make in
             make.size.equalTo(floor(frame.width * TopSiteCellUX.IconSizePercent))
-            make.centerX.equalTo(self)
-            make.centerY.equalTo(self).inset(-TopSiteCellUX.TitleHeight/2)
+            make.centerX.equalTo(contentView)
+            make.centerY.equalTo(contentView).inset(-TopSiteCellUX.TitleHeight/2)
         }
 
         selectedOverlay.snp.makeConstraints { make in

        }

        faviconBG.snp.makeConstraints { make in
            make.top.left.right.equalTo(self)
            make.bottom.equalTo(self).inset(TopSiteCellUX.TitleHeight)
        }
    }

    override func layoutSubviews() {
        super.layoutSubviews()
        titleBorder.frame = CGRect(x: 0, y: frame.height - TopSiteCellUX.TitleHeight -  TopSiteCellUX.BorderWidth, width: frame.width, height: TopSiteCellUX.BorderWidth)

        imageView.snp.remakeConstraints { make in
            make.size.equalTo(floor(self.frame.width * TopSiteCellUX.IconSizePercent))
            make.centerX.equalTo(self)
            make.centerY.equalTo(self).inset(-TopSiteCellUX.TitleHeight/2)
        }
    }

    required init?(coder aDecoder: NSCoder) {

        pinImageView.removeFromSuperview()
        imageView.sd_cancelCurrentImageLoad()
        titleLabel.text = ""
    }

    func configureWithTopSiteItem(_ site: Site) {
