diff --git a/docs/admob/index.md b/docs/admob/index.md
index 6f246b03..fb56d8bf 100644
--- a/docs/admob/index.md
+++ b/docs/admob/index.md
@@ -17,7 +17,7 @@ _We are currently investigating how to integrate with [Native Ads](https://devel
 
 ## Getting Started
 
-<Grid>
+<Grid columns="2">
 	<Block
 		icon="attach_money"
 		color="#2196f3"
@@ -28,7 +28,7 @@ _We are currently investigating how to integrate with [Native Ads](https://devel
 	</Block>
   	<Block
 		icon="pan_tool"
-		color="##f44336"
+		color="#f44336"
 		title="European User Consent"
 		to="european-user-consent"
 	>
diff --git a/docs/analytics/index.md b/docs/analytics/index.md
index 75b7f41f..da1ebbc8 100644
--- a/docs/analytics/index.md
+++ b/docs/analytics/index.md
@@ -13,7 +13,7 @@ device information, location, user actions and more.
 
 ## Getting Started
 
-<Grid>
+<Grid columns="2">
 	<Block
 		icon="multiline_chart"
 		color="#2196f3"
diff --git a/docs/auth/index.md b/docs/auth/index.md
index ad6c12c7..5749d809 100644
--- a/docs/auth/index.md
+++ b/docs/auth/index.md
@@ -12,7 +12,7 @@ React Native Firebase provides access to all Firebase authentication methods and
 
 ## Getting Started
 
-<Grid>
+<Grid columns="3">
 	<Block
 		icon="build"
 		color="#ffc107"
diff --git a/docs/crashlytics/index.md b/docs/crashlytics/index.md
index ce594645..ba8608fd 100644
--- a/docs/crashlytics/index.md
+++ b/docs/crashlytics/index.md
@@ -14,7 +14,7 @@ application.
 
 ## Getting Started
 
-<Grid>
+<Grid columns="3">
 	<Block
 		icon="build"
 		color="#ffc107"
diff --git a/docs/database/index.md b/docs/database/index.md
index c2589fce..90a2575e 100644
--- a/docs/database/index.md
+++ b/docs/database/index.md
@@ -13,7 +13,7 @@ both realtime data sync and offline capabilities.
 
 ## Getting Started
 
-<Grid>
+<Grid columns="2">
 	<Block
 		icon="build"
 		color="#ffc107"
diff --git a/docs/dynamic-links/index.md b/docs/dynamic-links/index.md
index cbd0fad1..415dbcab 100644
--- a/docs/dynamic-links/index.md
+++ b/docs/dynamic-links/index.md
@@ -16,7 +16,7 @@ users, view the <Anchor group="notifications" href="/">Notifications</Anchor> mo
 
 ## Getting Started
 
-<Grid>
+<Grid columns="3">
 	<Block
 		icon="build"
 		color="#ffc107"
diff --git a/docs/firestore/android.md b/docs/firestore/android.md
new file mode 100644
index 00000000..df2d0596
--- /dev/null
+++ b/docs/firestore/android.md
@@ -0,0 +1,6 @@
+---
+title: Android Setup
+description: Manually integrate Cloud Firestore into your Android application.
+---
+
+# Android Manual Linking
diff --git a/docs/firestore/index.md b/docs/firestore/index.md
index 3cc69bb6..2076a7fb 100644
--- a/docs/firestore/index.md
+++ b/docs/firestore/index.md
@@ -13,7 +13,7 @@ performance and offline capabilities.
 
 ## Getting Started
 
-<Grid>
+<Grid columns="3">
 	<Block
 		icon="build"
 		color="#ffc107"
diff --git a/docs/firestore/ios.md b/docs/firestore/ios.md
new file mode 100644
index 00000000..a74bfc56
--- /dev/null
+++ b/docs/firestore/ios.md
@@ -0,0 +1,4 @@
+---
+title: iOS Setup
+description: Manually integrate Cloud Firestore into your iOS application.
+---
diff --git a/docs/functions/index.md b/docs/functions/index.md
index 230eb93f..954d1003 100644
--- a/docs/functions/index.md
+++ b/docs/functions/index.md
@@ -12,7 +12,7 @@ React Native Firebase supports integration with production and locally emulated
 
 ## Getting Started
 
-<Grid>
+<Grid columns="2">
 	<Block
 		icon="build"
 		color="#ffc107"
diff --git a/docs/iid/index.md b/docs/iid/index.md
index 9aaee7a3..8b98e3c3 100644
--- a/docs/iid/index.md
+++ b/docs/iid/index.md
@@ -10,7 +10,7 @@ your app's server side managed resources, for example sending FCM messages.
 
 ## Getting Started
 
-<Grid>
+<Grid columns="3">
 	<Block
 		icon="build"
 		color="#ffc107"
diff --git a/docs/in-app-messaging/index.md b/docs/in-app-messaging/index.md
index bc4659d0..fa03965a 100644
--- a/docs/in-app-messaging/index.md
+++ b/docs/in-app-messaging/index.md
@@ -13,7 +13,7 @@ messages that encourage them to use key app features. React Native Firebase prov
 
 ## Getting Started
 
-<Grid>
+<Grid columns="2">
 	<Block
 		icon="build"
 		color="#ffc107"
diff --git a/docs/messaging/index.md b/docs/messaging/index.md
index 13072667..eb4f94b7 100644
--- a/docs/messaging/index.md
+++ b/docs/messaging/index.md
@@ -16,7 +16,7 @@ users, view the <Anchor group="notifications" href="/">Notifications</Anchor> mo
 
 ## Getting Started
 
-<Grid>
+<Grid columns="3">
 	<Block
 		icon="build"
 		color="#ffc107"
diff --git a/docs/ml-natural-language/index.md b/docs/ml-natural-language/index.md
index fdf6e7f2..8811d9ae 100644
--- a/docs/ml-natural-language/index.md
+++ b/docs/ml-natural-language/index.md
@@ -9,32 +9,26 @@ Firebase ML Kit brings the power of machine learning to your React Native applic
 
 <Youtube id="ejrn_JHksws" />
 
-ML Kit Natural Language for React Native currently supports the following APIs:
+ML Kit Natural Language for React Native currently supports the following APIs.
 
-- [Language Identification](https://firebase.google.com/docs/ml-kit/identify-languages)
-- [Smart Reply](https://firebase.google.com/docs/ml-kit/generate-smart-replies)
+| API                                 | Supported |
+|-------------------------------------|-----------|
+| [Language Identification](https://firebase.google.com/docs/ml-kit/identify-languages)             | ✅        |
+| [Smart Reply](https://firebase.google.com/docs/ml-kit/generate-smart-replies)                         | ✅        |
+| [Translate](https://firebase.google.com/docs/ml-kit/translation)                           | ❌        |
 
 Support for Translate APIs coming in a later release.
 
 ## Getting Started
 
-<Grid>
+<Grid columns="2">
 	<Block
 		icon="build"
 		color="#ffc107"
 		title="Quick Start"
 		to="/quick-start"
 	>
-    Install & .
-	</Block>
-	<Block
-		icon="school"
-		color="#4CAF50"
-		title="Guides"
-		version={false}
-		to="/guides?tags=mlkit"
-	>
-	  Our guides 
+    Get started with ML Kit Natural language and start using the power of Machine Learning in your app.
 	</Block>
   <Block
 		icon="layers"
diff --git a/docs/ml-vision/index.md b/docs/ml-vision/index.md
index 5112375f..6351dc90 100644
--- a/docs/ml-vision/index.md
+++ b/docs/ml-vision/index.md
@@ -9,39 +9,30 @@ Firebase ML Kit brings the power of machine learning vision to your React Native
 
 <Youtube id="ejrn_JHksws" />
 
-ML Kit Vision for React Native currently supports the following Firebase APIs:
+ML Kit Vision for React Native currently supports the following Firebase APIs. APIs marked with ❌ will be support in a later release.
 
-- [Text Recognition](https://firebase.google.com/docs/ml-kit/recognize-text)
-  - [x] Cloud
-  - [x] On Device
-- [Document Text Recognition](https://firebase.google.com/docs/ml-kit/recognize-text)
-  - [x] Cloud
-- [Face Detection](https://firebase.google.com/docs/ml-kit/detect-faces)
-  - [x] On Device
-- [Barcode Detection](https://firebase.google.com/docs/ml-kit/read-barcodes)
-  - [x] On Device
-- [Image Labelling](https://firebase.google.com/docs/ml-kit/label-images)
-  - [x] Cloud
-  - [x] On Device
-- [Landmark Recognition](https://firebase.google.com/docs/ml-kit/recognize-landmarks)
-  - [x] Cloud
-
-The following APIs are **unsupported**, with support coming in a future release;
-
-- AutoML Vision Edge
-- Object detection & tracking
-- Image Labeling with a custom model
+| API                                 | Cloud Model | On Device |
+|-------------------------------------|-------------|-----------|
+| [Text Recognition](https://firebase.google.com/docs/ml-kit/recognize-text)                    | ✅          | ✅        |
+| [Document Text Recognition](https://firebase.google.com/docs/ml-kit/recognize-text))           | ✅          |           |
+| [Face Detection](https://firebase.google.com/docs/ml-kit/detect-faces)                      |             | ✅        |
+| [Barcode Scanning](https://firebase.google.com/docs/ml-kit/read-barcodes)                   |             | ✅        |
+| [Image Labelling](https://firebase.google.com/docs/ml-kit/label-images)                     | ✅          | ✅        |
+| [Landmark Recognition](https://firebase.google.com/docs/ml-kit/recognize-landmarks)                |             | ✅        |
+| [AutoML Vision Edge](https://firebase.google.com/docs/ml-kit/automl-image-labeling)                  | ❌          | ❌        |
+| [Object Detection/Tracking](https://firebase.google.com/docs/ml-kit/object-detection)           | ❌          | ❌        |
+| Image Labelling (with [Custom Model]((https://firebase.google.com/docs/ml-kit/label-images))) | ❌          | ❌        |
 
 ## Getting Started
 
-<Grid>
+<Grid columns="3">
 	<Block
 		icon="build"
 		color="#ffc107"
 		title="Quick Start"
 		to="/quick-start"
 	>
-    Install & .
+    Install & start using the power of Machine Learning in your app.
 	</Block>
 	<Block
 		icon="school"
diff --git a/docs/perf/index.md b/docs/perf/index.md
index 3a238c01..86ca3ddc 100644
--- a/docs/perf/index.md
+++ b/docs/perf/index.md
@@ -13,7 +13,7 @@ however provides a simple API to track custom trace and HTTP request metrics.
 
 ## Getting Started
 
-<Grid>
+<Grid columns="3">
 	<Block
 		icon="build"
 		color="#ffc107"
diff --git a/docs/remote-config/index.md b/docs/remote-config/index.md
index 283c143c..fe5215bd 100644
--- a/docs/remote-config/index.md
+++ b/docs/remote-config/index.md
@@ -14,7 +14,7 @@ effect within your application.
 
 ## Getting Started
 
-<Grid>
+<Grid columns="3">
 	<Block
 		icon="build"
 		color="#ffc107"
diff --git a/docs/storage/index.md b/docs/storage/index.md
index 88e1cbc0..35bfe76e 100644
--- a/docs/storage/index.md
+++ b/docs/storage/index.md
@@ -12,7 +12,7 @@ directly from your device and from your Firebase Cloud Storage bucket.
 
 ## Getting Started
 
-<Grid>
+<Grid columns="3">
 	<Block
 		icon="cloud_queue"
 		color="#ffc107"
diff --git a/docs/utils/index.md b/docs/utils/index.md
index a3195d15..52c65781 100644
--- a/docs/utils/index.md
+++ b/docs/utils/index.md
@@ -10,7 +10,7 @@ development of the React Native Firebase library.
 
 ## Getting Started
 
-<Grid>
+<Grid columns="2">
 	<Block
 		icon="build"
 		color="#ffc107"