diff --git a/.gitignore b/.gitignore
index 9a3b75c..c5883de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,4 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
-vendor/
\ No newline at end of file
+vendor
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52373ae..2882f14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 3.2.0 - WIP
+### Fixed
+- Not #70 yet
+
+### Improved
+- Updated CraftQL support (via @markhuot)
+- Updated Mapbox example to use latest API
+- Improved address and lat/lng input sizing on smaller screens and in a HUD
+
 ## 3.1.3 - 2017-12-18
 ### Fixed
 - Map fields no longer cause global sets to fail to save!
diff --git a/README.md b/README.md
index b38f6c4..0934ecf 100644
--- a/README.md
+++ b/README.md
@@ -87,8 +87,8 @@ Using [Google Maps](https://developers.google.com/maps/documentation/javascript/
 And [Mapbox](https://www.mapbox.com/mapbox-gl-js/api/):
 
 ```twig
-<script src="https://api.mapbox.com/mapbox-gl-js/v0.21.0/mapbox-gl.js"></script>
-<link href="https://api.mapbox.com/mapbox-gl-js/v0.21.0/mapbox-gl.css" rel="stylesheet" />
+<script src="https://api.mapbox.com/mapbox-gl-js/v0.43.0/mapbox-gl.js"></script>
+<link href="https://api.mapbox.com/mapbox-gl-js/v0.43.0/mapbox-gl.css" rel="stylesheet" />
 
 <div id="map" style="width: 400px; height: 300px;"></div>
 <script>
diff --git a/composer.json b/composer.json
index 78afaa7..1df6103 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,12 @@
 {
   "name": "ether/simplemap",
   "description": "A beautifully simple Google Map field type.",
-  "version": "3.1.3",
+  "version": "3.2.0",
   "type": "craft-plugin",
   "license": "MIT",
   "minimum-stability": "dev",
   "require": {
-    "craftcms/cms": "^3.0.0-beta.20",
-    "webonyx/graphql-php": "^0.10.0"
+    "craftcms/cms": "^3.0.0-beta.20"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/SimpleMap.php b/src/SimpleMap.php
index 0d23b5c..e58b3b9 100644
--- a/src/SimpleMap.php
+++ b/src/SimpleMap.php
@@ -11,6 +11,7 @@
 use craft\services\Plugins;
 use craft\web\twig\variables\CraftVariable;
 use ether\simplemap\fields\MapField;
+use ether\simplemap\listeners\GetCraftQLSchema;
 use ether\simplemap\models\Settings;
 use ether\simplemap\services\MapService;
 use yii\base\Event;
@@ -76,6 +77,17 @@ public function init ()
 			CraftVariable::EVENT_INIT,
 			[$this, 'onRegisterVariable']
 		);
+
+		// CraftQL Support
+		/** @noinspection PhpUndefinedNamespaceInspection */
+		/** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
+		if (class_exists(\markhuot\CraftQL\CraftQL::class)) {
+            Event::on(
+                MapField::class,
+                'craftQlGetFieldSchema',
+                [new GetCraftQLSchema, 'handle']
+            );
+        }
 	}
 
 	// Craft: Settings
diff --git a/src/fields/MapField.php b/src/fields/MapField.php
index 8e78af8..563bae9 100644
--- a/src/fields/MapField.php
+++ b/src/fields/MapField.php
@@ -95,255 +95,255 @@ class MapField extends Field implements PreviewableFieldInterface
 	 */
 	private static $_countries = [
 		['value' => '', 'label' => 'All Countries'],
-		['value' => "af", 'label' => "Afghanistan"],
-		['value' => "ax", 'label' => "Åland Islands"],
-		['value' => "al", 'label' => "Albania"],
-		['value' => "dz", 'label' => "Algeria"],
-		['value' => "as", 'label' => "American Samoa"],
-		['value' => "ad", 'label' => "Andorra"],
-		['value' => "ao", 'label' => "Angola"],
-		['value' => "ai", 'label' => "Anguilla"],
-		['value' => "aq", 'label' => "Antarctica"],
-		['value' => "ag", 'label' => "Antigua and Barbuda"],
-		['value' => "ar", 'label' => "Argentina"],
-		['value' => "am", 'label' => "Armenia"],
-		['value' => "aw", 'label' => "Aruba"],
-		['value' => "au", 'label' => "Australia"],
-		['value' => "at", 'label' => "Austria"],
-		['value' => "az", 'label' => "Azerbaijan"],
-		['value' => "bs", 'label' => "Bahamas"],
-		['value' => "bh", 'label' => "Bahrain"],
-		['value' => "bd", 'label' => "Bangladesh"],
-		['value' => "bb", 'label' => "Barbados"],
-		['value' => "by", 'label' => "Belarus"],
-		['value' => "be", 'label' => "Belgium"],
-		['value' => "bz", 'label' => "Belize"],
-		['value' => "bj", 'label' => "Benin"],
-		['value' => "bm", 'label' => "Bermuda"],
-		['value' => "bt", 'label' => "Bhutan"],
-		['value' => "bo", 'label' => "Bolivia, Plurinational State of"],
-		['value' => "bq", 'label' => "Bonaire, Sint Eustatius and Saba"],
-		['value' => "ba", 'label' => "Bosnia and Herzegovina"],
-		['value' => "bw", 'label' => "Botswana"],
-		['value' => "bv", 'label' => "Bouvet Island"],
-		['value' => "br", 'label' => "Brazil"],
-		['value' => "io", 'label' => "British Indian Ocean Territory"],
-		['value' => "bn", 'label' => "Brunei Darussalam"],
-		['value' => "bg", 'label' => "Bulgaria"],
-		['value' => "bf", 'label' => "Burkina Faso"],
-		['value' => "bi", 'label' => "Burundi"],
-		['value' => "kh", 'label' => "Cambodia"],
-		['value' => "cm", 'label' => "Cameroon"],
-		['value' => "ca", 'label' => "Canada"],
-		['value' => "cv", 'label' => "Cape Verde"],
-		['value' => "ky", 'label' => "Cayman Islands"],
-		['value' => "cf", 'label' => "Central African Republic"],
-		['value' => "td", 'label' => "Chad"],
-		['value' => "cl", 'label' => "Chile"],
-		['value' => "cn", 'label' => "China"],
-		['value' => "cx", 'label' => "Christmas Island"],
-		['value' => "cc", 'label' => "Cocos (Keeling) Islands"],
-		['value' => "co", 'label' => "Colombia"],
-		['value' => "km", 'label' => "Comoros"],
-		['value' => "cg", 'label' => "Congo"],
-		['value' => "cd", 'label' => "Congo, the Democratic Republic of the"],
-		['value' => "ck", 'label' => "Cook Islands"],
-		['value' => "cr", 'label' => "Costa Rica"],
-		['value' => "ci", 'label' => "Côte d'Ivoire"],
-		['value' => "hr", 'label' => "Croatia"],
-		['value' => "cu", 'label' => "Cuba"],
-		['value' => "cw", 'label' => "Curaçao"],
-		['value' => "cy", 'label' => "Cyprus"],
-		['value' => "cz", 'label' => "Czech Republic"],
-		['value' => "dk", 'label' => "Denmark"],
-		['value' => "dj", 'label' => "Djibouti"],
-		['value' => "dm", 'label' => "Dominica"],
-		['value' => "do", 'label' => "Dominican Republic"],
-		['value' => "ec", 'label' => "Ecuador"],
-		['value' => "eg", 'label' => "Egypt"],
-		['value' => "sv", 'label' => "El Salvador"],
-		['value' => "gq", 'label' => "Equatorial Guinea"],
-		['value' => "er", 'label' => "Eritrea"],
-		['value' => "ee", 'label' => "Estonia"],
-		['value' => "et", 'label' => "Ethiopia"],
-		['value' => "fk", 'label' => "Falkland Islands (Malvinas)"],
-		['value' => "fo", 'label' => "Faroe Islands"],
-		['value' => "fj", 'label' => "Fiji"],
-		['value' => "fi", 'label' => "Finland"],
-		['value' => "fr", 'label' => "France"],
-		['value' => "gf", 'label' => "French Guiana"],
-		['value' => "pf", 'label' => "French Polynesia"],
-		['value' => "tf", 'label' => "French Southern Territories"],
-		['value' => "ga", 'label' => "Gabon"],
-		['value' => "gm", 'label' => "Gambia"],
-		['value' => "ge", 'label' => "Georgia"],
-		['value' => "de", 'label' => "Germany"],
-		['value' => "gh", 'label' => "Ghana"],
-		['value' => "gi", 'label' => "Gibraltar"],
-		['value' => "gr", 'label' => "Greece"],
-		['value' => "gl", 'label' => "Greenland"],
-		['value' => "gd", 'label' => "Grenada"],
-		['value' => "gp", 'label' => "Guadeloupe"],
-		['value' => "gu", 'label' => "Guam"],
-		['value' => "gt", 'label' => "Guatemala"],
-		['value' => "gg", 'label' => "Guernsey"],
-		['value' => "gn", 'label' => "Guinea"],
-		['value' => "gw", 'label' => "Guinea-Bissau"],
-		['value' => "gy", 'label' => "Guyana"],
-		['value' => "ht", 'label' => "Haiti"],
-		['value' => "hm", 'label' => "Heard Island and McDonald Islands"],
-		['value' => "va", 'label' => "Holy See (Vatican City State)"],
-		['value' => "hn", 'label' => "Honduras"],
-		['value' => "hk", 'label' => "Hong Kong"],
-		['value' => "hu", 'label' => "Hungary"],
-		['value' => "is", 'label' => "Iceland"],
-		['value' => "in", 'label' => "India"],
-		['value' => "id", 'label' => "Indonesia"],
-		['value' => "ir", 'label' => "Iran, Islamic Republic of"],
-		['value' => "iq", 'label' => "Iraq"],
-		['value' => "ie", 'label' => "Ireland"],
-		['value' => "im", 'label' => "Isle of Man"],
-		['value' => "il", 'label' => "Israel"],
-		['value' => "it", 'label' => "Italy"],
-		['value' => "jm", 'label' => "Jamaica"],
-		['value' => "jp", 'label' => "Japan"],
-		['value' => "je", 'label' => "Jersey"],
-		['value' => "jo", 'label' => "Jordan"],
-		['value' => "kz", 'label' => "Kazakhstan"],
-		['value' => "ke", 'label' => "Kenya"],
-		['value' => "ki", 'label' => "Kiribati"],
-		['value' => "kp", 'label' => "Korea, Democratic People's Republic of"],
-		['value' => "kr", 'label' => "Korea, Republic of"],
-		['value' => "kw", 'label' => "Kuwait"],
-		['value' => "kg", 'label' => "Kyrgyzstan"],
-		['value' => "la", 'label' => "Lao People's Democratic Republic"],
-		['value' => "lv", 'label' => "Latvia"],
-		['value' => "lb", 'label' => "Lebanon"],
-		['value' => "ls", 'label' => "Lesotho"],
-		['value' => "lr", 'label' => "Liberia"],
-		['value' => "ly", 'label' => "Libya"],
-		['value' => "li", 'label' => "Liechtenstein"],
-		['value' => "lt", 'label' => "Lithuania"],
-		['value' => "lu", 'label' => "Luxembourg"],
-		['value' => "mo", 'label' => "Macao"],
-		['value' => "mk", 'label' => "Macedonia, the former Yugoslav Republic of"],
-		['value' => "mg", 'label' => "Madagascar"],
-		['value' => "mw", 'label' => "Malawi"],
-		['value' => "my", 'label' => "Malaysia"],
-		['value' => "mv", 'label' => "Maldives"],
-		['value' => "ml", 'label' => "Mali"],
-		['value' => "mt", 'label' => "Malta"],
-		['value' => "mh", 'label' => "Marshall Islands"],
-		['value' => "mq", 'label' => "Martinique"],
-		['value' => "mr", 'label' => "Mauritania"],
-		['value' => "mu", 'label' => "Mauritius"],
-		['value' => "yt", 'label' => "Mayotte"],
-		['value' => "mx", 'label' => "Mexico"],
-		['value' => "fm", 'label' => "Micronesia, Federated States of"],
-		['value' => "md", 'label' => "Moldova, Republic of"],
-		['value' => "mc", 'label' => "Monaco"],
-		['value' => "mn", 'label' => "Mongolia"],
-		['value' => "me", 'label' => "Montenegro"],
-		['value' => "ms", 'label' => "Montserrat"],
-		['value' => "ma", 'label' => "Morocco"],
-		['value' => "mz", 'label' => "Mozambique"],
-		['value' => "mm", 'label' => "Myanmar"],
-		['value' => "na", 'label' => "Namibia"],
-		['value' => "nr", 'label' => "Nauru"],
-		['value' => "np", 'label' => "Nepal"],
-		['value' => "nl", 'label' => "Netherlands"],
-		['value' => "nc", 'label' => "New Caledonia"],
-		['value' => "nz", 'label' => "New Zealand"],
-		['value' => "ni", 'label' => "Nicaragua"],
-		['value' => "ne", 'label' => "Niger"],
-		['value' => "ng", 'label' => "Nigeria"],
-		['value' => "nu", 'label' => "Niue"],
-		['value' => "nf", 'label' => "Norfolk Island"],
-		['value' => "mp", 'label' => "Northern Mariana Islands"],
-		['value' => "no", 'label' => "Norway"],
-		['value' => "om", 'label' => "Oman"],
-		['value' => "pk", 'label' => "Pakistan"],
-		['value' => "pw", 'label' => "Palau"],
-		['value' => "ps", 'label' => "Palestine, State of"],
-		['value' => "pa", 'label' => "Panama"],
-		['value' => "pg", 'label' => "Papua New Guinea"],
-		['value' => "py", 'label' => "Paraguay"],
-		['value' => "pe", 'label' => "Peru"],
-		['value' => "ph", 'label' => "Philippines"],
-		['value' => "pn", 'label' => "Pitcairn"],
-		['value' => "pl", 'label' => "Poland"],
-		['value' => "pt", 'label' => "Portugal"],
-		['value' => "pr", 'label' => "Puerto Rico"],
-		['value' => "qa", 'label' => "Qatar"],
-		['value' => "re", 'label' => "Réunion"],
-		['value' => "ro", 'label' => "Romania"],
-		['value' => "ru", 'label' => "Russian Federation"],
-		['value' => "rw", 'label' => "Rwanda"],
-		['value' => "bl", 'label' => "Saint Barthélemy"],
-		['value' => "sh", 'label' => "Saint Helena, Ascension and Tristan da Cunha"],
-		['value' => "kn", 'label' => "Saint Kitts and Nevis"],
-		['value' => "lc", 'label' => "Saint Lucia"],
-		['value' => "mf", 'label' => "Saint Martin (French part)"],
-		['value' => "pm", 'label' => "Saint Pierre and Miquelon"],
-		['value' => "vc", 'label' => "Saint Vincent and the Grenadines"],
-		['value' => "ws", 'label' => "Samoa"],
-		['value' => "sm", 'label' => "San Marino"],
-		['value' => "st", 'label' => "Sao Tome and Principe"],
-		['value' => "sa", 'label' => "Saudi Arabia"],
-		['value' => "sn", 'label' => "Senegal"],
-		['value' => "rs", 'label' => "Serbia"],
-		['value' => "sc", 'label' => "Seychelles"],
-		['value' => "sl", 'label' => "Sierra Leone"],
-		['value' => "sg", 'label' => "Singapore"],
-		['value' => "sx", 'label' => "Sint Maarten (Dutch part)"],
-		['value' => "sk", 'label' => "Slovakia"],
-		['value' => "si", 'label' => "Slovenia"],
-		['value' => "sb", 'label' => "Solomon Islands"],
-		['value' => "so", 'label' => "Somalia"],
-		['value' => "za", 'label' => "South Africa"],
-		['value' => "gs", 'label' => "South Georgia and the South Sandwich Islands"],
-		['value' => "ss", 'label' => "South Sudan"],
-		['value' => "es", 'label' => "Spain"],
-		['value' => "lk", 'label' => "Sri Lanka"],
-		['value' => "sd", 'label' => "Sudan"],
-		['value' => "sr", 'label' => "Suriname"],
-		['value' => "sj", 'label' => "Svalbard and Jan Mayen"],
-		['value' => "sz", 'label' => "Swaziland"],
-		['value' => "se", 'label' => "Sweden"],
-		['value' => "ch", 'label' => "Switzerland"],
-		['value' => "sy", 'label' => "Syrian Arab Republic"],
-		['value' => "tw", 'label' => "Taiwan, Province of China"],
-		['value' => "tj", 'label' => "Tajikistan"],
-		['value' => "tz", 'label' => "Tanzania, United Republic of"],
-		['value' => "th", 'label' => "Thailand"],
-		['value' => "tl", 'label' => "Timor-Leste"],
-		['value' => "tg", 'label' => "Togo"],
-		['value' => "tk", 'label' => "Tokelau"],
-		['value' => "to", 'label' => "Tonga"],
-		['value' => "tt", 'label' => "Trinidad and Tobago"],
-		['value' => "tn", 'label' => "Tunisia"],
-		['value' => "tr", 'label' => "Turkey"],
-		['value' => "tm", 'label' => "Turkmenistan"],
-		['value' => "tc", 'label' => "Turks and Caicos Islands"],
-		['value' => "tv", 'label' => "Tuvalu"],
-		['value' => "ug", 'label' => "Uganda"],
-		['value' => "ua", 'label' => "Ukraine"],
-		['value' => "ae", 'label' => "United Arab Emirates"],
-		['value' => "gb", 'label' => "United Kingdom"],
-		['value' => "us", 'label' => "United States"],
-		['value' => "um", 'label' => "United States Minor Outlying Islands"],
-		['value' => "uy", 'label' => "Uruguay"],
-		['value' => "uz", 'label' => "Uzbekistan"],
-		['value' => "vu", 'label' => "Vanuatu"],
-		['value' => "ve", 'label' => "Venezuela, Bolivarian Republic of"],
-		['value' => "vn", 'label' => "Viet Nam"],
-		['value' => "vg", 'label' => "Virgin Islands, British"],
-		['value' => "vi", 'label' => "Virgin Islands, U.S."],
-		['value' => "wf", 'label' => "Wallis and Futuna"],
-		['value' => "eh", 'label' => "Western Sahara"],
-		['value' => "ye", 'label' => "Yemen"],
-		['value' => "zm", 'label' => "Zambia"],
-		['value' => "zw", 'label' => "Zimbabwe"],
+		['value' => 'af', 'label' => 'Afghanistan'],
+		['value' => 'ax', 'label' => 'Åland Islands'],
+		['value' => 'al', 'label' => 'Albania'],
+		['value' => 'dz', 'label' => 'Algeria'],
+		['value' => 'as', 'label' => 'American Samoa'],
+		['value' => 'ad', 'label' => 'Andorra'],
+		['value' => 'ao', 'label' => 'Angola'],
+		['value' => 'ai', 'label' => 'Anguilla'],
+		['value' => 'aq', 'label' => 'Antarctica'],
+		['value' => 'ag', 'label' => 'Antigua and Barbuda'],
+		['value' => 'ar', 'label' => 'Argentina'],
+		['value' => 'am', 'label' => 'Armenia'],
+		['value' => 'aw', 'label' => 'Aruba'],
+		['value' => 'au', 'label' => 'Australia'],
+		['value' => 'at', 'label' => 'Austria'],
+		['value' => 'az', 'label' => 'Azerbaijan'],
+		['value' => 'bs', 'label' => 'Bahamas'],
+		['value' => 'bh', 'label' => 'Bahrain'],
+		['value' => 'bd', 'label' => 'Bangladesh'],
+		['value' => 'bb', 'label' => 'Barbados'],
+		['value' => 'by', 'label' => 'Belarus'],
+		['value' => 'be', 'label' => 'Belgium'],
+		['value' => 'bz', 'label' => 'Belize'],
+		['value' => 'bj', 'label' => 'Benin'],
+		['value' => 'bm', 'label' => 'Bermuda'],
+		['value' => 'bt', 'label' => 'Bhutan'],
+		['value' => 'bo', 'label' => 'Bolivia, Plurinational State of'],
+		['value' => 'bq', 'label' => 'Bonaire, Sint Eustatius and Saba'],
+		['value' => 'ba', 'label' => 'Bosnia and Herzegovina'],
+		['value' => 'bw', 'label' => 'Botswana'],
+		['value' => 'bv', 'label' => 'Bouvet Island'],
+		['value' => 'br', 'label' => 'Brazil'],
+		['value' => 'io', 'label' => 'British Indian Ocean Territory'],
+		['value' => 'bn', 'label' => 'Brunei Darussalam'],
+		['value' => 'bg', 'label' => 'Bulgaria'],
+		['value' => 'bf', 'label' => 'Burkina Faso'],
+		['value' => 'bi', 'label' => 'Burundi'],
+		['value' => 'kh', 'label' => 'Cambodia'],
+		['value' => 'cm', 'label' => 'Cameroon'],
+		['value' => 'ca', 'label' => 'Canada'],
+		['value' => 'cv', 'label' => 'Cape Verde'],
+		['value' => 'ky', 'label' => 'Cayman Islands'],
+		['value' => 'cf', 'label' => 'Central African Republic'],
+		['value' => 'td', 'label' => 'Chad'],
+		['value' => 'cl', 'label' => 'Chile'],
+		['value' => 'cn', 'label' => 'China'],
+		['value' => 'cx', 'label' => 'Christmas Island'],
+		['value' => 'cc', 'label' => 'Cocos (Keeling) Islands'],
+		['value' => 'co', 'label' => 'Colombia'],
+		['value' => 'km', 'label' => 'Comoros'],
+		['value' => 'cg', 'label' => 'Congo'],
+		['value' => 'cd', 'label' => 'Congo, the Democratic Republic of the'],
+		['value' => 'ck', 'label' => 'Cook Islands'],
+		['value' => 'cr', 'label' => 'Costa Rica'],
+		['value' => 'ci', 'label' => 'Côte d\'Ivoire'],
+		['value' => 'hr', 'label' => 'Croatia'],
+		['value' => 'cu', 'label' => 'Cuba'],
+		['value' => 'cw', 'label' => 'Curaçao'],
+		['value' => 'cy', 'label' => 'Cyprus'],
+		['value' => 'cz', 'label' => 'Czech Republic'],
+		['value' => 'dk', 'label' => 'Denmark'],
+		['value' => 'dj', 'label' => 'Djibouti'],
+		['value' => 'dm', 'label' => 'Dominica'],
+		['value' => 'do', 'label' => 'Dominican Republic'],
+		['value' => 'ec', 'label' => 'Ecuador'],
+		['value' => 'eg', 'label' => 'Egypt'],
+		['value' => 'sv', 'label' => 'El Salvador'],
+		['value' => 'gq', 'label' => 'Equatorial Guinea'],
+		['value' => 'er', 'label' => 'Eritrea'],
+		['value' => 'ee', 'label' => 'Estonia'],
+		['value' => 'et', 'label' => 'Ethiopia'],
+		['value' => 'fk', 'label' => 'Falkland Islands (Malvinas)'],
+		['value' => 'fo', 'label' => 'Faroe Islands'],
+		['value' => 'fj', 'label' => 'Fiji'],
+		['value' => 'fi', 'label' => 'Finland'],
+		['value' => 'fr', 'label' => 'France'],
+		['value' => 'gf', 'label' => 'French Guiana'],
+		['value' => 'pf', 'label' => 'French Polynesia'],
+		['value' => 'tf', 'label' => 'French Southern Territories'],
+		['value' => 'ga', 'label' => 'Gabon'],
+		['value' => 'gm', 'label' => 'Gambia'],
+		['value' => 'ge', 'label' => 'Georgia'],
+		['value' => 'de', 'label' => 'Germany'],
+		['value' => 'gh', 'label' => 'Ghana'],
+		['value' => 'gi', 'label' => 'Gibraltar'],
+		['value' => 'gr', 'label' => 'Greece'],
+		['value' => 'gl', 'label' => 'Greenland'],
+		['value' => 'gd', 'label' => 'Grenada'],
+		['value' => 'gp', 'label' => 'Guadeloupe'],
+		['value' => 'gu', 'label' => 'Guam'],
+		['value' => 'gt', 'label' => 'Guatemala'],
+		['value' => 'gg', 'label' => 'Guernsey'],
+		['value' => 'gn', 'label' => 'Guinea'],
+		['value' => 'gw', 'label' => 'Guinea-Bissau'],
+		['value' => 'gy', 'label' => 'Guyana'],
+		['value' => 'ht', 'label' => 'Haiti'],
+		['value' => 'hm', 'label' => 'Heard Island and McDonald Islands'],
+		['value' => 'va', 'label' => 'Holy See (Vatican City State)'],
+		['value' => 'hn', 'label' => 'Honduras'],
+		['value' => 'hk', 'label' => 'Hong Kong'],
+		['value' => 'hu', 'label' => 'Hungary'],
+		['value' => 'is', 'label' => 'Iceland'],
+		['value' => 'in', 'label' => 'India'],
+		['value' => 'id', 'label' => 'Indonesia'],
+		['value' => 'ir', 'label' => 'Iran, Islamic Republic of'],
+		['value' => 'iq', 'label' => 'Iraq'],
+		['value' => 'ie', 'label' => 'Ireland'],
+		['value' => 'im', 'label' => 'Isle of Man'],
+		['value' => 'il', 'label' => 'Israel'],
+		['value' => 'it', 'label' => 'Italy'],
+		['value' => 'jm', 'label' => 'Jamaica'],
+		['value' => 'jp', 'label' => 'Japan'],
+		['value' => 'je', 'label' => 'Jersey'],
+		['value' => 'jo', 'label' => 'Jordan'],
+		['value' => 'kz', 'label' => 'Kazakhstan'],
+		['value' => 'ke', 'label' => 'Kenya'],
+		['value' => 'ki', 'label' => 'Kiribati'],
+		['value' => 'kp', 'label' => 'Korea, Democratic People\'s Republic of'],
+		['value' => 'kr', 'label' => 'Korea, Republic of'],
+		['value' => 'kw', 'label' => 'Kuwait'],
+		['value' => 'kg', 'label' => 'Kyrgyzstan'],
+		['value' => 'la', 'label' => 'Lao People\'s Democratic Republic'],
+		['value' => 'lv', 'label' => 'Latvia'],
+		['value' => 'lb', 'label' => 'Lebanon'],
+		['value' => 'ls', 'label' => 'Lesotho'],
+		['value' => 'lr', 'label' => 'Liberia'],
+		['value' => 'ly', 'label' => 'Libya'],
+		['value' => 'li', 'label' => 'Liechtenstein'],
+		['value' => 'lt', 'label' => 'Lithuania'],
+		['value' => 'lu', 'label' => 'Luxembourg'],
+		['value' => 'mo', 'label' => 'Macao'],
+		['value' => 'mk', 'label' => 'Macedonia, the former Yugoslav Republic of'],
+		['value' => 'mg', 'label' => 'Madagascar'],
+		['value' => 'mw', 'label' => 'Malawi'],
+		['value' => 'my', 'label' => 'Malaysia'],
+		['value' => 'mv', 'label' => 'Maldives'],
+		['value' => 'ml', 'label' => 'Mali'],
+		['value' => 'mt', 'label' => 'Malta'],
+		['value' => 'mh', 'label' => 'Marshall Islands'],
+		['value' => 'mq', 'label' => 'Martinique'],
+		['value' => 'mr', 'label' => 'Mauritania'],
+		['value' => 'mu', 'label' => 'Mauritius'],
+		['value' => 'yt', 'label' => 'Mayotte'],
+		['value' => 'mx', 'label' => 'Mexico'],
+		['value' => 'fm', 'label' => 'Micronesia, Federated States of'],
+		['value' => 'md', 'label' => 'Moldova, Republic of'],
+		['value' => 'mc', 'label' => 'Monaco'],
+		['value' => 'mn', 'label' => 'Mongolia'],
+		['value' => 'me', 'label' => 'Montenegro'],
+		['value' => 'ms', 'label' => 'Montserrat'],
+		['value' => 'ma', 'label' => 'Morocco'],
+		['value' => 'mz', 'label' => 'Mozambique'],
+		['value' => 'mm', 'label' => 'Myanmar'],
+		['value' => 'na', 'label' => 'Namibia'],
+		['value' => 'nr', 'label' => 'Nauru'],
+		['value' => 'np', 'label' => 'Nepal'],
+		['value' => 'nl', 'label' => 'Netherlands'],
+		['value' => 'nc', 'label' => 'New Caledonia'],
+		['value' => 'nz', 'label' => 'New Zealand'],
+		['value' => 'ni', 'label' => 'Nicaragua'],
+		['value' => 'ne', 'label' => 'Niger'],
+		['value' => 'ng', 'label' => 'Nigeria'],
+		['value' => 'nu', 'label' => 'Niue'],
+		['value' => 'nf', 'label' => 'Norfolk Island'],
+		['value' => 'mp', 'label' => 'Northern Mariana Islands'],
+		['value' => 'no', 'label' => 'Norway'],
+		['value' => 'om', 'label' => 'Oman'],
+		['value' => 'pk', 'label' => 'Pakistan'],
+		['value' => 'pw', 'label' => 'Palau'],
+		['value' => 'ps', 'label' => 'Palestine, State of'],
+		['value' => 'pa', 'label' => 'Panama'],
+		['value' => 'pg', 'label' => 'Papua New Guinea'],
+		['value' => 'py', 'label' => 'Paraguay'],
+		['value' => 'pe', 'label' => 'Peru'],
+		['value' => 'ph', 'label' => 'Philippines'],
+		['value' => 'pn', 'label' => 'Pitcairn'],
+		['value' => 'pl', 'label' => 'Poland'],
+		['value' => 'pt', 'label' => 'Portugal'],
+		['value' => 'pr', 'label' => 'Puerto Rico'],
+		['value' => 'qa', 'label' => 'Qatar'],
+		['value' => 're', 'label' => 'Réunion'],
+		['value' => 'ro', 'label' => 'Romania'],
+		['value' => 'ru', 'label' => 'Russian Federation'],
+		['value' => 'rw', 'label' => 'Rwanda'],
+		['value' => 'bl', 'label' => 'Saint Barthélemy'],
+		['value' => 'sh', 'label' => 'Saint Helena, Ascension and Tristan da Cunha'],
+		['value' => 'kn', 'label' => 'Saint Kitts and Nevis'],
+		['value' => 'lc', 'label' => 'Saint Lucia'],
+		['value' => 'mf', 'label' => 'Saint Martin (French part)'],
+		['value' => 'pm', 'label' => 'Saint Pierre and Miquelon'],
+		['value' => 'vc', 'label' => 'Saint Vincent and the Grenadines'],
+		['value' => 'ws', 'label' => 'Samoa'],
+		['value' => 'sm', 'label' => 'San Marino'],
+		['value' => 'st', 'label' => 'Sao Tome and Principe'],
+		['value' => 'sa', 'label' => 'Saudi Arabia'],
+		['value' => 'sn', 'label' => 'Senegal'],
+		['value' => 'rs', 'label' => 'Serbia'],
+		['value' => 'sc', 'label' => 'Seychelles'],
+		['value' => 'sl', 'label' => 'Sierra Leone'],
+		['value' => 'sg', 'label' => 'Singapore'],
+		['value' => 'sx', 'label' => 'Sint Maarten (Dutch part)'],
+		['value' => 'sk', 'label' => 'Slovakia'],
+		['value' => 'si', 'label' => 'Slovenia'],
+		['value' => 'sb', 'label' => 'Solomon Islands'],
+		['value' => 'so', 'label' => 'Somalia'],
+		['value' => 'za', 'label' => 'South Africa'],
+		['value' => 'gs', 'label' => 'South Georgia and the South Sandwich Islands'],
+		['value' => 'ss', 'label' => 'South Sudan'],
+		['value' => 'es', 'label' => 'Spain'],
+		['value' => 'lk', 'label' => 'Sri Lanka'],
+		['value' => 'sd', 'label' => 'Sudan'],
+		['value' => 'sr', 'label' => 'Suriname'],
+		['value' => 'sj', 'label' => 'Svalbard and Jan Mayen'],
+		['value' => 'sz', 'label' => 'Swaziland'],
+		['value' => 'se', 'label' => 'Sweden'],
+		['value' => 'ch', 'label' => 'Switzerland'],
+		['value' => 'sy', 'label' => 'Syrian Arab Republic'],
+		['value' => 'tw', 'label' => 'Taiwan, Province of China'],
+		['value' => 'tj', 'label' => 'Tajikistan'],
+		['value' => 'tz', 'label' => 'Tanzania, United Republic of'],
+		['value' => 'th', 'label' => 'Thailand'],
+		['value' => 'tl', 'label' => 'Timor-Leste'],
+		['value' => 'tg', 'label' => 'Togo'],
+		['value' => 'tk', 'label' => 'Tokelau'],
+		['value' => 'to', 'label' => 'Tonga'],
+		['value' => 'tt', 'label' => 'Trinidad and Tobago'],
+		['value' => 'tn', 'label' => 'Tunisia'],
+		['value' => 'tr', 'label' => 'Turkey'],
+		['value' => 'tm', 'label' => 'Turkmenistan'],
+		['value' => 'tc', 'label' => 'Turks and Caicos Islands'],
+		['value' => 'tv', 'label' => 'Tuvalu'],
+		['value' => 'ug', 'label' => 'Uganda'],
+		['value' => 'ua', 'label' => 'Ukraine'],
+		['value' => 'ae', 'label' => 'United Arab Emirates'],
+		['value' => 'gb', 'label' => 'United Kingdom'],
+		['value' => 'us', 'label' => 'United States'],
+		['value' => 'um', 'label' => 'United States Minor Outlying Islands'],
+		['value' => 'uy', 'label' => 'Uruguay'],
+		['value' => 'uz', 'label' => 'Uzbekistan'],
+		['value' => 'vu', 'label' => 'Vanuatu'],
+		['value' => 've', 'label' => 'Venezuela, Bolivarian Republic of'],
+		['value' => 'vn', 'label' => 'Viet Nam'],
+		['value' => 'vg', 'label' => 'Virgin Islands, British'],
+		['value' => 'vi', 'label' => 'Virgin Islands, U.S.'],
+		['value' => 'wf', 'label' => 'Wallis and Futuna'],
+		['value' => 'eh', 'label' => 'Western Sahara'],
+		['value' => 'ye', 'label' => 'Yemen'],
+		['value' => 'zm', 'label' => 'Zambia'],
+		['value' => 'zw', 'label' => 'Zimbabwe'],
 	];
 
 	/**
@@ -351,12 +351,12 @@ class MapField extends Field implements PreviewableFieldInterface
 	 *     restricted by
 	 */
 	private static $_types = [
-		['label' => "Any Type", 'value' => ''],
-		['label' => "Non-business Locations", 'value' => 'geocode'],
-		['label' => "Precise Addresses", 'value' => 'address'],
-		['label' => "Businesses Only", 'value' => 'establishment'],
-		['label' => "Regions (Countries, States, Counties, Postal Codes, etc...)", 'value' => '(regions)'],
-		['label' => "Towns & Cities", 'value' => '(cities)'],
+		['label' => 'Any Type', 'value' => ''],
+		['label' => 'Non-business Locations', 'value' => 'geocode'],
+		['label' => 'Precise Addresses', 'value' => 'address'],
+		['label' => 'Businesses Only', 'value' => 'establishment'],
+		['label' => 'Regions (Countries, States, Counties, Postal Codes, etc...)', 'value' => '(regions)'],
+		['label' => 'Towns & Cities', 'value' => '(cities)'],
 	];
 
 	// Public Functions
@@ -535,63 +535,4 @@ public function afterElementSave (ElementInterface $element, bool $isNew)
 		parent::afterElementSave($element, $isNew);
 	}
 
-	// 3rd Party Support
-	// =========================================================================
-
-	// CraftQL
-	// -------------------------------------------------------------------------
-
-	/** @var ObjectType|null */
-	private static $_simpleMapGraphQLObject;
-
-	/**
-	 * I dunno, but it works.
-	 *
-	 * @return ObjectType
-	 */
-	private static function object() {
-		if (self::$_simpleMapGraphQLObject)
-			return self::$_simpleMapGraphQLObject;
-
-		$parts = [];
-
-		foreach (MapService::$parts as $part) {
-			$parts[$part] = Type::string();
-			$parts[$part . '_short'] = Type::string();
-		}
-
-		return self::$_simpleMapGraphQLObject = new ObjectType([
-			'name' => 'SimpleMap',
-			'fields' => [
-				'lat' => Type::string(),
-				'lng' => Type::string(),
-				'zoom' => Type::string(),
-				'address' => Type::string(),
-				'parts' => [
-					'type' => new ObjectType([
-						'name' => 'SimpleMapParts',
-						'fields' => $parts,
-					])
-				],
-			],
-		]);
-	}
-
-	/**
-	 * Support for CraftQL
-	 *
-	 * @see https://github.com/markhuot/craftql
-	 */
-	public function getGraphQLQueryFields ()
-	{
-		$field = $this->owner;
-
-		return [
-			$field->handle => [
-				'type' => self::object(),
-				'description' => $field->instructions,
-			]
-		];
-	}
-
 }
\ No newline at end of file
diff --git a/src/listeners/GetCraftQLSchema.php b/src/listeners/GetCraftQLSchema.php
new file mode 100644
index 0000000..eff044f
--- /dev/null
+++ b/src/listeners/GetCraftQLSchema.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace ether\simplemap\listeners;
+
+use markhuot\CraftQL\Events\GetFieldSchema;
+use ether\simplemap\services\MapService;
+
+class GetCraftQLSchema
+{
+	/**
+	 * Handle the request for the schema
+	 *
+	 * @param GetFieldSchema $event
+	 *
+	 * @return void
+	 */
+	function handle (GetFieldSchema $event)
+	{
+		$event->handled = true;
+
+		$partsObject = $event->schema->createObjectType('SimpleMapDataParts');
+		foreach (MapService::$parts as $part) {
+			$partsObject->addStringField($part);
+			$partsObject->addStringField($part . '_short');
+		}
+
+		$fieldObject = $event->schema->createObjectType('SimpleMapData');
+		$fieldObject->addStringField('lat');
+		$fieldObject->addStringField('lng');
+		$fieldObject->addStringField('zoom');
+		$fieldObject->addStringField('address');
+		$fieldObject->addField('parts')->type($partsObject);
+
+		$event->schema->addField($event->sender)
+		              ->type($fieldObject);
+	}
+}
diff --git a/src/resources/SimpleMap_Map.css b/src/resources/SimpleMap_Map.css
index 6213d77..38959be 100644
--- a/src/resources/SimpleMap_Map.css
+++ b/src/resources/SimpleMap_Map.css
@@ -24,7 +24,7 @@
 }
 
 .simplemap--lat-lng input {
-	width: 25.5ch;
+	width: 15.5ch;
 	margin: 0;
 	vertical-align: middle;
 	color: #caccce;
@@ -32,12 +32,9 @@
 
 .simplemap--lat-lng input:first-child {
 	border-right: none;
-	border-radius: 3px 0 0 3px;
 }
 
-.simplemap--lat-lng input:last-child {
-	border-radius: 0 3px 3px 0;
-}
+/* Responsive */
 
 @media (max-width: 900px) {
 	.simplemap--address-field {
@@ -51,4 +48,29 @@
 	.simplemap--lat-lng input {
 		width: 100%;
 	}
+}
+
+/* Hud */
+
+.hud .simplemap--address-wrap {
+	width: 30vw;
+	max-width: 100%;
+	padding: 0 !important;
+}
+
+.hud .simplemap--address-field {
+	display: block;
+}
+
+.hud .simplemap--address {
+	width: 100%;
+}
+
+.hud .simplemap--lat-lng {
+	width: 100%;
+	padding: 10px 0 0 0;
+}
+
+.hud .simplemap--lat-lng input {
+	width: 50%;
 }
\ No newline at end of file
diff --git a/src/services/MapService.php b/src/services/MapService.php
index 2e4ba46..c543167 100644
--- a/src/services/MapService.php
+++ b/src/services/MapService.php
@@ -178,6 +178,8 @@ public function getField (MapField $field, ElementInterface $owner, $value): Map
 	 * @param ElementInterface $owner
 	 *
 	 * @return bool
+	 * @throws Exception
+	 * @throws \yii\base\InvalidConfigException
 	 */
 	public function saveField (MapField $field, ElementInterface $owner): bool
 	{
@@ -247,6 +249,7 @@ public function saveField (MapField $field, ElementInterface $owner): bool
 	 * @param                       $value
 	 *
 	 * @return null
+	 * @throws Exception
 	 */
 	public function modifyElementsQuery (ElementQueryInterface $query, $value)
 	{
@@ -255,14 +258,22 @@ public function modifyElementsQuery (ElementQueryInterface $query, $value)
 
 		$tableName = MapRecord::$tableName;
 
-		$query->join(
+		$on = [
+			'and',
+			'[[elements.id]] = [[simplemap.ownerId]]',
+			'[[elements_sites.siteId]] = [[simplemap.ownerSiteId]]',
+		];
+
+		$query->query->join(
 			'JOIN',
 			"{$tableName} simplemap",
-			[
-				'and',
-				'[[elements.id]] = [[simplemap.ownerId]]',
-				'[[elements_sites.siteId]] = [[simplemap.ownerSiteId]]',
-			]
+			$on
+		);
+
+		$query->subQuery->join(
+			'JOIN',
+			"{$tableName} simplemap",
+			$on
 		);
 
 		if (!is_array($query->orderBy)) {
@@ -321,6 +332,7 @@ private static function _getAPIKey ()
 	 * @param string|null $locale
 	 *
 	 * @return array
+	 * @throws Exception
 	 */
 	private function _getPartsFromLatLng ($lat, $lng, $address, $locale)
 	{
@@ -485,6 +497,8 @@ private function _padParts (Map $model)
 	 *
 	 * @param ElementQuery $query
 	 * @param array        $value
+	 *
+	 * @throws Exception
 	 */
 	private function _searchLocation (ElementQuery $query, $value)
 	{
diff --git a/src/templates/field-input.twig b/src/templates/field-input.twig
index 92d3179..397114c 100644
--- a/src/templates/field-input.twig
+++ b/src/templates/field-input.twig
@@ -1,6 +1,6 @@
 {% import "_includes/forms" as forms %}
 
-<div class="field" id="{{ id }}-address-field">
+<div class="field simplemap--address-wrap" id="{{ id }}-address-field">
 	<div class="input ltr simplemap--address-field">
 		<input class="text simplemap--address fullwidth" type="text"
 		       name="{{ name }}[address]" id="{{ id }}-address"