diff --git a/RegressionUITests/RegressionUITests.swift b/RegressionUITests/RegressionUITests.swift
index 39aa09c..1e25339 100644
--- a/RegressionUITests/RegressionUITests.swift
+++ b/RegressionUITests/RegressionUITests.swift
@@ -49,8 +49,9 @@ class RegressionUITests: XCTestCase {
         }
         lastResult = result
         // Post the report to the dashboard
-
         // try axe?.postResult(result, withScanName: name)
+      
+        // Save report locally, will be used in the reporter CLI from a Github Action
         _ = try axe?.saveResult(result, toPath: "RegressionScans", withFileName: name, withScanName: name)
     }
 
diff --git a/axe-devtools-ios-sample-app/Catalog/ItemType/ItemTypeView.swift b/axe-devtools-ios-sample-app/Catalog/ItemType/ItemTypeView.swift
index a134c93..dcf711f 100644
--- a/axe-devtools-ios-sample-app/Catalog/ItemType/ItemTypeView.swift
+++ b/axe-devtools-ios-sample-app/Catalog/ItemType/ItemTypeView.swift
@@ -64,32 +64,19 @@ class ItemTypeView: UIView {
     override func updateConstraints() {
         super.updateConstraints()
 
-        NSLayoutConstraint.activate([
-            self.heightAnchor.constraint(equalToConstant: 90),
-            self.widthAnchor.constraint(equalToConstant: 327)
-        ])
-
         NSLayoutConstraint.activate([
             nameLabel.topAnchor.constraint(equalTo: self.topAnchor, constant: 19),
             nameLabel.leadingAnchor.constraint(equalTo: self.leadingAnchor, constant: 32),
-            nameLabel.heightAnchor.constraint(equalToConstant: 24)
+            nameLabel.heightAnchor.constraint(greaterThanOrEqualToConstant: 24)
         ])
 
         NSLayoutConstraint.activate([
-            subtitleLabel.heightAnchor.constraint(equalToConstant: 16),
+            subtitleLabel.heightAnchor.constraint(greaterThanOrEqualToConstant: 16),
             subtitleLabel.topAnchor.constraint(equalTo: nameLabel.bottomAnchor, constant: 8),
             subtitleLabel.leadingAnchor.constraint(equalTo: nameLabel.leadingAnchor),
             subtitleLabel.bottomAnchor.constraint(equalTo: self.bottomAnchor, constant: -19)
         ])
 
-        NSLayoutConstraint.activate([
-            itemImage.topAnchor.constraint(equalTo: self.topAnchor, constant: -8),
-            itemImage.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -34),
-            itemImage.bottomAnchor.constraint(equalTo: self.bottomAnchor),
-            itemImage.heightAnchor.constraint(equalToConstant: 100),
-            itemImage.widthAnchor.constraint(equalToConstant: 90)
-        ])
-
         if viewModel.typeName == "Accessories" {
             let accessoriesSecondImage = UIImage(named: "necktie")
             let imageView = UIImageView(image: accessoriesSecondImage)
@@ -100,17 +87,23 @@ class ItemTypeView: UIView {
             let accessoriesImagesConstraints = [
                 itemImage.topAnchor.constraint(equalTo: self.topAnchor, constant: -8),
                 itemImage.bottomAnchor.constraint(equalTo: self.bottomAnchor),
-                itemImage.heightAnchor.constraint(equalToConstant: 100),
                 itemImage.widthAnchor.constraint(equalToConstant: 90),
                 imageView.topAnchor.constraint(equalTo: self.topAnchor, constant: -8),
                 imageView.leadingAnchor.constraint(equalTo: itemImage.trailingAnchor, constant: 4),
                 imageView.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -6),
                 imageView.bottomAnchor.constraint(equalTo: self.bottomAnchor),
-                imageView.heightAnchor.constraint(equalToConstant: 78),
                 imageView.widthAnchor.constraint(equalToConstant: 16)
             ]
 
             NSLayoutConstraint.activate(accessoriesImagesConstraints)
+        } else {
+            NSLayoutConstraint.activate([
+                itemImage.topAnchor.constraint(equalTo: self.topAnchor, constant: -8),
+                itemImage.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -34),
+                itemImage.bottomAnchor.constraint(equalTo: self.bottomAnchor),
+                itemImage.heightAnchor.constraint(equalToConstant: 100),
+                itemImage.widthAnchor.constraint(equalToConstant: 90)
+            ])
         }
     }
 }
diff --git a/axe-devtools-ios-sample-app/Catalog/Views/CatalogHeaderImageView.swift b/axe-devtools-ios-sample-app/Catalog/Views/CatalogHeaderImageView.swift
index 42bbf22..d90fefa 100644
--- a/axe-devtools-ios-sample-app/Catalog/Views/CatalogHeaderImageView.swift
+++ b/axe-devtools-ios-sample-app/Catalog/Views/CatalogHeaderImageView.swift
@@ -49,11 +49,6 @@ class CatalogHeaderImageView: UIImageView {
     override func updateConstraints() {
         super.updateConstraints()
 
-        NSLayoutConstraint.activate([
-            self.widthAnchor.constraint(equalToConstant: 327),
-            self.heightAnchor.constraint(equalToConstant: 327)
-        ])
-        
         NSLayoutConstraint.activate([
             textLabel.topAnchor.constraint(equalTo: self.topAnchor, constant: 16),
             textLabel.centerXAnchor.constraint(equalTo: self.centerXAnchor)
@@ -62,8 +57,7 @@ class CatalogHeaderImageView: UIImageView {
         NSLayoutConstraint.activate([
             dotIcons.heightAnchor.constraint(equalToConstant: 12),
             dotIcons.widthAnchor.constraint(equalToConstant: 78),
-            dotIcons.leadingAnchor.constraint(equalTo: self.leadingAnchor, constant: 125),
-            dotIcons.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -125),
+            dotIcons.centerXAnchor.constraint(equalTo: self.centerXAnchor),
             dotIcons.bottomAnchor.constraint(equalTo: self.bottomAnchor)
         ])
     }
diff --git a/axe-devtools-ios-sample-app/Catalog/Views/CatalogView.swift b/axe-devtools-ios-sample-app/Catalog/Views/CatalogView.swift
index 7ccfd91..6da0498 100644
--- a/axe-devtools-ios-sample-app/Catalog/Views/CatalogView.swift
+++ b/axe-devtools-ios-sample-app/Catalog/Views/CatalogView.swift
@@ -19,12 +19,12 @@ class CatalogView: UIView {
         return l
     }()
 
-    lazy var searchImageView: UIImageView = {
-        let iv = UIImageView()
-        iv.translatesAutoresizingMaskIntoConstraints = false
-        let image = UIImage(named: "Search")
-        iv.image = image
-        return iv
+    lazy var searchButton: UIButton = {
+        let searchButton = UIButton()
+        searchButton.translatesAutoresizingMaskIntoConstraints = false
+        searchButton.setImage(UIImage(named: "Search"), for: .normal)
+        searchButton.accessibilityTraits = [.button, .image, .link]
+        return searchButton
     }()
 
     lazy var allCategories: AllCategoriesCollectionView = {
@@ -58,7 +58,7 @@ class CatalogView: UIView {
         self.translatesAutoresizingMaskIntoConstraints = false
 
         self.addSubview(titleLabel)
-        self.addSubview(searchImageView)
+        self.addSubview(searchButton)
         self.addSubview(allCategories)
         self.addSubview(newCollectionImageView)
         self.addSubview(allItemTypesView)
@@ -76,15 +76,14 @@ class CatalogView: UIView {
         ])
 
         NSLayoutConstraint.activate([
-            searchImageView.heightAnchor.constraint(equalToConstant: 18),
-            searchImageView.widthAnchor.constraint(equalToConstant: 18),
-            searchImageView.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor),
-            searchImageView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -28)
+            searchButton.heightAnchor.constraint(equalToConstant: 18),
+            searchButton.widthAnchor.constraint(equalToConstant: 18),
+            searchButton.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor),
+            searchButton.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -28)
         ])
 
         NSLayoutConstraint.activate([
             allCategories.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 24),
-            allCategories.leadingAnchor.constraint(equalTo: self.leadingAnchor, constant: 24),
             allCategories.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: 24),
             allCategories.heightAnchor.constraint(equalToConstant: 32),
             allCategories.widthAnchor.constraint(equalTo: self.widthAnchor)
@@ -94,8 +93,7 @@ class CatalogView: UIView {
             newCollectionImageView.topAnchor.constraint(equalTo: allCategories.bottomAnchor, constant: 40),
             newCollectionImageView.leadingAnchor.constraint(equalTo: self.leadingAnchor, constant: 24),
             newCollectionImageView.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -24),
-            newCollectionImageView.heightAnchor.constraint(equalToConstant: 327),
-            newCollectionImageView.widthAnchor.constraint(equalToConstant: 327)
+            newCollectionImageView.heightAnchor.constraint(greaterThanOrEqualToConstant: 327)
         ])
 
         NSLayoutConstraint.activate([