diff --git a/.craftplugin b/.craftplugin
index c5df0389..c61e5c62 100644
--- a/.craftplugin
+++ b/.craftplugin
@@ -1,7 +1,7 @@
 {
     "pluginName": "Translations for Craft",
     "pluginDescription": "Drive global growth with simplified translation workflows.",
-    "pluginVersion": "2.2.2",
+    "pluginVersion": "3.0.0-beta.1",
     "pluginAuthorName": "Acclaro",
     "pluginVendorName": "Acclaro",
     "pluginAuthorUrl": "http://www.acclaro.com/",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9718c139..ad58b16a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,32 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.0.0-beta.1 - 2022-07-12
+
+### Fixed
+- An issue where `New translations` button on entry index page remains active on switching entry groups.
+- An issue where deleting draft from `globalsetdraft/assetdraft` detail page was removing order file.
+
+### Updated
+- Craft minimum version from 3.7.33 to 4.0.0
+- Category draft's custom logic with craft's native code. (Craft now supports category drafts)
+- Download TM files action disabled by default.
+
+### Added
+- Support for Craft 4.
+- Logging in webhook flow for api orders.
+
+### Removed
+- Removed unsused `editDraftAssets`.
+- Removed `translations_categorydrafts` table.
+
+### Chore
+- Code refactoring and cleanup.
+
 ## 2.2.2 - 2022-07-06
 
 ### Fixed
-- An issue where order fails to open when `previewUrl` length exceeds 255 chars. (#341) 
+- An issue where order fails to open when `previewUrl` length exceeds 255 chars. (#341)
 
 ### Updated
 - Removed the use of `filetype` param in API order sync call.
@@ -56,7 +78,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Fixed
 - Plugin uninstallation bug (https://github.com/AcclaroInc/craft-translations/pull/313)
-  
+
 ## 2.1.3 - 2022-02-21
 
 ### Fixed
@@ -512,7 +534,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Removed
 - Removed `UpdateDraftFromXML`
-- Truncate `translations_files` and `translations_orders` tables to be compliant with new Craft draft service 
+- Truncate `translations_files` and `translations_orders` tables to be compliant with new Craft draft service
 
 ## 1.1.1 - 2019-07-03
 ### Added
diff --git a/README.md b/README.md
index 8e556e48..592b64df 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ The Translations plugin provides a simple way to translate your content from sta
   *Need support for a specific plugin? [Contact us](http://www.acclaro.com/translation-services-cost/?utm_campaign=Craft%20Plugin%20Store&utm_source=Craft%20Plugin%20Store%20Listing%20-%20Third%20Party%20Plugins%20Quote&utm_medium=Listing) for a quote.*
 
 ## ⚠️ System Requirements
-- Craft CMS 3.7.33 or later.
-- PHP 7.2+
+- Craft CMS 4.0.0 or later.
+- PHP 8.0.2+
 - PHP [DOM](https://docs.craftcms.com/v3/requirements.html#optional-php-extensions) Extension
 - Craft [Multi-site](https://craftcms.com/docs/3.x/sites.html) configuration
 
@@ -49,7 +49,7 @@ The license fee for this plugin is $999.00 via the Craft Plugin Store. Annual li
 We offer a 30-day money back guarantee for the software plugin purchase if you are not satisfied.
 
 ### Terms
-Prior to download, installation and use of the Translation Plugin for Craft on a public site, site owners are required to purchase the plugin from the Craft plugin store or submit payment directly to Acclaro for purchases outside of the store. 
+Prior to download, installation and use of the Translation Plugin for Craft on a public site, site owners are required to purchase the plugin from the Craft plugin store or submit payment directly to Acclaro for purchases outside of the store.
 
 Any usage of the plugin either on production or in a sandbox environment indicates your acceptance of the legal terms described in the [Craft Software License](https://craftcms.github.io/license/). Any usage of Acclaro Translation Service API integrations indicates acceptance of the terms and conditions as set forth in the [Acclaro User Agreement](https://my.acclaro.com/p.php/useragreement) and [Privacy Policy](https://www.acclaro.com/privacy-policy/).
 
diff --git a/composer.json b/composer.json
index 24bda982..fb24fb27 100644
--- a/composer.json
+++ b/composer.json
@@ -24,10 +24,9 @@
         }
     ],
     "require": {
-        "craftcms/cms": "^3.7.36",
-        "guzzlehttp/guzzle": "^6.5.8|^7.0",
-        "php": ">=7.2.0",
-        "sebastian/diff": "^3.0",
+        "craftcms/cms": "^4.0.0",
+        "guzzlehttp/guzzle": "^7.0",
+        "php": "^8.0.2",
         "composer/composer": "^2.1.9",
 		"spatie/guzzle-rate-limiter-middleware": "^2.0"
     },
diff --git a/composer.lock b/composer.lock
index 868683bc..ea6ae3aa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2409,6 +2409,11 @@
                 "php": ">=7.4.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -2771,29 +2776,29 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "3.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211"
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^8.0",
-                "symfony/process": "^2 || ^3.3 || ^4"
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -2825,7 +2830,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
             },
             "funding": [
                 {
@@ -2833,7 +2838,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:59:04+00:00"
+            "time": "2020-10-26T13:10:38+00:00"
         },
         {
             "name": "seld/cli-prompt",
@@ -3154,15 +3159,14 @@
                 "symfony/string": "^5.1|^6.0"
             },
             "conflict": {
-                "psr/log": ">=3",
-                "symfony/dependency-injection": "<4.4",
-                "symfony/dotenv": "<5.1",
-                "symfony/event-dispatcher": "<4.4",
-                "symfony/lock": "<4.4",
-                "symfony/process": "<4.4"
+                "symfony/dependency-injection": "<5.4",
+                "symfony/dotenv": "<5.4",
+                "symfony/event-dispatcher": "<5.4",
+                "symfony/lock": "<5.4",
+                "symfony/process": "<5.4"
             },
             "provide": {
-                "psr/log-implementation": "1.0|2.0"
+                "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/log": "^1|^2",
@@ -3244,7 +3248,7 @@
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.0.2"
             },
             "type": "library",
             "extra": {
@@ -3311,7 +3315,7 @@
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.0.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.8",
                 "symfony/polyfill-php80": "^1.16"
@@ -4321,12 +4325,14 @@
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.0.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "~1.15"
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/translation-contracts": "<2.0"
             },
             "conflict": {
                 "symfony/translation-contracts": ">=3.0"
@@ -5840,11 +5846,1065 @@
             "time": "2021-12-30T08:48:48+00:00"
         }
     ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
+    "packages-dev": [
+        {
+            "name": "craftcms/rector",
+            "version": "dev-main",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/craftcms/rector.git",
+                "reference": "af3ecee2ce6b8344fc6fdc6d82a5b2b2dc3d7eeb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/craftcms/rector/zipball/af3ecee2ce6b8344fc6fdc6d82a5b2b2dc3d7eeb",
+                "reference": "af3ecee2ce6b8344fc6fdc6d82a5b2b2dc3d7eeb",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0.2",
+                "rector/rector": "dev-main",
+                "symplify/package-builder": "^10.1"
+            },
+            "require-dev": {
+                "craftcms/cms": "^4.0.0-alpha",
+                "craftcms/ecs": "dev-main",
+                "phpstan/phpstan": "^1.2",
+                "phpunit/phpunit": "^9.5",
+                "symfony/var-exporter": "^6.0"
+            },
+            "default-branch": true,
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "craft\\rector\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "description": "Rector sets to automate Craft CMS upgrades",
+            "support": {
+                "issues": "https://github.com/craftcms/rector/issues",
+                "source": "https://github.com/craftcms/rector/tree/main"
+            },
+            "time": "2022-04-21T18:49:21+00:00"
+        },
+        {
+            "name": "nette/neon",
+            "version": "v3.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/neon.git",
+                "reference": "22e384da162fab42961d48eb06c06d3ad0c11b95"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/neon/zipball/22e384da162fab42961d48eb06c06d3ad0c11b95",
+                "reference": "22e384da162fab42961d48eb06c06d3ad0c11b95",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "nette/tester": "^2.0",
+                "phpstan/phpstan": "^0.12",
+                "tracy/tracy": "^2.7"
+            },
+            "bin": [
+                "bin/neon-lint"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.3-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0-only",
+                "GPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "🍸 Nette NEON: encodes and decodes NEON file format.",
+            "homepage": "https://ne-on.org",
+            "keywords": [
+                "export",
+                "import",
+                "neon",
+                "nette",
+                "yaml"
+            ],
+            "support": {
+                "issues": "https://github.com/nette/neon/issues",
+                "source": "https://github.com/nette/neon/tree/v3.3.3"
+            },
+            "time": "2022-03-10T02:04:26+00:00"
+        },
+        {
+            "name": "nette/utils",
+            "version": "v3.2.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/utils.git",
+                "reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/utils/zipball/0af4e3de4df9f1543534beab255ccf459e7a2c99",
+                "reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2 <8.2"
+            },
+            "conflict": {
+                "nette/di": "<3.0.6"
+            },
+            "require-dev": {
+                "nette/tester": "~2.0",
+                "phpstan/phpstan": "^1.0",
+                "tracy/tracy": "^2.3"
+            },
+            "suggest": {
+                "ext-gd": "to use Image",
+                "ext-iconv": "to use Strings::webalize(), toAscii(), chr() and reverse()",
+                "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()",
+                "ext-json": "to use Nette\\Utils\\Json",
+                "ext-mbstring": "to use Strings::lower() etc...",
+                "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()",
+                "ext-xml": "to use Strings::length() etc. when mbstring is not available"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0-only",
+                "GPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "🛠  Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.",
+            "homepage": "https://nette.org",
+            "keywords": [
+                "array",
+                "core",
+                "datetime",
+                "images",
+                "json",
+                "nette",
+                "paginator",
+                "password",
+                "slugify",
+                "string",
+                "unicode",
+                "utf-8",
+                "utility",
+                "validation"
+            ],
+            "support": {
+                "issues": "https://github.com/nette/utils/issues",
+                "source": "https://github.com/nette/utils/tree/v3.2.7"
+            },
+            "time": "2022-01-24T11:29:14+00:00"
+        },
+        {
+            "name": "phpstan/phpstan",
+            "version": "1.5.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "7fb7e2e1e9f3d59a26a413b2d3d5e47f0edb75ac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7fb7e2e1e9f3d59a26a413b2d3d5e47f0edb75ac",
+                "reference": "7fb7e2e1e9f3d59a26a413b2d3d5e47f0edb75ac",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2|^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "source": "https://github.com/phpstan/phpstan/tree/1.5.7"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpstan",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-04-20T12:20:27+00:00"
+        },
+        {
+            "name": "rector/rector",
+            "version": "dev-main",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/rectorphp/rector.git",
+                "reference": "af205b10a4db7c7c3f148d27126611133d974d6a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/af205b10a4db7c7c3f148d27126611133d974d6a",
+                "reference": "af205b10a4db7c7c3f148d27126611133d974d6a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2|^8.0",
+                "phpstan/phpstan": "^1.5.6"
+            },
+            "conflict": {
+                "phpstan/phpdoc-parser": "<1.2",
+                "rector/rector-cakephp": "*",
+                "rector/rector-doctrine": "*",
+                "rector/rector-laravel": "*",
+                "rector/rector-nette": "*",
+                "rector/rector-phpoffice": "*",
+                "rector/rector-phpunit": "*",
+                "rector/rector-prefixed": "*",
+                "rector/rector-symfony": "*"
+            },
+            "default-branch": true,
+            "bin": [
+                "bin/rector"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "0.12-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Instant Upgrade and Automated Refactoring of any PHP code",
+            "support": {
+                "issues": "https://github.com/rectorphp/rector/issues",
+                "source": "https://github.com/rectorphp/rector/tree/main"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/tomasvotruba",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-04-22T00:49:25+00:00"
+        },
+        {
+            "name": "symfony/config",
+            "version": "v6.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/config.git",
+                "reference": "22850bfdd2b6090568ad05dece6843c859d933b7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/config/zipball/22850bfdd2b6090568ad05dece6843c859d933b7",
+                "reference": "22850bfdd2b6090568ad05dece6843c859d933b7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.2",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/filesystem": "^5.4|^6.0",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-php81": "^1.22"
+            },
+            "conflict": {
+                "symfony/finder": "<4.4"
+            },
+            "require-dev": {
+                "symfony/event-dispatcher": "^5.4|^6.0",
+                "symfony/finder": "^5.4|^6.0",
+                "symfony/messenger": "^5.4|^6.0",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/yaml": "^5.4|^6.0"
+            },
+            "suggest": {
+                "symfony/yaml": "To use the yaml reference dumper"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Config\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/config/tree/v6.0.7"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-03-22T16:12:04+00:00"
+        },
+        {
+            "name": "symfony/dependency-injection",
+            "version": "v6.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/dependency-injection.git",
+                "reference": "3e8a405fcc2eaf4eadb25b5e259ad9bf90499848"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/3e8a405fcc2eaf4eadb25b5e259ad9bf90499848",
+                "reference": "3e8a405fcc2eaf4eadb25b5e259ad9bf90499848",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.2",
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php81": "^1.22",
+                "symfony/service-contracts": "^1.1.6|^2.0|^3.0"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2",
+                "symfony/config": "<5.4",
+                "symfony/finder": "<5.4",
+                "symfony/proxy-manager-bridge": "<5.4",
+                "symfony/yaml": "<5.4"
+            },
+            "provide": {
+                "psr/container-implementation": "1.1|2.0",
+                "symfony/service-implementation": "1.1|2.0|3.0"
+            },
+            "require-dev": {
+                "symfony/config": "^5.4|^6.0",
+                "symfony/expression-language": "^5.4|^6.0",
+                "symfony/yaml": "^5.4|^6.0"
+            },
+            "suggest": {
+                "symfony/config": "",
+                "symfony/expression-language": "For using expressions in service container configuration",
+                "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
+                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\DependencyInjection\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Allows you to standardize and centralize the way objects are constructed in your application",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/dependency-injection/tree/v6.0.7"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-03-08T15:43:52+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php81",
+            "version": "v1.25.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php81.git",
+                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
+                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php81\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-09-13T13:58:11+00:00"
+        },
+        {
+            "name": "symplify/autowire-array-parameter",
+            "version": "10.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symplify/autowire-array-parameter.git",
+                "reference": "ec1cc9a9649eb1ec47eca68942fe665a6ce656e8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symplify/autowire-array-parameter/zipball/ec1cc9a9649eb1ec47eca68942fe665a6ce656e8",
+                "reference": "ec1cc9a9649eb1ec47eca68942fe665a6ce656e8",
+                "shasum": ""
+            },
+            "require": {
+                "nette/utils": "^3.2",
+                "php": ">=8.0",
+                "symfony/dependency-injection": "^6.0",
+                "symplify/package-builder": "^10.2.2"
+            },
+            "conflict": {
+                "symplify/amnesia": "<10.2.2",
+                "symplify/astral": "<10.2.2",
+                "symplify/coding-standard": "<10.2.2",
+                "symplify/composer-json-manipulator": "<10.2.2",
+                "symplify/config-transformer": "<10.2.2",
+                "symplify/easy-ci": "<10.2.2",
+                "symplify/easy-coding-standard": "<10.2.2",
+                "symplify/easy-parallel": "<10.2.2",
+                "symplify/easy-testing": "<10.2.2",
+                "symplify/git-wrapper": "<10.2.2",
+                "symplify/latte-phpstan-compiler": "<10.2.2",
+                "symplify/monorepo-builder": "<10.2.2",
+                "symplify/neon-config-dumper": "<10.2.2",
+                "symplify/php-config-printer": "<10.2.2",
+                "symplify/phpstan-extensions": "<10.2.2",
+                "symplify/phpstan-latte-rules": "<10.2.2",
+                "symplify/phpstan-rules": "<10.2.2",
+                "symplify/rule-doc-generator": "<10.2.2",
+                "symplify/rule-doc-generator-contracts": "<10.2.2",
+                "symplify/skipper": "<10.2.2",
+                "symplify/smart-file-system": "<10.2.2",
+                "symplify/symfony-static-dumper": "<10.2.2",
+                "symplify/symplify-kernel": "<10.2.2",
+                "symplify/template-phpstan-compiler": "<10.2.2",
+                "symplify/vendor-patches": "<10.2.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "10.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symplify\\AutowireArrayParameter\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Autowire array parameters for your Symfony applications",
+            "support": {
+                "source": "https://github.com/symplify/autowire-array-parameter/tree/10.2.2"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/rectorphp",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/tomasvotruba",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-04-17T10:40:31+00:00"
+        },
+        {
+            "name": "symplify/composer-json-manipulator",
+            "version": "10.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symplify/composer-json-manipulator.git",
+                "reference": "29e4fb846636e0a3b7aae601aa1eac2f68a103c9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symplify/composer-json-manipulator/zipball/29e4fb846636e0a3b7aae601aa1eac2f68a103c9",
+                "reference": "29e4fb846636e0a3b7aae601aa1eac2f68a103c9",
+                "shasum": ""
+            },
+            "require": {
+                "nette/utils": "^3.2",
+                "php": ">=8.0",
+                "symfony/config": "^6.0",
+                "symfony/dependency-injection": "^6.0",
+                "symfony/filesystem": "^6.0",
+                "symplify/package-builder": "^10.2.2",
+                "symplify/smart-file-system": "^10.2.2",
+                "symplify/symplify-kernel": "^10.2.2"
+            },
+            "conflict": {
+                "symplify/amnesia": "<10.2.2",
+                "symplify/astral": "<10.2.2",
+                "symplify/autowire-array-parameter": "<10.2.2",
+                "symplify/coding-standard": "<10.2.2",
+                "symplify/config-transformer": "<10.2.2",
+                "symplify/easy-ci": "<10.2.2",
+                "symplify/easy-coding-standard": "<10.2.2",
+                "symplify/easy-parallel": "<10.2.2",
+                "symplify/easy-testing": "<10.2.2",
+                "symplify/git-wrapper": "<10.2.2",
+                "symplify/latte-phpstan-compiler": "<10.2.2",
+                "symplify/monorepo-builder": "<10.2.2",
+                "symplify/neon-config-dumper": "<10.2.2",
+                "symplify/php-config-printer": "<10.2.2",
+                "symplify/phpstan-extensions": "<10.2.2",
+                "symplify/phpstan-latte-rules": "<10.2.2",
+                "symplify/phpstan-rules": "<10.2.2",
+                "symplify/rule-doc-generator": "<10.2.2",
+                "symplify/rule-doc-generator-contracts": "<10.2.2",
+                "symplify/skipper": "<10.2.2",
+                "symplify/symfony-static-dumper": "<10.2.2",
+                "symplify/symplify-kernel": "<9.4.70",
+                "symplify/template-phpstan-compiler": "<10.2.2",
+                "symplify/vendor-patches": "<10.2.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "10.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symplify\\ComposerJsonManipulator\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Package to load, merge and save composer.json file(s)",
+            "support": {
+                "source": "https://github.com/symplify/composer-json-manipulator/tree/10.2.2"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/rectorphp",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/tomasvotruba",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-04-17T10:40:52+00:00"
+        },
+        {
+            "name": "symplify/easy-testing",
+            "version": "10.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symplify/easy-testing.git",
+                "reference": "6ff0dda15ab96be196c9eb29eb1db427d0e0637d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symplify/easy-testing/zipball/6ff0dda15ab96be196c9eb29eb1db427d0e0637d",
+                "reference": "6ff0dda15ab96be196c9eb29eb1db427d0e0637d",
+                "shasum": ""
+            },
+            "require": {
+                "nette/utils": "^3.2",
+                "php": ">=8.0",
+                "symfony/console": "^6.0",
+                "symfony/dependency-injection": "^6.0",
+                "symfony/finder": "^6.0",
+                "symplify/package-builder": "^10.2.2",
+                "symplify/smart-file-system": "^10.2.2",
+                "symplify/symplify-kernel": "^10.2.2"
+            },
+            "conflict": {
+                "symplify/amnesia": "<10.2.2",
+                "symplify/astral": "<10.2.2",
+                "symplify/autowire-array-parameter": "<10.2.2",
+                "symplify/coding-standard": "<10.2.2",
+                "symplify/composer-json-manipulator": "<10.2.2",
+                "symplify/config-transformer": "<10.2.2",
+                "symplify/easy-ci": "<10.2.2",
+                "symplify/easy-coding-standard": "<10.2.2",
+                "symplify/easy-parallel": "<10.2.2",
+                "symplify/git-wrapper": "<10.2.2",
+                "symplify/latte-phpstan-compiler": "<10.2.2",
+                "symplify/monorepo-builder": "<10.2.2",
+                "symplify/neon-config-dumper": "<10.2.2",
+                "symplify/php-config-printer": "<10.2.2",
+                "symplify/phpstan-extensions": "<10.2.2",
+                "symplify/phpstan-latte-rules": "<10.2.2",
+                "symplify/phpstan-rules": "<10.2.2",
+                "symplify/rule-doc-generator": "<10.2.2",
+                "symplify/rule-doc-generator-contracts": "<10.2.2",
+                "symplify/skipper": "<10.2.2",
+                "symplify/symfony-static-dumper": "<10.2.2",
+                "symplify/template-phpstan-compiler": "<10.2.2",
+                "symplify/vendor-patches": "<10.2.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "bin": [
+                "bin/easy-testing"
+            ],
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "10.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symplify\\EasyTesting\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Testing made easy",
+            "support": {
+                "source": "https://github.com/symplify/easy-testing/tree/10.2.2"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/rectorphp",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/tomasvotruba",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-04-17T10:40:56+00:00"
+        },
+        {
+            "name": "symplify/package-builder",
+            "version": "10.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symplify/package-builder.git",
+                "reference": "b2634f45928f07999ad2ac352de6cf4413410cc7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symplify/package-builder/zipball/b2634f45928f07999ad2ac352de6cf4413410cc7",
+                "reference": "b2634f45928f07999ad2ac352de6cf4413410cc7",
+                "shasum": ""
+            },
+            "require": {
+                "nette/neon": "^3.3.2",
+                "nette/utils": "^3.2",
+                "php": ">=8.0",
+                "sebastian/diff": "^4.0",
+                "symfony/config": "^6.0",
+                "symfony/console": "^6.0",
+                "symfony/dependency-injection": "^6.0",
+                "symfony/finder": "^6.0",
+                "symplify/easy-testing": "^10.2.2",
+                "symplify/symplify-kernel": "^10.2.2"
+            },
+            "conflict": {
+                "symplify/amnesia": "<10.2.2",
+                "symplify/astral": "<10.2.2",
+                "symplify/autowire-array-parameter": "<10.2.2",
+                "symplify/coding-standard": "<10.2.2",
+                "symplify/composer-json-manipulator": "<10.2.2",
+                "symplify/config-transformer": "<10.2.2",
+                "symplify/easy-ci": "<10.2.2",
+                "symplify/easy-coding-standard": "<10.2.2",
+                "symplify/easy-parallel": "<10.2.2",
+                "symplify/git-wrapper": "<10.2.2",
+                "symplify/latte-phpstan-compiler": "<10.2.2",
+                "symplify/monorepo-builder": "<10.2.2",
+                "symplify/neon-config-dumper": "<10.2.2",
+                "symplify/php-config-printer": "<10.2.2",
+                "symplify/phpstan-extensions": "<10.2.2",
+                "symplify/phpstan-latte-rules": "<10.2.2",
+                "symplify/phpstan-rules": "<10.2.2",
+                "symplify/rule-doc-generator": "<10.2.2",
+                "symplify/rule-doc-generator-contracts": "<10.2.2",
+                "symplify/skipper": "<10.2.2",
+                "symplify/smart-file-system": "<10.2.2",
+                "symplify/symfony-static-dumper": "<10.2.2",
+                "symplify/template-phpstan-compiler": "<10.2.2",
+                "symplify/vendor-patches": "<10.2.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "10.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symplify\\PackageBuilder\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Dependency Injection, Console and Kernel toolkit for Symplify packages.",
+            "support": {
+                "source": "https://github.com/symplify/package-builder/tree/10.2.2"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/rectorphp",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/tomasvotruba",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-04-17T10:41:12+00:00"
+        },
+        {
+            "name": "symplify/smart-file-system",
+            "version": "10.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symplify/smart-file-system.git",
+                "reference": "126cd1916dce01f0fef44a3d432194d5d3ad6fe1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symplify/smart-file-system/zipball/126cd1916dce01f0fef44a3d432194d5d3ad6fe1",
+                "reference": "126cd1916dce01f0fef44a3d432194d5d3ad6fe1",
+                "shasum": ""
+            },
+            "require": {
+                "nette/utils": "^3.2",
+                "php": ">=8.0",
+                "symfony/filesystem": "^6.0",
+                "symfony/finder": "^6.0"
+            },
+            "conflict": {
+                "symplify/amnesia": "<10.2.2",
+                "symplify/astral": "<10.2.2",
+                "symplify/autowire-array-parameter": "<10.2.2",
+                "symplify/coding-standard": "<10.2.2",
+                "symplify/composer-json-manipulator": "<10.2.2",
+                "symplify/config-transformer": "<10.2.2",
+                "symplify/easy-ci": "<10.2.2",
+                "symplify/easy-coding-standard": "<10.2.2",
+                "symplify/easy-parallel": "<10.2.2",
+                "symplify/easy-testing": "<10.2.2",
+                "symplify/git-wrapper": "<10.2.2",
+                "symplify/latte-phpstan-compiler": "<10.2.2",
+                "symplify/monorepo-builder": "<10.2.2",
+                "symplify/neon-config-dumper": "<10.2.2",
+                "symplify/package-builder": "<10.2.2",
+                "symplify/php-config-printer": "<10.2.2",
+                "symplify/phpstan-extensions": "<10.2.2",
+                "symplify/phpstan-latte-rules": "<10.2.2",
+                "symplify/phpstan-rules": "<10.2.2",
+                "symplify/rule-doc-generator": "<10.2.2",
+                "symplify/rule-doc-generator-contracts": "<10.2.2",
+                "symplify/skipper": "<10.2.2",
+                "symplify/symfony-static-dumper": "<10.2.2",
+                "symplify/symplify-kernel": "<10.2.2",
+                "symplify/template-phpstan-compiler": "<10.2.2",
+                "symplify/vendor-patches": "<10.2.2"
+            },
+            "require-dev": {
+                "nette/finder": "^2.5",
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "10.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symplify\\SmartFileSystem\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Sanitized FileInfo with safe getRealPath() and other handy methods",
+            "support": {
+                "source": "https://github.com/symplify/smart-file-system/tree/10.2.2"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/rectorphp",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/tomasvotruba",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-04-17T10:41:31+00:00"
+        },
+        {
+            "name": "symplify/symplify-kernel",
+            "version": "10.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symplify/symplify-kernel.git",
+                "reference": "b2d1e8279528975a96ddeb3f5b59b1b22be15e59"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symplify/symplify-kernel/zipball/b2d1e8279528975a96ddeb3f5b59b1b22be15e59",
+                "reference": "b2d1e8279528975a96ddeb3f5b59b1b22be15e59",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0",
+                "symfony/console": "^6.0",
+                "symfony/dependency-injection": "^6.0",
+                "symplify/autowire-array-parameter": "^10.2.2",
+                "symplify/composer-json-manipulator": "^10.2.2",
+                "symplify/package-builder": "^10.2.2",
+                "symplify/smart-file-system": "^10.2.2",
+                "webmozart/assert": "^1.10"
+            },
+            "conflict": {
+                "symplify/amnesia": "<10.2.2",
+                "symplify/astral": "<10.2.2",
+                "symplify/coding-standard": "<10.2.2",
+                "symplify/config-transformer": "<10.2.2",
+                "symplify/easy-ci": "<10.2.2",
+                "symplify/easy-coding-standard": "<10.2.2",
+                "symplify/easy-parallel": "<10.2.2",
+                "symplify/easy-testing": "<10.2.2",
+                "symplify/git-wrapper": "<10.2.2",
+                "symplify/latte-phpstan-compiler": "<10.2.2",
+                "symplify/monorepo-builder": "<10.2.2",
+                "symplify/neon-config-dumper": "<10.2.2",
+                "symplify/php-config-printer": "<10.2.2",
+                "symplify/phpstan-extensions": "<10.2.2",
+                "symplify/phpstan-latte-rules": "<10.2.2",
+                "symplify/phpstan-rules": "<10.2.2",
+                "symplify/rule-doc-generator": "<10.2.2",
+                "symplify/rule-doc-generator-contracts": "<10.2.2",
+                "symplify/skipper": "<10.2.2",
+                "symplify/symfony-static-dumper": "<10.2.2",
+                "symplify/template-phpstan-compiler": "<10.2.2",
+                "symplify/vendor-patches": "<10.2.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "10.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symplify\\SymplifyKernel\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Internal Kernel for Symplify packages",
+            "support": {
+                "source": "https://github.com/symplify/symplify-kernel/tree/10.2.2"
+            },
+            "time": "2022-04-17T10:41:30+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "dev",
+    "stability-flags": {
+        "craftcms/rector": 20
+    },
+    "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
         "php": ">=7.2.0"
diff --git a/src/Constants.php b/src/Constants.php
index 0552db8c..0977fc21 100644
--- a/src/Constants.php
+++ b/src/Constants.php
@@ -5,7 +5,7 @@
 class Constants
 {
     const PLUGIN_SCHEMA_VERSION = '1.3.9';
-    const CRAFT_MIN_VERSION = '3.7.36';
+    const CRAFT_MIN_VERSION = '4.0.0';
     const WORD_COUNT_LIMIT  = 2000;
     const PLUGIN_HANDLE     = 'translations';
 
@@ -146,7 +146,6 @@ class Constants
     const TABLE_TRANSLATORS         = '{{%translations_translators}}';
     const TABLE_TRANSLATIONS        = '{{%translations_translations}}';
     const TABLE_GLOBAL_SET_DRAFT    = '{{%translations_globalsetdrafts}}';
-    const TABLE_CATEGORY_DRAFT      = '{{%translations_categorydrafts}}';
     const TABLE_ASSET_DRAFT         = '{{%translations_assetdrafts}}';
 
     // Job Descriptions
@@ -266,7 +265,12 @@ class Constants
         'newism\fields\fields\Embed',
         'newism\fields\fields\PersonName',
         'newism\fields\fields\Gender',
-        'ether\seo\fields\SeoField'
+        'ether\seo\fields\SeoField',
+        'ether\notes\Field',
+        'amici\SuperDynamicFields\fields\SueprDynamicDropdownField',
+        'amici\SuperDynamicFields\fields\SueprDynamicRadioField',
+        'amici\SuperDynamicFields\fields\SueprDynamicCheckboxesField',
+        'amici\SuperDynamicFields\fields\SueprDynamicMultiSelectField',
     ];
 
     const UNRELATED_FIELD_TYPES = [
@@ -276,6 +280,7 @@ class Constants
         'craft\fields\Lightswitch',
         'craft\fields\Time',
         'craft\fields\Url',
-        'craft\fields\Users'
+        'craft\fields\Users',
+        'craft\fields\Money',
     ];
 }
diff --git a/src/Translations.php b/src/Translations.php
index 3b0ec813..7b7a8073 100644
--- a/src/Translations.php
+++ b/src/Translations.php
@@ -11,38 +11,37 @@
 namespace acclaro\translations;
 
 use Craft;
-use craft\events\RegisterUserPermissionsEvent;
-use craft\services\UserPermissions;
+use yii\web\User;
 use yii\base\Event;
 use craft\base\Plugin;
 use craft\web\UrlManager;
+use craft\services\Sites;
 use craft\elements\Entry;
+use craft\services\Drafts;
 use craft\services\Plugins;
 use craft\events\ModelEvent;
 use craft\helpers\UrlHelper;
 use craft\events\DraftEvent;
 use craft\services\Elements;
 use craft\events\PluginEvent;
-use craft\services\Drafts;
+use craft\services\UserPermissions;
+use craft\events\DeleteSiteEvent;
+use craft\events\DeleteElementEvent;
 use craft\events\RegisterUrlRulesEvent;
 use craft\events\RegisterComponentTypesEvent;
-use craft\events\DeleteElementEvent;
+use craft\events\RegisterUserPermissionsEvent;
+use craft\console\Application as ConsoleApplication;
+
 use acclaro\translations\Constants;
 use acclaro\translations\services\App;
 use acclaro\translations\elements\Order;
 use acclaro\translations\base\PluginTrait;
-use craft\console\Application as ConsoleApplication;
 use acclaro\translations\assetbundles\EntryAssets;
 use acclaro\translations\assetbundles\CategoryAssets;
 use acclaro\translations\assetbundles\Assets;
 use acclaro\translations\assetbundles\UniversalAssets;
-use acclaro\translations\assetbundles\EditDraftAssets;
 use acclaro\translations\assetbundles\GlobalSetAssets;
 use acclaro\translations\services\job\DeleteDrafts;
-use craft\errors\MigrationException;
-use craft\events\DeleteSiteEvent;
-use craft\services\Sites;
-use yii\web\User;
 
 class Translations extends Plugin
 {
@@ -63,24 +62,18 @@ class Translations extends Plugin
      */
     public static $view;
 
-    /**
-     * @var bool
-     */
-    public $hasCpSection = true;
-
-    /**
-     * @var bool
-     */
-    public $hasCpSettings = true;
-
-    /**
-     * @var string
-     */
-    public $schemaVersion = Constants::PLUGIN_SCHEMA_VERSION;
-
     // Public Methods
     // =========================================================================
 
+    public function __construct($id, $parent = null, array $config = [])
+    {
+        $this->schemaVersion = Constants::PLUGIN_SCHEMA_VERSION;
+        $this->hasCpSettings = true;
+        $this->hasCpSection = true;
+
+        parent::__construct($id, $parent, $config);
+    }
+
     /**
      * @inheritdoc
      */
@@ -125,10 +118,6 @@ function () {
             Drafts::class,
             Drafts::EVENT_BEFORE_APPLY_DRAFT,
             function (DraftEvent $event) {
-                // Craft::debug(
-                //     'Drafts::EVENT_BEFORE_PUBLISH_DRAFT',
-                //     __METHOD__
-                // );
                 Craft::info(
                     Craft::t(
                         'translations',
@@ -215,7 +204,7 @@ function (PluginEvent $event) {
     /**
      * @inheritdoc
      */
-    public function uninstall()
+    public function uninstall(): void
     {
         // Let's clean up the drafts table
         $drafts = self::$plugin->fileRepository->getAllDraftIds();
@@ -226,21 +215,13 @@ public function uninstall()
             ]));
         }
 
-        if (($migration = $this->createInstallMigration()) !== null) {
-            try {
-                $this->getMigrator()->migrateDown($migration);
-            } catch (MigrationException $e) {
-                return false;
-            }
-        }
-        $this->afterUninstall();
-        return null;
+        parent::uninstall();
     }
 
     /**
      * @inheritdoc
      */
-    public function getCpNavItem()
+    public function getCpNavItem(): ?array
     {
         $subNavs = [];
         $navItem = parent::getCpNavItem();
@@ -288,18 +269,18 @@ public function getCpNavItem()
     /**
      * @inheritdoc
      */
-    public function getSettingsResponse()
+    public function getSettingsResponse(): mixed
     {
         // Just redirect to the plugin settings page
         Craft::$app->getResponse()->redirect(UrlHelper::cpUrl(Constants::URL_SETTINGS));
     }
 
-    protected function createSettingsModel()
+    protected function createSettingsModel(): ?\craft\base\Model
     {
         return new \acclaro\translations\models\Settings();
     }
 
-    protected function settingsHtml()
+    protected function settingsHtml(): ?string
     {
         return \Craft::$app->getView()->renderTemplate('translations/settings/general', [
             'settings' => $this->getSettings()
@@ -382,7 +363,6 @@ private function _registerCpRoutes()
 
                     // Asset, Category, Global-set Controllers
                     'translations/assets/<elementId:\d+>/drafts/<draftId:\d+>' => 'translations/asset/edit-draft',
-                    'translations/categories/<group>/<slug:{slug}>/drafts/<draftId:\d+>' => 'translations/category/edit-draft',
                     'translations/globals/<globalSetHandle:{handle}>/drafts/<draftId:\d+>' => 'translations/global-set/edit-draft',
                 ]);
             }
@@ -396,10 +376,6 @@ private function _includeResources($path)
 
         if (preg_match('#^entries(/|$)#', $path)) {
             $this->_includeEntryResources();
-
-            if (isset(Craft::$app->getRequest()->getQueryParams()['draftId'])) {
-                $this->_includeEditDraftResource(Craft::$app->getRequest()->getQueryParams()['draftId']);
-            }
         }
 
         if (preg_match('#^categories(/|$)#', $path, $match)) {
@@ -446,20 +422,6 @@ private function _includeUniversalResources()
         self::$view->registerJs("$(function(){ Craft.Translations.ShowCompleteOrdersIndicator.init({$numberOfCompleteOrders}); });");
     }
 
-    private function _includeEditDraftResource($draftId)
-    {
-        $response = Translations::$plugin->draftRepository->isTranslationDraft($draftId);
-
-        // If this is a translation draft, load the JS
-        if (!empty($response)) {
-            self::$view->registerAssetBundle(EditDraftAssets::class);
-
-            $response = json_encode($response);
-
-            self::$view->registerJs("$(function(){ Craft.Translations.ApplyTranslations.init({$draftId}, {$response}); });");
-        }
-    }
-
     private function _includeEntryResources()
     {
         $orders = array();
@@ -579,14 +541,13 @@ private function _onBeforePublishDraft(Event $event)
             $action = end($action);
 
             $applyDraftActions = [
-                'apply-drafts',
-                'save-draft-and-publish',
+                'apply-draft', // Apply from entry detail page
+                'save-draft-and-publish', // Apply from order detail page
                 'publish-draft',
                 'run',
             ];
 
-            if(!empty($response) && !in_array($action, $applyDraftActions)) {
-
+            if (!empty($response) && !in_array($action, $applyDraftActions)) {
                 Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'Unable to publish translation draft.'));
                 $path = $craft->request->getFullPath();
                 $params = $craft->request->getQueryParams();
@@ -634,14 +595,15 @@ private function _onDeleteElement(Event $event)
 				if ($currentFile) {
 					$order = self::$plugin->orderRepository->getOrderById($currentFile->orderId);
 
-                    if ($order) {
-						$order->logActivity(Translations::$plugin->translator->translate('app', 'Draft ' . $event->element->draftId . ' deleted.'));
-						Translations::$plugin->orderRepository->saveOrder($order);
-					}
+                    $currentFile->status = Constants::FILE_STATUS_CANCELED;
 
-					$currentFile->status = Constants::FILE_STATUS_CANCELED;
+                    self::$plugin->fileRepository->saveFile($currentFile);
 
-					self::$plugin->fileRepository->saveFile($currentFile);
+                    if ($order) {
+						$order->logActivity(self::$plugin->translator->translate('app', 'Draft ' . $event->element->draftId . ' deleted.'));
+                        $order->status = self::$plugin->orderRepository->getNewStatus($order);
+						self::$plugin->orderRepository->saveOrder($order);
+					}
                 }
             }
         }
@@ -651,7 +613,7 @@ private function _onDeleteElement(Event $event)
             $event->hardDelete = true;
         }
 
-        if ($order = Translations::$plugin->orderRepository->isTranslationOrder($event->element->id) && $event->hardDelete) {
+        if ($order = self::$plugin->orderRepository->isTranslationOrder($event->element->id) && $event->hardDelete) {
             $drafts = [];
             /** @var Order|null $order */
             foreach ($order->getFiles() as $file) {
@@ -684,12 +646,15 @@ protected function installCpEventListeners()
             UserPermissions::class,
             UserPermissions::EVENT_REGISTER_PERMISSIONS,
             function (RegisterUserPermissionsEvent $event) {
-                Craft::debug(
+                Craft::info(
                     '['. __METHOD__ .'] UserPermissions::EVENT_REGISTER_PERMISSIONS',
                     'translations'
                 );
                 // Register our custom permissions
-                $event->permissions[Craft::t('translations', 'Translations')] = $this->customAdminCpPermissions();
+                $event->permissions[] = [
+                    'heading'       => Craft::t('translations', 'Translations'),
+                    'permissions'   => $this->customAdminCpPermissions(),
+                ];
             }
         );
     }
diff --git a/src/assetbundles/NewAndModifiedAssets.php b/src/assetbundles/NewAndModifiedAssets.php
index aff8a6dc..3d73a7f6 100644
--- a/src/assetbundles/NewAndModifiedAssets.php
+++ b/src/assetbundles/NewAndModifiedAssets.php
@@ -27,9 +27,10 @@ public function init()
         $this->js = [
             'js/RecentlyModified.js',
             'js/diff2html.min.js',
+            'js/OrderEntries.js',
             'js/RecentEntries.js',
         ];
-        
+
         $this->css = [
             'css/diff2html.min.css',
         ];
diff --git a/src/assetbundles/src/css/Translations.css b/src/assetbundles/src/css/Translations.css
index 56a4245d..ad43601c 100644
--- a/src/assetbundles/src/css/Translations.css
+++ b/src/assetbundles/src/css/Translations.css
@@ -200,10 +200,6 @@
     margin: 0 0 2em;
 }
 
-/* #import-tool {
-    margin-left: 10px;
-} */
-
 .margin-right-10{
     margin-right: 10px;
 }
@@ -214,8 +210,8 @@
 }
 
 .utility-status .progressbar {
-    left: 75%;
-    width: 25%;
+    left: 50%;
+        width: 50%;
     transform: translateX(-50%) translateY(-50%);
 }
 
@@ -241,7 +237,6 @@
 
 .translations-complete-orders-indicator {
     float: right;
-    /* display: inline-block; */
     padding: 0;
     min-height: 22px;
     border: none;
@@ -395,7 +390,6 @@ body.ltr .widget[data-type="acclaro\\translations\\widgets\\NewAndModifiedEntrie
 }
 
 #recently-modified-widget tr.sel .view-diff {
-    margin-right: 10px;
     transition: all 0.05s ease-in-out;
 }
 
@@ -408,7 +402,6 @@ body.ltr .widget[data-type="acclaro\\translations\\widgets\\NewAndModifiedEntrie
 }
 
 #recent-entries-widget tr.sel .view-diff-entry {
-    margin-right: 10px;
     transition: all 0.05s ease-in-out;
 }
 
@@ -637,7 +630,7 @@ body.ltr .widget[data-type="acclaro\\translations\\widgets\\NewAndModifiedEntrie
 }
 
 #translations-dashboard .buttons {
-    margin: 0 0 14px;
+    margin: 10px 0 14px;
 }
 
 .btngroup-container {
diff --git a/src/assetbundles/src/js/AddEntriesToTranslationOrder.js b/src/assetbundles/src/js/AddEntriesToTranslationOrder.js
index c30bdda6..370dffcf 100644
--- a/src/assetbundles/src/js/AddEntriesToTranslationOrder.js
+++ b/src/assetbundles/src/js/AddEntriesToTranslationOrder.js
@@ -15,21 +15,33 @@ Craft.Translations.AddEntriesToTranslationOrder = {
 
     $btn: null,
     $createNewLink: null,
+    $sidebar: null,
 
     isEditEntryScreen: function() {
-        return $('form#main-form input[type=hidden][name=action][value="entries/save-entry"]').length > 0 ||
-        $('form#main-form input[type=hidden][name=action][value="entry-revisions/publish-draft"]').length > 0;
+        return $('form#main-form input[type=hidden][name=action][value="elements/save"]').length > 0;
+    },
+
+    isCreateEntryScreen: function() {
+        return $('form#main-form input[type=hidden][name=action][value="elements/apply-draft"]').length > 0;
+    },
+
+    isRevertRevisionScreen: function(){
+        return $('form input[type=hidden][name=action][value="elements/revert"]').length > 0;
+    },
+
+    isEditDraftScreen: function(){
+        return $('form#main-form input[type=hidden][name=action][value="elements/save-draft"]').length > 0;
     },
 
     getEditEntryId: function() {
-        var entryId = $('form#main-form input[type=hidden][name=entryId]').val();
+        var entryId = $('form#main-form input[type=hidden][name=elementId]').val();
         if(!entryId) {
             entryId = $('form#main-form input[type=hidden][name=sourceId]').val();
         }
 
         return entryId;
     },
-    
+
     updateSelectedEntries: function() {
         var entries = [];
 
@@ -67,13 +79,13 @@ Craft.Translations.AddEntriesToTranslationOrder = {
         // Figure out the initial locale
         var $option = localeMenu.$options.filter('.sel:first');
 
-        
+
         if ($option.length === 0) {
             $option = localeMenu.$options.first();
         }
-        
+
         var siteId = $option.data('site-id').toString();
-        
+
         return siteId;
     },
 
@@ -100,6 +112,7 @@ Craft.Translations.AddEntriesToTranslationOrder = {
         }
 
         var self = this;
+        this.$sidebar = $('#sidebar');
 
         this.data = data;
 
@@ -129,18 +142,18 @@ Craft.Translations.AddEntriesToTranslationOrder = {
         }
 
         if (this.isEditEntryScreen()) {
-            $settings = document.getElementById('settings');
+            $settings = $('#slug-field').closest('div.meta');
 
-            $settings.insertBefore($btncontainer, $settings.firstChild);
+            $settings.prepend($btncontainer);
             var $headinggroup = $('<div>', {'class': 'heading'}).html('<label id="translations-label" for="translations">Translations</label>');
             var $inputgroup = $('<div>', {'class': 'input ltr'});
 
-            
+
             $headinggroup.appendTo($btncontainer);
             $inputgroup.appendTo($btncontainer);
             $btngroup.appendTo($inputgroup);
-        } else {
-            $btngroup.insertBefore('#header #action-button');
+        } else if(! (this.isRevertRevisionScreen() || this.isEditDraftScreen() || this.isCreateEntryScreen())) {
+            $btngroup.insertBefore('header#header > div:last');
         }
 
         this.$btn = $('<a>', {
@@ -162,7 +175,7 @@ Craft.Translations.AddEntriesToTranslationOrder = {
 
         this.$btn.appendTo($btngroup);
 
-        this.$menubtn.appendTo($btngroup);
+        ($('<div>').append(this.$menubtn)).appendTo($btngroup);
 
         this.$menubtn.on('click', function(e) {
             e.preventDefault();
@@ -324,6 +337,12 @@ Craft.Translations.AddEntriesToTranslationOrder = {
 
             $form.submit();
         });
+
+        // This prevent the new translation button from remaining enabled when user selects an entry and changes entry group from side bar
+        this.$sidebar.on('click', 'li', function () {
+            $(self.$btn[0]).toggleClass('disabled', true);
+            $(self.$menubtn[0]).toggleClass('disabled', true);
+        });
     }
 };
 
diff --git a/src/assetbundles/src/js/ApplyTranslations.js b/src/assetbundles/src/js/ApplyTranslations.js
deleted file mode 100644
index ce5650f2..00000000
--- a/src/assetbundles/src/js/ApplyTranslations.js
+++ /dev/null
@@ -1,91 +0,0 @@
-(function($) {
-
-if (typeof Craft.Translations === 'undefined') {
-    Craft.Translations = {};
-}
-
-function isDraftEdit() {
-    $url = window.location.href;
-    return $url.includes("&draftId=");
-}
-
-Craft.Translations.ApplyTranslations = {
-    init: function(draftId, file) {
-        // Disable default Craft publishing on Translation drafts
-        window.draftEditor.settings.canUpdateSource = false;
-        $("#publish-changes-btn-container :input[type='button']").disable();
-        $("#publish-changes-btn-container :input[type='button']").attr('disabled', true);
-
-        if (!isDraftEdit()) {
-            $("#publish-draft-btn-container :input[type='button']").disable();
-            $("#publish-draft-btn-container :input[type='button']").attr('disabled', true);
-        }
-
-        $("a[data-action='entry-revisions/publish-draft']").addClass("disabled");
-        $("a[data-action='entry-revisions/publish-draft']").attr("disabled", true);
-        
-        // Create the Apply Translations button
-        // var $applyTranslationsContainer = document.createElement('div');
-        //     $applyTranslationsContainer.id = "apply-translations";
-        //     $applyTranslationsContainer.className = "field";
-        
-        // var $btngroup = $('<div>', {'class': 'apply-translations'}).css('float', 'right');
-
-        // $settings = document.getElementById('settings');
-        // if (!isDraftEdit()) {
-        //     $settings.insertBefore($applyTranslationsContainer, $settings.firstChild);
-        // }
-        // var $headinggroup = $('<div>', {'class': 'heading'}).html('<label id="translations-label" for="translations">Translations</label>');
-        // var $inputgroup = $('<div>', {'class': 'input ltr'});
-        
-        // $headinggroup.appendTo($applyTranslationsContainer);
-        // $inputgroup.appendTo($applyTranslationsContainer);
-        // $btngroup.appendTo($inputgroup);
-
-        // this.$btn = $('<a>', {
-        //     'class': 'btn submit',
-        //     'href': '',
-        //     'text': Craft.t('app', 'Apply Translations')
-        // });
-
-        // $(this.$btn).disable();
-        // $(this.$btn).attr('disabled', true);
-        // $(this.$btn).on("click", function (e) {
-        //     e.preventDefault();
-        // });
-
-        // this.$btn.appendTo($btngroup);
-
-        // // Check to make sure we're in the right target site and the draft is ready to be applied
-        // if (file.targetSite == window.draftEditor.settings.siteId && file.status == 'complete') {
-        //     // reactivate the button
-        //     $(this.$btn).enable();
-        //     $(this.$btn).attr('disabled', false);
-
-        //     $(this.$btn).one("click", function (e) {
-        //         e.preventDefault();
-        //         $(".apply-translations > a").addClass("disabled");
-        //         $(".apply-translations > a").html("");
-        //         $(".apply-translations .submit").width(122);
-        //         $(".apply-translations > a").toggleClass("spinner");
-                
-        //         var fileData = {
-        //             fileId: file.id,
-        //         };
-                
-        //         Craft.postActionRequest('translations/files/apply-translation-draft', fileData, function(response, textStatus) {
-        //             if (textStatus === 'success' && response.success) {
-        //                 console.log(response.data);
-        //                 Craft.cp.displayNotice(Craft.t('app', 'Translations applied.'));
-        //                 window.location.reload();
-        //             } else {
-        //                 Craft.cp.displayNotice(Craft.t('app', 'Couldn’t apply translations.'));
-        //                 window.location.reload();
-        //             }
-        //         });
-        //     });
-        // }
-    },
-};
-
-})(jQuery);
diff --git a/src/assetbundles/src/js/AssetsTranslations.js b/src/assetbundles/src/js/AssetsTranslations.js
index bb94163d..44c37f72 100644
--- a/src/assetbundles/src/js/AssetsTranslations.js
+++ b/src/assetbundles/src/js/AssetsTranslations.js
@@ -29,7 +29,7 @@ Craft.Translations.AssetsTranslations = {
     },
 
     isEditAssetScreen: function() {
-        return $('form#main-form input[type=hidden][name=action][value="assets/save-asset"]').length > 0;
+        return $('form#main-form input[type=hidden][name=action][value="elements/save"]').length > 0;
     },
 
     getEditAssetId: function() {
@@ -87,7 +87,6 @@ Craft.Translations.AssetsTranslations = {
     addTranslationOrderButton: function(orders, assetId) {
         var self = this;
         assetId = this.getEditAssetId();
-        //var sourceSite = $('form#main-form input[type=hidden][name=siteId]').val();
 
         var $btncontainer = document.createElement('div');
         $btncontainer.id = "translations-field";
@@ -96,7 +95,7 @@ Craft.Translations.AssetsTranslations = {
         var $btngroup = $('<div>', {'class': 'btngroup translations-dropdown'});
 
         if (this.isEditAssetScreen()) {
-            $settings = document.getElementById('settings');
+            $settings = document.getElementById('new-filename-field').closest('div.meta');
             $settings.insertBefore($btncontainer, $settings.firstChild);
             var $headinggroup = $('<div>', {'class': 'heading'}).html('<label id="translations-label" for="translations">Translations</label>');
             var $inputgroup = $('<div>', {'class': 'input ltr'});
@@ -105,7 +104,7 @@ Craft.Translations.AssetsTranslations = {
             $inputgroup.appendTo($btncontainer);
             $btngroup.appendTo($inputgroup);
         } else {
-            $btngroup.insertBefore('#header #action-button');
+            $btngroup.insertBefore('header#header > div:last');
         }
 
 
diff --git a/src/assetbundles/src/js/CategoryTranslations.js b/src/assetbundles/src/js/CategoryTranslations.js
index 17c7bd04..9ebf3993 100644
--- a/src/assetbundles/src/js/CategoryTranslations.js
+++ b/src/assetbundles/src/js/CategoryTranslations.js
@@ -20,11 +20,16 @@ Craft.Translations.CategoryTranslations = {
     },
 
     isEditCategoryScreen: function() {
-        return $('form#main-form input[type=hidden][name=action][value="categories/save-category"]').length > 0;
+        return $('form#main-form input[type=hidden][name=action][value="elements/save"]').length > 0 ||
+        $('form#main-form input[type=hidden][name=action][value="elements/save-draft"]').length > 0;
     },
 
     getEditCategoryId: function() {
-        return $('form#main-form input[type=hidden][name=sourceId]').val();
+        return $('form#main-form input[type=hidden][name=elementId]').val();
+    },
+
+    isCreatingFresh: function() {
+        return $('form#main-form input[type=hidden][name=fresh]').val();
     },
 
     updateSelectedCategories: function() {
@@ -78,25 +83,24 @@ Craft.Translations.CategoryTranslations = {
     initAddToTranslationOrderButton: function(orders, categoryId) {
         var self = this;
 
-        //var sourceSite = $('form#main-form input[type=hidden][name=siteId]').val();
-
         var $btncontainer = document.createElement('div');
-        $btncontainer.id = "translations-field";
-        $btncontainer.className = "field";
+            $btncontainer.id = "translations-field";
+            $btncontainer.className = "field";
 
         var $btngroup = $('<div>', {'class': 'btngroup translations-dropdown'});
 
         if (this.isEditCategoryScreen()) {
-            $settings = document.getElementById('settings');
-            $settings.insertBefore($btncontainer, $settings.firstChild);
+            $settings = $('#slug-field').closest('div.meta')
+
+            $settings.prepend($btncontainer);
             var $headinggroup = $('<div>', {'class': 'heading'}).html('<label id="translations-label" for="translations">Translations</label>');
             var $inputgroup = $('<div>', {'class': 'input ltr'});
 
             $headinggroup.appendTo($btncontainer);
             $inputgroup.appendTo($btncontainer);
             $btngroup.appendTo($inputgroup);
-        } else {
-            $btngroup.insertBefore('#header #action-button');
+        } else if (!this.isCreatingFresh()) {
+            $btngroup.insertBefore('#header #action-buttons');
         }
 
 
diff --git a/src/assetbundles/src/js/CustomExporters.js b/src/assetbundles/src/js/CustomExporters.js
index d92526e0..2376896d 100644
--- a/src/assetbundles/src/js/CustomExporters.js
+++ b/src/assetbundles/src/js/CustomExporters.js
@@ -11,6 +11,7 @@
         $toolbar: null,
         $elementType: null,
         $action: null,
+        $sidebar: null,
 
         init: function(buttonId) {
             this.$exportBtn = $('#' + buttonId);
@@ -19,10 +20,38 @@
             this.$search = this.$toolbar.find('.search:first input:first');
             this.$elementType = "acclaro\\translations\\elements\\Order";
             this.action = "translations/export/export-files";
+            this.$sidebar = $('#sidebar');
 
             this.addListener(this.$exportBtn, 'click', '_showExportHud');
         },
 
+        hasSelections: function() {
+            return  $('#content tbody tr.sel').length > 0;
+        },
+
+        getOrders: function($selected = false) {
+            if ($selected) {
+                return $('#content tbody tr.sel');
+            } else {
+                return $('#content tbody tr');
+            }
+        },
+
+        getOrderIds: function($selected = false) {
+            var $ids = '';
+            $orders = this.getOrders($selected);
+
+            $orders.each(function() {
+                $ids += String($(this).data('id')) + ',';
+            });
+
+            return $ids.replace(/,\s*$/, "");
+        },
+
+        isTrashed: function () {
+            return this.$toolbar.find('.statusmenubtn').text() === 'Trashed' || this.$toolbar.find('form#craft-elements-actions-Restore-actiontrigger').length > 0;
+        },
+
         getViewParams: function() {
 
             var criteria = {
@@ -30,12 +59,29 @@
                 search: this.$search.val(),
             };
 
+            if (this.$sidebar.find('.sel').data('key') != 'all') {
+                $status = this.$sidebar.find('.sel').data('key');
+                criteria['status'] = $status.replace(/-/g, ' ');
+            }
+
+            if (this.isTrashed()) {
+                criteria['trashed'] = true;
+            }
+
             var params = {
                 criteria: criteria,
                 elementType: this.$elementType,
                 action: this.action,
             };
 
+            if (this.hasSelections()) {
+                params['orderIds'] = this.getOrderIds(true);
+            }
+
+            if (Craft.csrfTokenValue) {
+                params[Craft.csrfTokenName] = Craft.csrfTokenValue;
+            }
+
             return params;
         },
 
@@ -50,7 +96,7 @@
                 {"label": "Raw data (fastest)", "value": "Raw"},
                 {"label": "Expanded", "value": "Expanded"},
             ];
-            
+
             var $typeField = Craft.ui.createSelectField({
                 label: Craft.t('app', 'Export Type'),
                 options: typeOptions,
@@ -73,11 +119,12 @@
                 min: 1
             }).appendTo($form);
 
-            $('<button/>', {
+            $exportButton = $('<button/>', {
                 type: 'submit',
                 'class': 'btn submit fullwidth',
                 text: Craft.t('app', 'Export')
-            }).appendTo($form)
+            });
+            $exportButton.appendTo($form);
 
             var $spinner = $('<div/>', {
                 'class': 'spinner hidden'
@@ -85,6 +132,10 @@
 
             var hud = new Garnish.HUD(this.$exportBtn, $form);
 
+            this.addListener($exportButton, 'click', () => {
+                hud.hide();
+            });
+
             hud.on('hide', $.proxy(function() {
                 this.$exportBtn.removeClass('active');
             }, this));
@@ -97,7 +148,7 @@
                 if (submitting) {
                     return;
                 }
-    
+
                 submitting = true;
                 $spinner.removeClass('hidden');
                 var params = this.getViewParams();
@@ -105,20 +156,15 @@
                 params.type = $typeField.find('select').val();
                 params.format = $formatField.find('select').val();
 
-                if (Craft.csrfTokenValue) {
-                    params[Craft.csrfTokenName] = Craft.csrfTokenValue;
-                }
-
                 Craft.downloadFromUrl('POST', Craft.getActionUrl(params.action), params)
-                .then(function() {
-                    submitting = false;
-                    $spinner.addClass('hidden');
-                })
-                .catch(function() {
-                    submitting = false;
+                .then(() => {})
+                .catch(() => {
                     Craft.cp.displayError(
                         Craft.t('app', 'There was a problem downloading your files.')
-                    );
+                        );
+                    })
+                .finally(() => {
+                    submitting = false;
                     $spinner.addClass('hidden');
                 });
             });
diff --git a/src/assetbundles/src/js/Dashboard.js b/src/assetbundles/src/js/Dashboard.js
index 43eb97cd..0b335c97 100644
--- a/src/assetbundles/src/js/Dashboard.js
+++ b/src/assetbundles/src/js/Dashboard.js
@@ -108,19 +108,18 @@
                 $container.removeClass('scaleout');
 
                 if (!settingsHtml) {
-                    var data = {
+                    var params = {
                         type: type
                     };
 
-                    Craft.postActionRequest('translations/widget/create-widget', data, function(response, textStatus) {
-                        if (textStatus === 'success' && response.success) {
+                    Craft.sendActionRequest('POST', 'translations/widget/create-widget', {data: params})
+                        .then((response) => {
                             $container.removeClass('loading');
                             widget.update(response);
-                        }
-                        else {
+                        })
+                        .catch(() => {
                             widget.destroy();
-                        }
-                    });
+                        })
                 }
             },
 
@@ -348,41 +347,41 @@
                 e.preventDefault();
                 this.$settingsSpinner.removeClass('hidden');
 
-                var action = this.$container.hasClass('new') ? 'translations/widget/create-widget' : 'translations/widget/save-widget-settings',
-                    data = this.$settingsForm.serialize();
+                var action = this.$container.hasClass('new') ? 'translations/widget/create-widget' : 'translations/widget/save-widget-settings';
+                data = this.$settingsForm.serialize();
 
-                Craft.postActionRequest(action, data, $.proxy(function(response, textStatus) {
-                    this.$settingsSpinner.addClass('hidden');
+                Craft.sendActionRequest('POST', action, {data})
+                    .then((response) => {
+                        this.$settingsSpinner.addClass('hidden');
 
-                    if (textStatus === 'success') {
                         if (this.$settingsErrorList) {
                             this.$settingsErrorList.remove();
                             this.$settingsErrorList = null;
                         }
 
-                        if (response.success) {
-                            Craft.cp.displayNotice(Craft.t('app', 'Widget saved.'));
+                        Craft.cp.displayNotice(Craft.t('app', 'Widget saved.'));
 
-                            // Make sure the widget is still allowed to be shown, just in case
-                            if (!response.info) {
-                                this.destroy();
-                            }
-                            else {
-                                this.update(response);
-                                this.hideSettings();
-                            }
-                            window.location.reload();
+                        // Make sure the widget is still allowed to be shown, just in case
+                        if (!response.data.info) {
+                            this.destroy();
                         }
                         else {
-                            Craft.cp.displayError(Craft.t('app', 'Couldn’t save widget.'));
+                            this.update(response.data);
+                            this.hideSettings();
+                        }
+                        window.location.reload();
+                    }).catch(({response}) => {
+                        if (this.$settingsErrorList) {
+                            this.$settingsErrorList.remove();
+                            this.$settingsErrorList = null;
+                        }
+                        Craft.cp.displayError(Craft.t('app', 'Couldn’t save widget.'));
 
-                            if (response.errors) {
-                                this.$settingsErrorList = Craft.ui.createErrorList(response.errors)
-                                    .insertAfter(this.$settingsContainer);
-                            }
+                        if (response.data.errors) {
+                            this.$settingsErrorList = Craft.ui.createErrorList(response.data.errors)
+                                .insertAfter(this.$settingsContainer);
                         }
-                    }
-                }, this));
+                    });
             },
 
             update: function(response) {
@@ -425,7 +424,7 @@
 
                 Craft.initUiElements(this.$bodyContainer);
                 Craft.appendHeadHtml(response.headHtml);
-                Craft.appendFootHtml(response.footHtml);
+                Craft.appendBodyHtml(response.footHtml);
 
                 this.setSettingsHtml(response.info.settingsHtml, function() {
                     eval(response.info.settingsJs);
@@ -606,20 +605,19 @@
                 }
 
                 // Save the change
-                var data = {
+                var params = {
                     id: widgetIds,
                     colspan: newColspan
                 };
 
-                Craft.postActionRequest('translations/widget/change-widget-colspan', data, function(response, textStatus) {
-                    if (textStatus === 'success' && response.success) {
+                Craft.sendActionRequest('POST', 'translations/widget/change-widget-colspan', {data: params})
+                    .then((response) => {
                         Craft.cp.displayNotice(Craft.t('app', 'Widget saved.'));
                         location.reload();
-                    }
-                    else {
+                    })
+                    .catch(() => {
                         Craft.cp.displayError(Craft.t('app', 'Couldn’t save widget.'));
-                    }
-                });
+                    })
             }
         });
 })(jQuery);
\ No newline at end of file
diff --git a/src/assetbundles/src/js/ExportFiles.js b/src/assetbundles/src/js/ExportFiles.js
index 4e21e0fd..88d96cd0 100644
--- a/src/assetbundles/src/js/ExportFiles.js
+++ b/src/assetbundles/src/js/ExportFiles.js
@@ -47,37 +47,22 @@
                         complete: $.proxy(function() {
                             var postData = Garnish.getPostData(this.$form),
                                 params = Craft.expandPostArray(postData);
+                                $data = {'params' : params};
 
-                            var data = {
-                                params: params
-                            };
+                            Craft.sendActionRequest('POST', params.action, {data: $data})
+                                .then((response) => {
+                                    this.updateProgressBar();
 
-                            Craft.postActionRequest(params.action, data, $.proxy(function(response, textStatus) {
-                                    if(textStatus === 'success')
-                                    {
-                                        if (response && response.error) {
-                                            alert(response.error);
-                                        }
-
-                                        this.updateProgressBar();
-
-                                        if (response && response.translatedFiles) {
-                                            var $iframe = $('<iframe/>', {'src': Craft.getActionUrl('translations/files/export-file', {'filename': response.translatedFiles})}).hide();
-                                            this.$form.append($iframe);
-                                        }
-
-                                        setTimeout($.proxy(this, 'onComplete'), 300);
+                                    if (response.data.translatedFiles) {
+                                        var $iframe = $('<iframe/>', {'src': Craft.getActionUrl('translations/files/export-file', {'filename': response.data.translatedFiles})}).hide();
+                                        this.$form.append($iframe);
                                     }
-                                    else
-                                    {
-                                        Craft.cp.displayError(Craft.t('app', 'There was a problem exporting your file.'));
 
-                                        this.onComplete(false);
-                                    }
+                                    setTimeout($.proxy(this, 'onComplete'), 300);
+                                }).catch(({response}) => {
+                                    Craft.cp.displayError(Craft.t('app', response.data.message));
 
-                                }, this),
-                                {
-                                    complete: $.noop
+                                    this.onComplete(false);
                                 });
 
                         }, this)
diff --git a/src/assetbundles/src/js/LanguageCoverage.js b/src/assetbundles/src/js/LanguageCoverage.js
index 8fd5b9e7..d7f95d9c 100644
--- a/src/assetbundles/src/js/LanguageCoverage.js
+++ b/src/assetbundles/src/js/LanguageCoverage.js
@@ -27,12 +27,12 @@
                     autoShow: false,
                 });
 
-                var data = {
+                var $data = {
                     limit: params
                 };
 
-                Craft.postActionRequest('translations/widget/get-language-coverage', data, $.proxy(function(response, textStatus) {
-                    if (textStatus === 'success') {
+                Craft.sendActionRequest('POST', 'translations/widget/get-language-coverage', {data: $data})
+                    .then((response) => {
                         this.$widget.removeClass('loading');
                         this.$widget.find('.elements').removeClass('hidden');
 
@@ -73,11 +73,17 @@
 
                             this.$body.html(widgetHtml);
                         }
-
+    
                         window.translationsdashboard.widgets[widgetId].updateContainerHeight();
                         window.translationsdashboard.grid.refreshCols(true, true);
-                    }
-                }, this));
+                    })
+                    .catch(({response}) => {
+                        var widgetHtml = `
+                        <td style="text-align:center;">Error fetching coverage information.</td>
+                        `;
+                        
+                        this.$body.html(widgetHtml);
+                    })
             },
         });
 })(jQuery);
\ No newline at end of file
diff --git a/src/assetbundles/src/js/OrderDetails.js b/src/assetbundles/src/js/OrderDetails.js
index b200417a..fd452e12 100644
--- a/src/assetbundles/src/js/OrderDetails.js
+++ b/src/assetbundles/src/js/OrderDetails.js
@@ -233,10 +233,12 @@
 
     function sendingOrderStatus($status, $btnStatus = false) {
         if ($status) {
+            $('.translations-loader').parent('a').addClass('loading');
             $('.translations-loader').removeClass('hidden');
             $('.translations-dropdown .btn').addClass('disabled').css('pointer-events', 'none');
             $('.translations-dropdown .btn').prop('disabled', true);
         } else {
+            $('.translations-loader').parent('a').removeClass('loading');
             $('.translations-loader').addClass('hidden');
             if (! $btnStatus) {
                 $('.translations-dropdown .btn').removeClass('disabled').css('pointer-events', '');
@@ -722,7 +724,7 @@
                 disabled: "disabled"
             });
 
-            this.$btn.html("<span class='spinner translations-loader hidden'></span>Create Order");
+            this.$btn.html("<span class='spinner spinner-absolute translations-loader'></span><div class=label>Create order</div>");
 
             this.$menubtn = $('<div>', {
                 'class': 'btn submit menubtn disabled',
@@ -779,7 +781,7 @@
                 disabled: "disabled"
             });
 
-            this.$btn.html("<span class='spinner translations-loader hidden'></span>Update order");
+            this.$btn.html("<span class='spinner spinner-absolute translations-loader'></span><div class=label>Update order</div>");
 
             this.$menubtn = $('<div>', {
                 'class': 'btn submit menubtn disabled',
@@ -865,25 +867,19 @@
                     window.history.pushState("", "", url);
                     $form.submit();
                 }else if ($(that).text() == "Update order") {
-                    Craft.postActionRequest('translations/order/update-order', $form.serialize(), function(response, textStatus) {
-                        if (response == null) {
-                            Craft.cp.displayError(Craft.t('app', "Unable to update order."));
+                    var postData = Garnish.getPostData($form),
+                    params = Craft.expandPostArray(postData);
+                    Craft.sendActionRequest('POST', 'translations/order/update-order', {data: params})
+                        .then((response) => {
+                            Craft.cp.displayNotice(Craft.t('app', response.data.message));
+                            setTimeout(function() {
+                                window.location.href = removeParams(location.href);
+                            }, 200);
+                        })
+                        .catch(({response}) => {
+                            Craft.cp.displayError(Craft.t('app', response.data.message));
                             sendingOrderStatus(false);
-                        } else if (textStatus === 'success' && response.success) {
-                            if (response.message) {
-                                Craft.cp.displayNotice(Craft.t('app', response.message));
-                                setTimeout(function() {
-                                    window.location.href = removeParams(location.href);
-                                }, 200);
-                            } else {
-                                Craft.cp.displayError(Craft.t('app', "Something went wrong"));
-                                sendingOrderStatus(false);
-                            }
-                        } else {
-                            Craft.cp.displayError(Craft.t('app', response.message));
-                            sendingOrderStatus(false);
-                        }
-                    });
+                        });
                 } else {
                     var $hiddenFlow = $('<input>', {
                         'type': 'hidden',
@@ -892,29 +888,17 @@
                     });
                     $hiddenFlow.appendTo($form);
 
-                    Craft.postActionRequest($form.find('input[name=action]').val(), $form.serialize(), function(response, textStatus) {
-                        if (response == null) {
-                            Craft.cp.displayError(Craft.t('app', "Unable to create order."));
-                            sendingOrderStatus(false);
-                        } else if (textStatus === 'success' && response.success) {
-                            if (response.message) {
-                                Craft.cp.displayNotice(Craft.t('app', response.message));
-                                setTimeout(function() {
-                                    location.reload();
-                                }, 200);
-                            } else if (response.url) {
-                                window.location.href = response.url;
-                            } else if (response.job) {
-                                Craft.Translations.trackJobProgressById(true, false, response.job);
-                            } else {
-                                Craft.cp.displayError(Craft.t('app', "No data in response"));
-                                sendingOrderStatus(false);
-                            }
-                        } else {
-                            Craft.cp.displayError(Craft.t('app', response.message));
+                    var postData = Garnish.getPostData($form),
+                    params = Craft.expandPostArray(postData);
+
+                    Craft.sendActionRequest('POST', $form.find('input[name=action]').val(), {data: params})
+                        .then((response) => {
+                            window.location.href = response.data.redirect;
+                        })
+                        .catch(({response}) => {
+                            Craft.cp.displayError(Craft.t('app', response.data.message));
                             sendingOrderStatus(false);
-                        }
-                    });
+                        });
                 }
 
             });
@@ -1030,23 +1014,20 @@
 
                 $hiddenFlow = $('<input>', {
                     'type': 'hidden',
-                    'name': 'update-elements',
+                    'name': 'selected',
                     'value': JSON.stringify(elements)
                 });
                 $hiddenFlow.appendTo($form);
-                Craft.postActionRequest('translations/order/update-order-files-source', $form.serialize(), function(response, textStatus) {
-                    if (textStatus === 'success') {
-                        if (response.success) {
-                            $download ? self._downloadFiles() : location.reload();
-                        } else {
-                            Craft.cp.displayError(Craft.t('app', response.message));
-                            self.onComplete();
-                        }
-                    } else {
-                        Craft.cp.displayError(Craft.t('app', 'Unable to update entries.'));
+                var postData = Garnish.getPostData($form),
+                params = Craft.expandPostArray(postData);
+                Craft.sendActionRequest('POST', 'translations/order/update-order-files-source', {data: params})
+                    .then(() => {
+                        $download ? self._downloadFiles() : location.reload();
+                    })
+                    .catch(({response}) => {
+                        Craft.cp.displayError(Craft.t('app', response.data.message));
                         self.onComplete();
-                    }
-                });
+                    });
             });
         },
         _addDeleteElementAction: function(that) {
@@ -1104,31 +1085,21 @@
             }).appendTo($downloadForm);
 
             postData = Garnish.getPostData($downloadForm);
-            params = Craft.expandPostArray(postData);
-
-            var $data = {
-                params: params
-            };
-
-            Craft.postActionRequest(params.action, $data, function(response, textStatus) {
-                if(textStatus === 'success') {
-                    if (response && response.error) {
-                        Craft.cp.displayError(response.error);
-                        self.onComplete();
-                    }
-
-                    if (response && response.translatedFiles) {
-                        var $iframe = $('<iframe/>', {'src': Craft.getActionUrl('translations/files/export-file', {'filename': response.translatedFiles})}).hide();
-                        $downloadForm.append($iframe);
-						setTimeout(function() {
-							self.onComplete(true);
-						}, 500);
-                    }
-                } else {
-                    Craft.cp.displayError('There was a problem exporting your file.');
+            $data = Craft.expandPostArray(postData);
+            params = {'params': $data};
+
+            Craft.sendActionRequest('POST', $data.action, {data: params})
+                .then((response) => {
+                    var $iframe = $('<iframe/>', {'src': Craft.getActionUrl('translations/files/export-file', {'filename': response.data.translatedFiles})}).hide();
+                    $downloadForm.append($iframe);
+                    setTimeout(function() {
+                        self.onComplete(true);
+                    }, 500);
+                })
+                .catch(({response}) => {
+                    Craft.cp.displayError(response.data.message);
                     self.onComplete();
-                }
-            });
+                });
         },
         onComplete: function($reload = false) {
             $('#toolbar').removeClass('disabled noClick');
diff --git a/src/assetbundles/src/js/OrderEntries.js b/src/assetbundles/src/js/OrderEntries.js
index 0e0301fd..8b182f66 100644
--- a/src/assetbundles/src/js/OrderEntries.js
+++ b/src/assetbundles/src/js/OrderEntries.js
@@ -8,6 +8,7 @@
 	var hasOrderId = $("input[type=hidden][name=id]").val() != '';
 	var isInProgress = $("#order-attr").data("status") === "in progress";
 	var hasCompleteFiles = $("#order-attr").data("has-completed-file");
+	var isTmAligned = $("#order-attr").data("is-tm-aligned");
 
 	/**
 	 * Order entries class
@@ -301,23 +302,25 @@
 				fileId: $fileId
 			};
 
-			Craft.postActionRequest('translations/files/get-file-diff', fileData, function(response, textStatus) {
-				if (textStatus === 'success' && response.success) {
-					data = response.data;
+			Craft.sendActionRequest('POST', 'translations/files/get-file-diff', {data: fileData})
+				.then((response) => {
+					data = response.data.data;
 
 					diffHtml = self.createDiffHtmlView(data);
 					diffHtml.attr("id", "data-"+$fileId)
 					$("#data-"+$fileId).replaceWith(diffHtml);
 					diffHtml.show();
-				} else {
+				})
+				.catch(() => {
 					Craft.cp.displayNotice(Craft.t('app', response.error));
-				}
-				// Copy text to clipboard
-				var $copyBtn = $("#data-"+$fileId).find('.diff-copy');
-				$($copyBtn).on('click', function(event) {
-					self.copyTextToClipboard(event);
+				})
+				.finally(() => {
+					// Copy text to clipboard
+					var $copyBtn = $("#data-"+$fileId).find('.diff-copy');
+					$($copyBtn).on('click', function(event) {
+						self.copyTextToClipboard(event);
+					});
 				});
-			});
 		},
 		createDiffHtmlView: function(data) {
 			var diffData = data.diff;
@@ -473,6 +476,7 @@
 
             $downloadTmAction = $('<a>', {
                 'href': '#',
+                'class': isTmAligned ? 'link-disabled' : '',
                 'text': $label,
             });
             $downloadTmLi.append($downloadTmAction);
@@ -515,16 +519,18 @@
 						'files': JSON.stringify(files)
 					};
 
-					Craft.postActionRequest('translations/export/export-preview-links', $data, function (response, textStatus) {
-						if (response.success && response.previewFile) {
-							var $iframe = $('<iframe/>', { 'src': Craft.getActionUrl('translations/files/export-file', { 'filename': response.previewFile }) }).hide();
-							$('#regenerate-preview-urls').append($iframe);
-							self.toggleLoader();
-						} else {
+					Craft.sendActionRequest('POST', 'translations/export/export-preview-links', {data: $data})
+						.then((response) => {
+							if (response.data.previewFile) {
+								var $iframe = $('<iframe/>', { 'src': Craft.getActionUrl('translations/files/export-file', { 'filename': response.data.previewFile }) }).hide();
+								$('#regenerate-preview-urls').append($iframe);
+								self.toggleLoader();
+							}
+						})
+						.catch(() => {
 							Craft.cp.displayError(Craft.t('app', 'Unable to download your file.'));
 							self.toggleLoader();
-						}
-					});
+						});
 				}
 			});
 		},
@@ -551,27 +557,24 @@
                     sync: 'translations/files/sync-tm-files'
                 }
 
-                Craft.postActionRequest(actions[action], $data, function(response, textStatus) {
-                    if (textStatus === 'success') {
-                        if (response.success && !isDefaultTranslator) {
-                            Craft.cp.displayNotice('Translation memory files sent successfully.');
+                Craft.sendActionRequest('POST', actions[action], {data: $data})
+					.then((response) => {
+						if (!isDefaultTranslator) {
+							Craft.cp.displayNotice('Translation memory files sent successfully.');
 							location.reload();
-                        } else if (response.success && response.tmFiles) {
-                            let $downloadForm = $('#regenerate-preview-urls');
-                            let $iframe = $('<iframe/>', {'src': Craft.getActionUrl('translations/files/export-file', {'filename': response.tmFiles})}).hide();
-                            $downloadForm.append($iframe);
+						} else if (response.data.tmFiles) {
+							let $downloadForm = $('#regenerate-preview-urls');
+							let $iframe = $('<iframe/>', {'src': Craft.getActionUrl('translations/files/export-file', {'filename': response.data.tmFiles})}).hide();
+							$downloadForm.append($iframe);
 							setTimeout(function() {
 								location.reload();
 							}, 100);
-                        } else {
-                            Craft.cp.displayError(Craft.t('app', response.message));
-							self.toggleLoader();
-                        }
-                    } else {
-                        Craft.cp.displayError(Craft.t('app', 'Unable to '+ action +' files.'));
+						}
+					})
+					.catch(() => {
+						Craft.cp.displayError(Craft.t('app', 'Unable to '+ action +' files.'));
 						self.toggleLoader();
-                    }
-                });
+					});
 
             });
 		},
diff --git a/src/assetbundles/src/js/RecentEntries.js b/src/assetbundles/src/js/RecentEntries.js
index 5980aecf..8f6f6135 100644
--- a/src/assetbundles/src/js/RecentEntries.js
+++ b/src/assetbundles/src/js/RecentEntries.js
@@ -33,13 +33,13 @@
                     autoShow: false,
                 });
 
-                var data = {
+                var $data = {
                     limit: params.limit,
                     days: params.days
                 };
 
-                Craft.postActionRequest('translations/widget/get-recent-entries', data, $.proxy(function(response, textStatus) {
-                    if (textStatus === 'success') {
+                Craft.sendActionRequest('POST', 'translations/widget/get-recent-entries', {data: $data})
+                    .then((response) => {
                         this.$widget.removeClass('loading');
                         this.$widget.find('.elements').removeClass('hidden');
 
@@ -82,42 +82,42 @@
 
                             this.$widget.find('#recent-entries-widget').html(widgetHtml);
                         }
-                    }
 
-                    window.translationsdashboard.widgets[widgetId].updateContainerHeight();
-                    window.translationsdashboard.grid.refreshCols(true, true);
+                        window.translationsdashboard.widgets[widgetId].updateContainerHeight();
+                        window.translationsdashboard.grid.refreshCols(true, true);
 
-                    $('.new-entry-check .checkbox').on('click', function(e) {
-                        $(e.target).closest('tr[id^=item-entry-]').toggleClass('sel');
-                        Craft.Translations.RecentEntries.prototype.updateSelected();
-                    });
+                        $('.new-entry-check .checkbox').on('click', function(e) {
+                            $(e.target).closest('tr[id^=item-entry-]').toggleClass('sel');
+                            Craft.Translations.RecentEntries.prototype.updateSelected();
+                        });
 
-                    $('.view-diff-entry').on('click', function(e) {
-                        e.preventDefault();
+                        $('.view-diff-entry').on('click', function(e) {
+                            e.preventDefault();
 
-                        var diffHtml = content[$(e.target).attr('data-id')].diff;
+                            var diffHtml = content[$(e.target).attr('data-id')].diff;
 
-                        var classNames = [
-                            'entryId',
-                            'entryName',
-                            'siteLabel',
-                            'fileDate',
-                            'entryDate',
-                            'wordDifference'
-                        ];
+                            var classNames = [
+                                'entryId',
+                                'entryName',
+                                'siteLabel',
+                                'fileDate',
+                                'entryDate',
+                                'wordDifference'
+                            ];
 
-                        // Show the modal
-                        $modal_entry.show();
+                            // Show the modal
+                            $modal_entry.show();
 
-                        // Set modification details
-                        for (let index = 0; index < classNames.length; index++) {
-                            $('.' + classNames[index]).html(content[$(e.target).attr('data-id')][classNames[index]]);
-                        }
+                            // Set modification details
+                            for (let index = 0; index < classNames.length; index++) {
+                                $('.' + classNames[index]).html(content[$(e.target).attr('data-id')][classNames[index]]);
+                            }
 
-                        // Add the diff html
-                        document.getElementById("modal-body-entry").innerHTML = diffHtml;
+                            // Add the diff html
+                            document.getElementById("modal-body-entry").innerHTML = diffHtml;
+                        });
 
-                        $('#modal-body-entry').on('click', 'div.diff-copy', function(event) {
+                        $('#modal-body-entry').on('click', 'div.diff-copy', function (event) {
                             Craft.Translations.OrderEntries.copyTextToClipboard(event);
                         });
 
@@ -125,8 +125,7 @@
                             e.preventDefault();
                             $modal_entry.hide();
                         });
-                    });
-                }, this));
+                    })
             },
             updateSelected: function() {
                 var entries = [];
@@ -138,9 +137,9 @@
                 this.entries = unique(entries);
 
                 if (this.entries.length) {
-                    $('#new-entry-orders').removeClass('disabled');
+                    $('#new-entry-orders').removeClass('link-disabled');
                 } else {
-                    $('#new-entry-orders').addClass('disabled');
+                    $('#new-entry-orders').addClass('link-disabled');
                 }
 
                 var elements = '';
@@ -148,8 +147,12 @@
                     elements += '&elements[]=' + this.entries[i];
                 }
 
-                if (!$('#new-entry-orders').hasClass('disabled')) {
-                    $('#new-entry-orders').attr('href', Craft.getUrl('translations/orders/create?sourceSite='+ Craft.siteId + elements));
+                if (elements !== '') {
+                    $url = Craft.getUrl('translations/orders/create?sourceSite=' + Craft.siteId);
+
+                    $('#new-entry-orders').attr('href', $url + elements);
+                } else {
+                    $('#new-entry-orders').attr('href', '#');
                 }
             }
         });
diff --git a/src/assetbundles/src/js/RecentlyModified.js b/src/assetbundles/src/js/RecentlyModified.js
index a29afeeb..ed197816 100644
--- a/src/assetbundles/src/js/RecentlyModified.js
+++ b/src/assetbundles/src/js/RecentlyModified.js
@@ -51,10 +51,10 @@
                     window.translationsdashboard.widgets[widgetId].updateContainerHeight();
                     window.translationsdashboard.grid.refreshCols(true, true);
                 });
-                
+
                 $('#tab-'+recent).on('click', function() {
                     if ($(this).hasClass('sel')) return;
-                    
+
                     $('#tab-'+recent).addClass('sel');
                     $('#tab-'+modified).removeClass('sel');
                     $('div.menu ul.padded li a[data-id="'+recent+'"]').addClass('sel');
@@ -75,12 +75,12 @@
                     }
                 });
 
-                var data = {
+                var $data = {
                     limit: params
                 };
 
-                Craft.postActionRequest('translations/widget/get-recently-modified', data, $.proxy(function(response, textStatus) {
-                    if (textStatus === 'success') {
+                Craft.sendActionRequest('POST', 'translations/widget/get-recently-modified', {data: $data})
+                    .then((response) => {
                         this.$widget.removeClass('loading');
                         this.$widget.find('.elements').removeClass('hidden');
 
@@ -94,21 +94,21 @@
                             for (var i = 0; i < response.data.length; i++) {
                                 var item = response.data[i],
                                     $container = $('#item-'+ (i + 1));
-    
+
                                 content.push(item);
-    
+
                                 $container.attr('data-id', item.entryId);
-    
+
                                 var widgetHtml = `
                                 <td id="check-${i}" class="entry-check checkbox-cell"></td>
                                 <td><a href="${item.entryUrl}">${item.entryName}</a></td>
                                 <td><span class="nowrap">${item.entryDate}</span></td>
                                 <td style="text-align:right;"><a class="view-diff btn icon view" data-id="${i}" href="#">View</a></td>
                                 `;
-    
-                                
+
+
                                 $container.html(widgetHtml);
-                                
+
                                 $('#check-'+ i).append(
                                     Craft.ui.createCheckbox({
                                         name: item.entryName,
@@ -123,54 +123,54 @@
 
                             this.$widget.find('#recently-modified-widget').html(widgetHtml);
                         }
-                    }
-                    
-                    window.translationsdashboard.widgets[widgetId].updateContainerHeight();
-                    window.translationsdashboard.grid.refreshCols(true, true);
 
-                    $('.entry-check .checkbox').on('click', function(e) {
-                        $(e.target).closest('tr[id^=item-]').toggleClass('sel');
-                        Craft.Translations.RecentlyModified.prototype.updateSelected();
-                    });
+                        window.translationsdashboard.widgets[widgetId].updateContainerHeight();
+                        window.translationsdashboard.grid.refreshCols(true, true);
 
-                    $('.view-diff').on('click', function(e) {
-                        e.preventDefault();
+                        $('.entry-check .checkbox').on('click', function(e) {
+                            $(e.target).closest('tr[id^=item-]').toggleClass('sel');
+                            Craft.Translations.RecentlyModified.prototype.updateSelected();
+                        });
 
-                        var diffHtml = content[$(e.target).attr('data-id')].diff;
+                        $('.view-diff').on('click', function(e) {
+                            e.preventDefault();
 
-                        var classNames = [
-                            'entryId',
-                            'entryName',
-                            'siteLabel',
-                            'fileDate',
-                            'entryDate',
-                            'wordDifference'
-                        ];
+                            var diffHtml = content[$(e.target).attr('data-id')].diff;
 
-                        // Show the modal
-                        $modal.show();
+                            var classNames = [
+                                'entryId',
+                                'entryName',
+                                'siteLabel',
+                                'fileDate',
+                                'entryDate',
+                                'wordDifference'
+                            ];
 
-                        // Set the reorder button
-                        $('.reorderUrl').attr('href', Craft.getUrl('translations/orders/create?sourceSite='+ content[$(e.target).attr('data-id')].siteId +'&elements[]='+ content[$(e.target).attr('data-id')].entryId));
+                            // Show the modal
+                            $modal.show();
 
-                        // Set modification details
-                        for (let index = 0; index < classNames.length; index++) {
-                            $('.' + classNames[index]).html(content[$(e.target).attr('data-id')][classNames[index]]);
-                        }
+                            // Set the reorder button
+                            $('.reorderUrl').attr('href', Craft.getUrl('translations/orders/create?sourceSite='+ content[$(e.target).attr('data-id')].siteId +'&elements[]='+ content[$(e.target).attr('data-id')].entryId));
 
-                        // Add the diff html
-                        document.getElementById("modal-body").innerHTML = diffHtml;
+                            // Set modification details
+                            for (let index = 0; index < classNames.length; index++) {
+                                $('.' + classNames[index]).html(content[$(e.target).attr('data-id')][classNames[index]]);
+                            }
 
-                        $('#modal-body').on('click', 'div.diff-copy', function(event) {
-                            Craft.Translations.OrderEntries.copyTextToClipboard(event);
-                        });
-                        
-                        $('#close-diff-modal').on('click', function(e) {
-                            e.preventDefault();
-                            $modal.hide();
+                            // Add the diff html
+                            document.getElementById("modal-body").innerHTML = diffHtml;
+
+                            // Off is used to prevent the js to be added on every parent action.
+                            $('#modal-body').off('click').on('click', 'div.diff-copy', function(event) {
+                                Craft.Translations.OrderEntries.copyTextToClipboard(event);
+                            });
+
+                            $('#close-diff-modal').off('click').on('click', function(e) {
+                                e.preventDefault();
+                                $modal.hide();
+                            });
                         });
-                    });
-                }, this));
+                    })
             },
             updateSelected: function() {
                 var entries = [];
@@ -180,11 +180,11 @@
                 });
 
                 this.entries = unique(entries);
-                
+
                 if (this.entries.length) {
-                    $('#bulk-reorder').removeClass('disabled');
+                    $('#bulk-reorder').removeClass('link-disabled');
                 } else {
-                    $('#bulk-reorder').addClass('disabled');
+                    $('#bulk-reorder').addClass('link-disabled');
                 }
 
                 var elements = '';
@@ -192,8 +192,12 @@
                     elements += '&elements[]=' + this.entries[i];
                 }
 
-                if (!$('#bulk-reorder').hasClass('disabled')) {
-                    $('#bulk-reorder').attr('href', Craft.getUrl('translations/orders/create?sourceSite='+ Craft.siteId + elements));
+                if (elements !== '') {
+                    $url = Craft.getUrl('translations/orders/create?sourceSite=' + Craft.siteId);
+
+                    $('#bulk-reorder').attr('href', $url + elements);
+                } else {
+                    $('#bulk-reorder').attr('href', '#');
                 }
             }
         });
diff --git a/src/assetbundles/src/js/StaticTranslations.js b/src/assetbundles/src/js/StaticTranslations.js
index ddb1a4bb..215d9bbd 100644
--- a/src/assetbundles/src/js/StaticTranslations.js
+++ b/src/assetbundles/src/js/StaticTranslations.js
@@ -8,48 +8,45 @@ Craft.Translations.StaticTranslations = {
 
     saveStaticTranslation: function() {
 
-        var data = $("#static-translation").serializeArray();
-        data.push(
-            {name: 'source', value: Craft.elementIndex.sourceKey},
-            {name: 'siteId', value: Craft.elementIndex.siteId}
-            );
-        Craft.postActionRequest('translations/static-translations/save', data, $.proxy(function(response, textStatus) {
-            if (textStatus === 'success') {
-                if (response.success) {
-                    Craft.cp.displayNotice(Craft.t('app', 'Static Translations saved.'));
-                    Craft.elementIndex.updateElements();
-                }
-            } else {
-                Craft.cp.displayError(Craft.t('app', 'An unknown error occurred.'));
-            }
-
-            $('.save-static-translation').removeClass('disabled');
-            $('.save-static-translation').attr("disabled", false);
-
-        }, this));
+        form = $("#static-translation");
+        postData = Garnish.getPostData(form),
+        $data = Craft.expandPostArray(postData);
+        $data['source'] = Craft.elementIndex.sourceKey;
+        $data['siteId'] = Craft.elementIndex.siteId;
+
+        Craft.sendActionRequest('POST', 'translations/static-translations/save', {data: $data})
+            .then((response) => {
+                Craft.cp.displayNotice(Craft.t('app', response.data.message));
+                Craft.elementIndex.updateElements();
+            })
+            .catch(({response}) => {
+                Craft.cp.displayError(Craft.t('app', response.data.error));
+            })
+            .finally(() => {
+                $('.save-static-translation').removeClass('disabled');
+                $('.save-static-translation').attr("disabled", false);
+            });
 
 
     },
 
     exportStaticTranslation: function() {
 
-        var data = {
+        params = {
             siteId: Craft.elementIndex.siteId,
             sourceKey: Craft.elementIndex.sourceKey,
             search: Craft.elementIndex.searchText
         };
 
-        Craft.postActionRequest('translations/static-translations/export', data, $.proxy(function(response, textStatus) {
-            if (textStatus === 'success') {
-                if (response.success) {
-                    var $iframe = $('<iframe/>', {'src': Craft.getActionUrl('translations/static-translations/export-file', {'filename': response.filePath})}).hide();
-                    $('#static-translation').append($iframe);
-                    Craft.cp.displayNotice(Craft.t('app', 'Static Translations exported.'));
-                }
-            } else {
-                Craft.cp.displayError(Craft.t('app', 'An unknown error occurred.'));
-            }
-        }, this));
+        Craft.sendActionRequest('POST', 'translations/static-translations/export', {data: params})
+            .then((response) => {
+                var $iframe = $('<iframe/>', {'src': Craft.getActionUrl('translations/static-translations/export-file', {'filename': response.data.filePath})}).hide();
+                $('#static-translation').append($iframe);
+                Craft.cp.displayNotice(Craft.t('app', 'Static Translations exported.'));
+            })
+            .catch(({response}) => {
+                Craft.cp.displayError(Craft.t('app', response.data.error));
+            });
 
     },
 
@@ -65,7 +62,6 @@ Craft.Translations.StaticTranslations = {
             $('.save-static-translation').attr("disabled", true);
 
             e.preventDefault();
-            console.log(Craft.elementIndex);
             self.saveStaticTranslation();
         });
 
diff --git a/src/assetbundles/src/js/Translations.js b/src/assetbundles/src/js/Translations.js
index 69792a25..b510782d 100644
--- a/src/assetbundles/src/js/Translations.js
+++ b/src/assetbundles/src/js/Translations.js
@@ -32,57 +32,60 @@
          *
          * @param {id, notice, url} params
          */
-        _trackJobProgressInternal: function(params) {
-            Craft.queueActionRequest('queue/get-job-info?dontExtendSession=1', $.proxy(function(response, textStatus) {
-                if (textStatus === 'success') {
-                    this.trackJobProgressTimeout = null;
+        _trackJobProgressInternal: function (params) {
+            Craft.queue.push(
+                () => new Promise((resolve, reject) => {
+                    Craft.sendActionRequest('POST', 'queue/get-job-info?dontExtendSession=1')
+                        .then(() => {
+                            this.trackJobProgressTimeout = null;
 
-                    if (Craft.cp.jobInfo.length) {
-                        let inQueue = false;
-                        // Check to see if it matches our jobId
-                        for (i = 0; i < Craft.cp.jobInfo.length; i++) {
-                            var matches = false;
-                            if (params.id == Craft.cp.jobInfo[i].id) {
-                                matches = true;
-                                inQueue = true;
-                            }
+                            if (Craft.cp.jobInfo.length) {
+                                let inQueue = false;
+                                // Check to see if it matches our jobId
+                                for (i = 0; i < Craft.cp.jobInfo.length; i++) {
+                                    var matches = false;
+                                    if (params.id == Craft.cp.jobInfo[i].id) {
+                                        matches = true;
+                                        inQueue = true;
+                                    }
 
-                            if ((i + 1) == Craft.cp.jobInfo.length && !inQueue) {
-                                // Job is not in queue
-                                if (this.job) {
-                                    Craft.cp.displayNotice(Craft.t('app', `${params.notice}`));
+                                    if ((i + 1) == Craft.cp.jobInfo.length && !inQueue) {
+                                        // Job is not in queue
+                                        if (this.job) {
+                                            Craft.cp.displayNotice(Craft.t('app', `${params.notice}`));
 
-                                    if (params.url && window.location.pathname.includes('translations/orders')) {
-                                        window.location.href=Craft.getUrl(params.url);
+                                            if (params.url && window.location.pathname.includes('translations/orders')) {
+                                                window.location.href=Craft.getUrl(params.url);
+                                            }
+                                        }
                                     }
-                                }
-                            }
 
-                            if (matches) {
-                                this.job = Craft.cp.jobInfo[i];
+                                    if (matches) {
+                                        this.job = Craft.cp.jobInfo[i];
 
-                                if (!this.job.error) {
-                                    console.log(`Translation job progress: ${Craft.cp.jobInfo[i].progress}`);
-                                    // Check again after a delay
-                                    this.trackJobProgressById(true, false, params);
-                                } else {
-                                    console.log('Job failed');
-                                    Craft.cp.displayError(Craft.t('app', `${this.job.error}`));
+                                        if (!this.job.error) {
+                                            console.log(`Translation job progress: ${Craft.cp.jobInfo[i].progress}`);
+                                            // Check again after a delay
+                                            this.trackJobProgressById(true, false, params);
+                                        } else {
+                                            console.log('Job failed');
+                                            Craft.cp.displayError(Craft.t('app', `${this.job.error}`));
+                                        }
+                                    }
                                 }
-                            }
-                        }
-                    } else {
-                        // Job is either completed or no jobs running
-                        // if (this.job) {
-                            Craft.cp.displayNotice(Craft.t('app', `${params.notice}`));
+                            } else {
+                                // Job is either completed or no jobs running
+                                Craft.cp.displayNotice(Craft.t('app', `${params.notice}`));
 
-                            if (params.url && window.location.pathname.includes('translations/orders')) {
-                                window.location.href=Craft.getUrl(params.url);
+                                if (params.url && window.location.pathname.includes('translations/orders')) {
+                                    window.location.href=Craft.getUrl(params.url);
+                                }
                             }
-                        // }
-                    }
-                }
-            }, this));
+                            resolve();
+                        })
+                        .catch(reject);
+                })
+            );
         },
     };
 
diff --git a/src/assetbundles/src/js/TranslatorDetail.js b/src/assetbundles/src/js/TranslatorDetail.js
index ce0fdc3d..ccfb1a1f 100644
--- a/src/assetbundles/src/js/TranslatorDetail.js
+++ b/src/assetbundles/src/js/TranslatorDetail.js
@@ -116,19 +116,11 @@ Craft.Translations.TranslatorDetail = {
         return $("input[name=id]").val() !== '';
     },
 
-    getButtonText: function() {
-        $text = "create";
-        if (this.isExistingTranslator()) {
-            $text = "save";
-        }
-        return $text;
-    },
-
     init: function() {
         var self = this;
 
         if (this.isEditTranslatorScreen()) {
-            this._initSaveButtonContainer(this.getButtonText());
+            this._initSaveButtonContainer();
             this.toggleSaveButton();
             // !NOTE: to be used with draft functionality
             // if (this.validateFormFilled()) {
@@ -156,17 +148,17 @@ Craft.Translations.TranslatorDetail = {
             }
         });
     },
-    _initSaveButtonContainer: function(action) {
+    _initSaveButtonContainer: function() {
         var $btngroup = $('<div>', {
             id: "save-button-container",
             class: "btngroup submit"
         });
-        $btngroup.appendTo('#action-button');
+        $btngroup.appendTo('#action-buttons');
 
         $saveText = "Create translator";
         $continueText = "Create and add another";
 
-        if (action == "save") {
+        if (this.isExistingTranslator()) {
             $saveText = "Save translator";
             $continueText = "Save and add another";
         }
diff --git a/src/assetbundles/src/js/TranslatorIndex.js b/src/assetbundles/src/js/TranslatorIndex.js
index f6cd921d..184d6137 100644
--- a/src/assetbundles/src/js/TranslatorIndex.js
+++ b/src/assetbundles/src/js/TranslatorIndex.js
@@ -65,7 +65,7 @@
                 }
             });
 
-            $("#action-button").on('click', function() {
+            $(".settings.icon").on('click', function() {
                 if (self.hasSelections()) {
                     self.toggleEditDeleteButton();
                 }
@@ -84,76 +84,90 @@
                     return;
                 }
 
-                data = {
+                $data = {
                     translatorIds: null
                 };
 
                 $("#content input[type=checkbox]").filter("tbody :checked").each(function() {
-                    if (data.translatorIds) {
-                        data.translatorIds += "," + $(this).data("id");
+                    if ($data.translatorIds) {
+                        $data.translatorIds += "," + $(this).data("id");
                     } else {
-                        data.translatorIds = $(this).data("id");
+                        $data.translatorIds = $(this).data("id");
                     }
                 });
 
-                Craft.postActionRequest('translations/translator/delete', data, $.proxy(function(response, textStatus) {
-                    if (textStatus === 'success') {
+                params = {
+                    data: $data
+                }
+
+                Craft.sendActionRequest('POST', 'translations/translator/delete', params)
+                    .then(() => {
                         location.reload();
-                    } else {
-                        Craft.cp.displayError(Craft.t('app', 'An unknown error occurred.'));
-                    }
-                }, this));
+                    })
+                    .catch(({response}) => {
+                        $message = 'An unknown error occurred.';
+                        if (response.data.message != null) {
+                            $message = response.data.message;
+                        }
+                        Craft.cp.displayError(Craft.t('app', $message));
+                    });
             });
         },
 
         _getTranslatorsData: function(key) {
             $mainDiv = $('<div>', {class: "translations-element-index"});
 
-            Craft.postActionRequest('translations/translator/get-translators', {service: key}, $.proxy(function(response, textStatus) {
-                if (textStatus === 'success' && response.data != "") {
-                    $table = $('<table>', {class: "data"});
-                    $table.appendTo($mainDiv);
-                    $thead = $('<thead>\
-                        <tr>\
-                            <th class="checkbox-cell selectallcontainer orderable">\
-                                <input type="checkbox" title="select-all" id="translator-0"/>\
-                                <label for="translator-0"></label>\
-                            </th>\
-                            <th>Name</th>\
-                            <th>Status</th>\
-                            <th>Service</th>\
-                        </tr>\
-                    </thead>');
-                    $thead.appendTo($table);
-
-                    $tbody = $('<tbody>');
-                    $tbody.appendTo($table);
-
-                    $.each(response.data, function() {
-                        $tr = $('<tr>');
-
-                        $id = "translator-"+this.id;
-                        $service = this.service == "export_import" ? "Export/Import" 
-                            : this.service.substr(0,1).toUpperCase()+this.service.substr(1);
-                        $url = "translators/detail/"+this.id;
-                        $statusClass = this.status == "active" ? "green" : "red";
-                        $status = this.status.substr(0,1).toUpperCase()+this.status.substr(1);
-                        $label = this.label !== "" ? this.label : $service;
-
-                        $td = $("<td class=checkbox-cell><input type=checkbox title=select id="+$id+"\
-                            data-url="+$url+" data-id="+this.id+"> <label for="+$id+"></label></td>"+'\
-                            <td><a href='+$url+'>'+$label+'\
-                            </a></td><td><span class="status '+$statusClass+'"></span>\
-                            '+$status+'</td><td>'+$service+'</td>');
-
-                        $td.appendTo($tr);
-                        $tr.appendTo($tbody);
-                    });
-                } else {
+            params = {
+                data: {service: key}
+            }
+
+            Craft.sendActionRequest('POST', 'translations/translator/get-translators', params)
+                .then((response) => {
+                    if (response.data != "") {
+                        $table = $('<table>', {class: "data"});
+                        $table.appendTo($mainDiv);
+                        $thead = $('<thead>\
+                            <tr>\
+                                <td class="checkbox-cell selectallcontainer orderable">\
+                                    <input type="checkbox" title="select-all" id="translator-0"/>\
+                                    <label for="translator-0"></label>\
+                                </td>\
+                                <th>Name</th>\
+                                <th>Status</th>\
+                                <th>Service</th>\
+                            </tr>\
+                        </thead>');
+                        $thead.appendTo($table);
+
+                        $tbody = $('<tbody>');
+                        $tbody.appendTo($table);
+
+                        $.each(response.data, function() {
+                            $tr = $('<tr>');
+
+                            $id = "translator-"+this.id;
+                            $service = this.service == "export_import" ? "Export/Import"
+                                : this.service.substr(0,1).toUpperCase()+this.service.substr(1);
+                            $url = "translators/detail/"+this.id;
+                            $statusClass = this.status == "active" ? "green" : "red";
+                            $status = this.status.substr(0,1).toUpperCase()+this.status.substr(1);
+                            $label = this.label !== "" ? this.label : $service;
+
+                            $td = $("<td class=checkbox-cell><input type=checkbox title=select id="+$id+"\
+                                data-url="+$url+" data-id="+this.id+"> <label for="+$id+"></label></td>"+'\
+                                <td><a href='+$url+'>'+$label+'\
+                                </a></td><td><span class="status '+$statusClass+'"></span>\
+                                '+$status+'</td><td>'+$service+'</td>');
+
+                            $td.appendTo($tr);
+                            $tr.appendTo($tbody);
+                        });
+                    }
+                })
+                .catch(() => {
                     Craft.cp.displayError(Craft.t('app', 'An unknown error occurred.'));
                     return null;
-                }
-            }, this));
+                });
 
             return $mainDiv;
         }
diff --git a/src/base/PluginTrait.php b/src/base/PluginTrait.php
index 198f51a7..e7e9b70b 100644
--- a/src/base/PluginTrait.php
+++ b/src/base/PluginTrait.php
@@ -5,7 +5,7 @@
 use acclaro\translations\services\TranslationsService;
 
 use Craft;
-use craft\log\FileTarget;
+use craft\log\MonologTarget;
 
 use yii\log\Logger;
 
@@ -34,9 +34,9 @@ private function _setPluginComponents()
 
     private function _setLogging()
     {
-        Craft::getLogger()->dispatcher->targets[] = new FileTarget([
-            'logFile' => Craft::getAlias('@storage/logs/translations.log'),
-            'categories' => ['translations'],
+        Craft::getLogger()->dispatcher->targets[] = new MonologTarget([
+            'name' => 'translations',
+            'allowLineBreaks' => true
         ]);
     }
 
diff --git a/src/controllers/AssetController.php b/src/controllers/AssetController.php
index 50ce0943..ea9fa7a8 100644
--- a/src/controllers/AssetController.php
+++ b/src/controllers/AssetController.php
@@ -5,9 +5,19 @@
 use Craft;
 use acclaro\translations\Translations;
 use acclaro\translations\Constants;
+use acclaro\translations\services\repository\AssetDraftRepository;
 
 class AssetController extends BaseController
 {
+    protected $service;
+
+    public function __construct($id, $module = null)
+    {
+        parent::__construct($id, $module);
+
+        $this->service = new AssetDraftRepository();
+    }
+
     /**
      * Edit an asset draft
      *
@@ -43,12 +53,21 @@ public function actionEditDraft(array $variables = array())
 
         $variables['dimensions'] = $asset->dimensions;
         $variables['assetUrl'] = $asset->url;
-        $variables['canReplaceFile'] = $asset->isEditable;
-        $variables['previewHtml'] = $asset->editorHtml;
+        $variables['author'] = Craft::$app->getUsers()->getUserById($asset->uploaderId);
+        // $variables['canReplaceFile'] = $asset->isEditable;
+        $variables['title'] = $asset->title;
+        $variables['isRevision'] = $asset->getIsRevision();
+        $variables['previewHtml'] = $asset->previewHtml;
         $variables['volume'] = $asset->volume;
         $variables['formattedSize'] = $asset->formattedSize;
         $variables['formattedSizeInBytes'] = $asset->formattedSizeInBytes;
 
+        $variables['saveSourceAction'] = 'translations/asset/save-draft';
+        $variables['deleteSourceAction'] = 'translations/asset/delete-draft';
+        $variables['publishSourceAction'] = 'translations/asset/publish-draft';
+        $variables['canEdit'] = true;
+        $variables['canUpdateSource'] = true;
+
         $this->renderTemplate('translations/assets/_editDraft', $variables);
     }
 
@@ -62,8 +81,8 @@ public function actionSaveDraft()
         $this->requirePostRequest();
 
         $assetId = $this->request->getParam('assetId');
-        $siteId = $this->request->getParam('site');
-        $asset = Craft::$app->assets->getAssetById($assetId, $siteId);
+        $siteId = $this->request->getParam('siteId');
+        $asset = $this->service->getAssetById($assetId, $siteId);
 
         if (!$asset) {
             Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'No Asset exists with the ID “{id}”.', array('id' => $assetId)));
@@ -92,7 +111,7 @@ public function actionSaveDraft()
             $draft->setFieldValues($fields);
         }
 
-        Craft::$app->getElements()->saveElement($draft);
+        $this->service->saveDraft($draft);
 
         if (Translations::$plugin->assetDraftRepository->saveDraft($draft, $fields)) {
             Craft::$app->getSession()->setNotice(Translations::$plugin->translator->translate('app', 'Draft saved.'));
@@ -201,11 +220,23 @@ public function actionDeleteDraft()
 
         $asset = Translations::$plugin->assetDraftRepository->getAssetById($draft->assetId);
         $url = $asset->getCpEditUrl();
-        $elementId = $draft->assetId;
 
         Translations::$plugin->assetDraftRepository->deleteDraft($draft);
 
-        Translations::$plugin->fileRepository->deleteByDraftId($draftId, $elementId);
+        $file = Translations::$plugin->fileRepository->getFileByDraftId($draftId, $asset->id);
+
+        if ($file) {
+            $order = Translations::$plugin->orderRepository->getOrderById($file->orderId);
+
+            $file->status = Constants::FILE_STATUS_CANCELED;
+            $file->draftId = null;
+            $file->dateDelivered = null;
+
+            Translations::$plugin->fileRepository->saveFile($file);
+
+            $order->status = Translations::$plugin->orderRepository->getNewStatus($order);
+            Translations::$plugin->orderRepository->saveOrder($order);
+        }
 
         Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'Draft deleted.'));
 
diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php
index 2cbef8a6..1b19c28c 100644
--- a/src/controllers/BaseController.php
+++ b/src/controllers/BaseController.php
@@ -26,10 +26,10 @@
 class BaseController extends Controller
 {
     /**
-     * @var    bool|array Allows anonymous access to this controller's actions.
+     * @var    array|int|bool Allows anonymous access to this controller's actions.
      * @access protected
      */
-    protected $allowAnonymous = true;
+    protected array|int|bool $allowAnonymous = true;
 
     /**
      * @var int
@@ -262,7 +262,7 @@ public function actionAddElementsToOrder()
                 if (!in_array($elementId, $elementIds)) {
                     $elementIds[] = $elementId;
 
-                    $element = Craft::$app->getElements()->getElementById($elementId, null, $order->sourceSite);
+                    $element = Translations::$plugin->elementRepository->getElementById($elementId, $order->sourceSite);
 
                     if ($element instanceof Entry) {
                         $sites = array();
diff --git a/src/controllers/CategoryController.php b/src/controllers/CategoryController.php
deleted file mode 100644
index a77f4daa..00000000
--- a/src/controllers/CategoryController.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-
-/**
- * Translations for Craft plugin for Craft CMS 3.x
- *
- * Translations for Craft eliminates error prone and costly copy/paste workflows
- * for launching human translated Craft CMS web content.
- *
- * @link      http://www.acclaro.com/
- * @copyright Copyright (c) 2018 Acclaro
- */
-
-namespace acclaro\translations\controllers;
-
-use Craft;
-use craft\web\Controller;
-use acclaro\translations\Constants;
-use acclaro\translations\Translations;
-
-class CategoryController extends Controller
-{
-    /**
-     * Edit Global Set Drafts
-     *
-     * @param array $variables
-     * @return void
-     */
-    public function actionEditDraft(array $variables = array())
-    {
-        $variables = Craft::$app->getRequest()->resolve()[1];
-
-        if (empty($variables['slug'])) {
-            Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'Param “{name}” doesn’t exist.', array('name' => 'categoryGroup')));
-            return;
-        }
-
-        $category = explode('-', $variables['slug']);
-        $categoryId = $category[0];
-        $category = Craft::$app->categories->getCategoryById($categoryId);
-        $categoryGroup = Craft::$app->categories->getGroupById($category->groupId);
-        $variables['category'] = $category;
-        $variables['groupHandle'] = $variables['group'];
-        $variables['group'] = $categoryGroup;
-
-        $variables['categoryId'] = $categoryId;
-
-        $variables['orders'] = array();
-
-        $draft = Translations::$plugin->categoryDraftRepository->getDraftById($variables['draftId']);
-
-        $variables['element'] = $draft;
-
-        $variables['file'] = Translations::$plugin->fileRepository->getFileByDraftId($draft->draftId, $categoryId);
-
-        $variables['continueEditingUrl'] = '';
-        $variables['nextCategoryUrl'] = '';
-        $variables['title'] = $category->title;
-        $variables['siteIds'] = Craft::$app->getSites()->getAllSiteIds();
-        $variables['showPreviewBtn'] = false;
-
-        $this->renderTemplate('translations/categories/_editDraft', $variables);
-    }
-
-    /**
-     * Save Global Set Drafts
-     *
-     * @param array $variables
-     * @return void
-     */
-    public function actionSaveDraft()
-    {
-        $this->requirePostRequest();
-
-        $site = $this->request->getParam('site', Craft::$app->sites->getPrimarySite()->id);
-
-        $categoryId = $this->request->getParam('categoryId');
-
-        $category = Translations::$plugin->categoryRepository->getCategoryById($categoryId, $site);
-
-        if (!$category) {
-            Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'No category exists with the ID “{id}”.', array('id' => $categoryId)));
-            return;
-        }
-
-        $draftId = $this->request->getParam('draftId');
-
-        if ($draftId) {
-            $draft = Translations::$plugin->categoryDraftRepository->getDraftById($draftId);
-
-            if (!$draft) {
-                Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'No draft exists with the ID “{id}”.', array('id' => $draftId)));
-                return;
-            }
-        } else {
-            $draft = Translations::$plugin->categoryDraftRepository->makeNewDraft();
-            $draft->id = $category->id;
-            $draft->site = $site;
-        }
-
-        $fieldsLocation = Craft::$app->getRequest()->getParam('fieldsLocation', 'fields');
-
-        $fields = $this->request->getParam('fields') ?? [];
-
-        if ($fields) {
-            $draft->setFieldValues($fields);
-        }
-
-        if (Translations::$plugin->categoryDraftRepository->saveDraft($draft, $fields)) {
-            Craft::$app->getSession()->setNotice(Translations::$plugin->translator->translate('app', 'Draft saved.'));
-
-            $this->redirect($draft->getCpEditUrl(), 302, true);
-        } else {
-            Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'Couldn’t save draft.'));
-
-            Craft::$app->urlManager->setRouteParams(array(
-                'category' => $draft
-            ));
-        }
-    }
-
-    /**
-     * Publish Global Set Drafts
-     *
-     * @param array $variables
-     * @return void
-     */
-    public function actionPublishDraft()
-    {
-        $this->requirePostRequest();
-
-        $categoryId = Craft::$app->getRequest()->getParam('categoryId');
-        $siteId = Craft::$app->getRequest()->getParam('site');
-        $category = Translations::$plugin->categoryRepository->getCategoryById($categoryId, $siteId);
-
-        if (!$category) {
-            Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'No category exists with the ID “{id}”.', array('id' => $draft->id)));
-            return;
-        }
-
-        $draftId = Craft::$app->getRequest()->getParam('draftId');
-        if ($draftId) {
-            $draft = Translations::$plugin->categoryDraftRepository->getDraftById($draftId);
-
-            if (!$draft) {
-                Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'No draft exists with the ID “{id}”.', array('id' => $draftId)));
-                return;
-            }
-        } else {
-            $draft = Translations::$plugin->categoryDraftRepository->makeNewDraft();
-        }
-
-        $fields = $this->request->getParam('fields') ?? [];
-
-        if ($fields) {
-            $draft->setFieldValues($fields);
-        }
-
-        $draft->id = $category->id;
-        $draft->categoryId = $category->id;
-        // restore the original name
-        $draft->name = $category->title;
-        $draft->title = $this->request->getParam('title') ?? $category->title;
-        $draft->site = $siteId;
-
-        $file = Translations::$plugin->fileRepository->getFileByDraftId($draftId, $category->id);
-
-        $transaction = Craft::$app->getDb()->beginTransaction();
-
-        try {
-            if ($file) {
-                $order = Translations::$plugin->orderRepository->getOrderById($file->orderId);
-
-                $file->status = Constants::FILE_STATUS_PUBLISHED;
-                $file->draftId = 0;
-
-                Translations::$plugin->fileRepository->saveFile($file);
-
-                $order->status = Translations::$plugin->orderRepository->getNewStatus($order);
-                Translations::$plugin->orderRepository->saveOrder($order);
-            }
-
-            if (Translations::$plugin->categoryDraftRepository->publishDraft($draft)) {
-                $this->redirect($category->getCpEditUrl(), 302, true);
-
-                Craft::$app->getSession()->setNotice(Translations::$plugin->translator->translate('app', 'Draft published.'));
-                $transaction->commit();
-
-                return Translations::$plugin->categoryDraftRepository->deleteDraft($draft);
-            } else {
-                Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'Couldn’t publish draft.'));
-                $transaction->rollBack();
-
-                // Send the draft back to the template
-                Craft::$app->urlManager->setRouteParams(array(
-                    'draft' => $draft
-                ));
-            }
-        } catch (\Exception $e) {
-            $transaction->rollBack();
-        }
-    }
-
-    /**
-     * Delete Global Set Drafts
-     *
-     * @param array $variables
-     * @return void
-     */
-    public function actionDeleteDraft()
-    {
-        $this->requirePostRequest();
-
-        $draftId = Craft::$app->getRequest()->getParam('draftId');
-        $draft = Translations::$plugin->categoryDraftRepository->getDraftById($draftId);
-
-        if (!$draft) {
-            Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'No draft exists with the ID “{id}”.', array('id' => $draftId)));
-            return;
-        }
-
-        $category = Translations::$plugin->categoryRepository->getCategoryById($draft->categoryId);
-        $url = $category->getCpEditUrl();
-        $elementId = $draft->categoryId;
-
-        Translations::$plugin->categoryDraftRepository->deleteDraft($draft);
-
-        Translations::$plugin->fileRepository->deleteByDraftId($draftId, $elementId);
-
-        Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'Draft deleted.'));
-
-        return $this->redirect($url, 302, true);
-    }
-}
diff --git a/src/controllers/ExportController.php b/src/controllers/ExportController.php
index 58769317..2a3029cc 100644
--- a/src/controllers/ExportController.php
+++ b/src/controllers/ExportController.php
@@ -23,13 +23,14 @@ public function actionExportFiles()
         $this->requirePostRequest();
         $request = Craft::$app->getRequest();
 
-        // Get the criteria param
-        $criteria = $request->getBodyParam('criteria');
-
         $exporter = new Exporter($request->getRequiredParam('type', 'Raw'));
         $elementType = $request->getRequiredParam('elementType');
         $exporter->setElementType($elementType);
 
+        if ($orderIds = $request->getBodyParam('orderIds')) {
+            $exporter->setOrderIds(explode(',', $orderIds));
+        }
+
         $filename = $exporter->getFilename();
 
         if ($exporter::isFormattable()) {
@@ -109,7 +110,7 @@ public function actionExportPreviewLinks()
 
 		fclose($previewFile);
 
-		return $this->asJson(['success' => true, 'previewFile' => $fileName]);
+		return $this->asSuccess(null, ['previewFile' => $fileName]);
 	}
 
     /**
diff --git a/src/controllers/FilesController.php b/src/controllers/FilesController.php
index 5e3c34b9..457872cc 100644
--- a/src/controllers/FilesController.php
+++ b/src/controllers/FilesController.php
@@ -33,7 +33,7 @@
  */
 class FilesController extends Controller
 {
-    protected $allowAnonymous = ['actionImportFile', 'actionExportFile', 'actionCreateExportZip'];
+    protected array|int|bool $allowAnonymous = ['actionImportFile', 'actionExportFile', 'actionCreateExportZip'];
 
     /**
      * @var Order
@@ -71,9 +71,8 @@ public function actionCreateExportZip()
         // Open zip
         if ($zip->open($zipDest, $zip::CREATE) !== true)
         {
-            $errors[] = 'Unable to create zip file: '.$zipDest;
             Craft::error('['. __METHOD__ .'] Unable to create zip file: '.$zipDest, 'translations');
-            return false;
+            return $this->asFailure('Unable to create zip file: '.$zipDest);
         }
 
         $transaction = Craft::$app->getDb()->beginTransaction();
@@ -87,7 +86,7 @@ public function actionCreateExportZip()
                 // skip failed files
                 if ($file->isCanceled()) continue;
 
-                $element = Craft::$app->elements->getElementById($file->elementId, null, $file->sourceSite);
+                $element = Translations::$plugin->elementRepository->getElementById($file->elementId, $file->sourceSite);
 
                 $targetSite = $file->targetSite;
 
@@ -151,17 +150,13 @@ public function actionCreateExportZip()
         if(count($errors) > 0)
         {
             $transaction->rollBack();
-            return $errors;
+            return $this->asFailure(implode('\n', $errors));
         }
 
-        if (Craft::$app->getElements()->saveElement($order, true, true, false)) {
-            $transaction->commit();
-            return $this->asJson(['translatedFiles' => $zipDest]);
-        } else {
-            $transaction->rollBack();
-            return false;
-        }
+        Craft::$app->getElements()->saveElement($order, true, true, false);
+        $transaction->commit();
 
+        return $this->asSuccess(null, ['translatedFiles' => $zipDest]);
     }
 
     /**
@@ -263,7 +258,7 @@ public function actionImportFile()
                                 if (! Craft::$app->getElements()->saveElement($asset)) {
                                     $errors = $asset->getFirstErrors();
 
-                                    return $this->asErrorJson(Craft::t('app', 'Failed to save the asset:') . ' ' . implode(";\n", $errors));
+                                    return $this->asFailure(Craft::t('app', 'Failed to save the asset:') . ' ' . implode(";\n", $errors));
                                 }
 
                                 $assetIds[] = $asset->id;
@@ -341,7 +336,7 @@ public function actionImportFile()
                         if (! Craft::$app->getElements()->saveElement($asset)) {
                             $errors = $asset->getFirstErrors();
 
-                            return $this->asErrorJson(Craft::t('app', 'Failed to save the asset:') . ' ' . implode(";\n", $errors));
+                            return $this->asFailure(Craft::t('app', 'Failed to save the asset:') . ' ' . implode(";\n", $errors));
                         }
 
                         $totalWordCount = Translations::$plugin->fileRepository->getUploadedFilesWordCount($asset, $file->extension);
@@ -414,7 +409,7 @@ public function actionGetFileDiff()
             $error = "File not found.";
             if ($file && (in_array($file->status, [Constants::FILE_STATUS_REVIEW_READY, Constants::FILE_STATUS_COMPLETE, Constants::FILE_STATUS_PUBLISHED]))) {
                 try {
-                    $element = Craft::$app->getElements()->getElementById($file->elementId, null, $file->sourceSite);
+                    $element = Translations::$plugin->elementRepository->getElementById($file->elementId, $file->sourceSite);
 
                     $data['diff'] = Translations::$plugin->fileRepository->getSourceTargetDifferences($file->source, $file->target);
 
@@ -462,7 +457,7 @@ public function actionCreateTmExportZip() {
 
             // Open zip
             if ($zip->open($zipDest, $zip::CREATE) !== true) {
-                throw new \Exception('Unable to create zip file: '.$zipDest);
+                return $this->asFailure('Unable to create zip file: '.$zipDest);
             }
 
             //Iterate over each file on this order
@@ -475,7 +470,7 @@ public function actionCreateTmExportZip() {
                     $fileContent = $tmFile['fileContent'];
 
                     if (! $fileContent || ! $zip->addFromString($fileName, $fileContent)) {
-                        throw new \Exception('There was an error adding the file '.$fileName.' to the zip: '.$zipName);
+                        return $this->asFailure('There was an error adding the file '.$fileName.' to the zip: '.$zipName);
                     }
 
                     $file->reference = $tmFile['reference'];
@@ -487,10 +482,10 @@ public function actionCreateTmExportZip() {
             $zip->close();
         } catch(\Exception $e) {
             Craft::error('['. __METHOD__ .']' . $e->getMessage(), 'translations');
-            return $this->asJson(['success' => false, 'message' => $e->getMessage()]);
+            return $this->asFailure($e->getMessage());
         }
 
-        return $this->asJson(['success' => true, 'tmFiles' => $zipDest]);
+        return $this->asSuccess(null, ['tmFiles' => $zipDest]);
     }
 
     /**
diff --git a/src/controllers/GlobalSetController.php b/src/controllers/GlobalSetController.php
index 443d53e8..dde413c0 100644
--- a/src/controllers/GlobalSetController.php
+++ b/src/controllers/GlobalSetController.php
@@ -62,7 +62,7 @@ public function actionEditDraft(array $variables = array())
         }
 
         $draft = Translations::$plugin->globalSetDraftRepository->getDraftById($variables['draftId']);
-        
+
         $variables['drafts'] = Translations::$plugin->globalSetDraftRepository->getDraftsByGlobalSetId($globalSet->id, $draft->site);
 
         $variables['draft'] = $draft;
@@ -82,7 +82,7 @@ public function actionSaveDraft()
     {
         $this->requirePostRequest();
 
-        $site = $this->request->getParam('site', Craft::$app->sites->getPrimarySite()->id);
+        $site = $this->request->getBodyParam('site', Craft::$app->sites->getPrimarySite()->id);
 
         $globalSetId = $this->request->getParam('globalSetId');
 
@@ -107,13 +107,13 @@ public function actionSaveDraft()
             $draft->id = $globalSetId;
             $draft->site = $site;
         }
-        
+
         $fields = $this->request->getParam('fields') ?? [];
 
         if ($fields) {
             $draft->setFieldValues($fields);
         }
-        
+
         if (Translations::$plugin->globalSetDraftRepository->saveDraft($draft, $fields)) {
             Craft::$app->getSession()->setNotice(Translations::$plugin->translator->translate('app', 'Draft saved.'));
 
@@ -171,27 +171,27 @@ public function actionPublishDraft()
         try {
             if ($file) {
                 $order = Translations::$plugin->orderRepository->getOrderById($file->orderId);
-    
+
                 $file->status = Constants::FILE_STATUS_PUBLISHED;
                 $file->draftId = 0;
-    
+
                 Translations::$plugin->fileRepository->saveFile($file);
-    
+
                 $order->status = Translations::$plugin->orderRepository->getNewStatus($order);
                 Translations::$plugin->orderRepository->saveOrder($order);
             }
-    
+
             if (Translations::$plugin->globalSetDraftRepository->publishDraft($draft)) {
                 $this->redirect($globalSet->getCpEditUrl(), 302, true);
-                
+
                 Craft::$app->getSession()->setNotice(Translations::$plugin->translator->translate('app', 'Draft published.'));
                 $transaction->commit();
-                
+
                 return Translations::$plugin->globalSetDraftRepository->deleteDraft($draft);
             } else {
                 Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'Couldn’t publish draft.'));
                 $transaction->rollBack();
-    
+
                 // Send the draft back to the template
                 Craft::$app->urlManager->setRouteParams(array(
                     'draft' => $draft
@@ -225,6 +225,21 @@ public function actionDeleteDraft()
 
         Translations::$plugin->globalSetDraftRepository->deleteDraft($draft);
 
+        $file = Translations::$plugin->fileRepository->getFileByDraftId($draftId, $globalSet->id);
+
+        if ($file) {
+            $order = Translations::$plugin->orderRepository->getOrderById($file->orderId);
+
+            $file->status = Constants::FILE_STATUS_CANCELED;
+            $file->draftId = null;
+            $file->dateDelivered = null;
+
+            Translations::$plugin->fileRepository->saveFile($file);
+
+            $order->status = Translations::$plugin->orderRepository->getNewStatus($order);
+            Translations::$plugin->orderRepository->saveOrder($order);
+        }
+
         Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'Draft deleted.'));
 
         return $this->redirect($globalSet->getCpEditUrl(), 302, true);
diff --git a/src/controllers/OrderController.php b/src/controllers/OrderController.php
index 38876515..1f83045c 100644
--- a/src/controllers/OrderController.php
+++ b/src/controllers/OrderController.php
@@ -40,7 +40,7 @@ class OrderController extends Controller
      * @var    bool|array Allows anonymous access to this controller's actions.
      * @access protected
      */
-    protected $allowAnonymous = true;
+    protected array|bool|int $allowAnonymous = self::ALLOW_ANONYMOUS_LIVE | self::ALLOW_ANONYMOUS_OFFLINE;
 
     /**
      * @var int
@@ -195,8 +195,7 @@ public function actionOrderDetail(array $variables = array())
 
         if ($variables['inputElements']) {
             foreach ($variables['inputElements'] as $elementId) {
-                $element = Craft::$app->getElements()
-                    ->getElementById((int) $elementId, null, $order->sourceSite);
+                $element = Translations::$plugin->elementRepository->getElementById((int) $elementId, $order->sourceSite);
 
                 if ($element) {
                     $variables['elements'][] = $element;
@@ -382,11 +381,11 @@ public function actionSaveOrder()
         $sourceSite = Craft::$app->getRequest()->getParam('sourceSite');
 
         if (!$currentUser->can('translations:orders:create')) {
-            return $this->asJson(["success" => false, "message" => "User does not have permission to perform this action."]);
+            return $this->asFailure("User does not have permission to perform this action.");
         }
 
         if ($sourceSite && !Translations::$plugin->siteRepository->isSiteSupported($sourceSite)) {
-            return $this->asJson(["success" => false, "message" => "Source site is not supported."]);
+            return $this->asFailure("Source site is not supported.");
         }
 
         if ($orderId) {
@@ -460,7 +459,7 @@ public function actionSaveOrder()
             if (!$authenticate && $service == Constants::TRANSLATOR_ACCLARO) {
                 $message = Translations::$plugin->translator->translate('app', 'Invalid API key');
                 $transaction->rollBack();
-                return $this->asJson(["success" => false, "message" => $message]);
+                return $this->asFailure($message);
             }
 
             // Calculating total Entries and their WordCount
@@ -490,7 +489,7 @@ public function actionSaveOrder()
                             $element->section->name
                         );
                         $transaction->rollBack();
-                        return $this->asJson(["success" => false, "message" => $message]);
+                        return $this->asFailure($message);
                     }
                 }
             }
@@ -504,7 +503,7 @@ public function actionSaveOrder()
             if (!$success) {
                 Craft::error('[' . __METHOD__ . '] Couldn’t save the order', 'translations');
                 $transaction->rollBack();
-                return $this->asJson(["success" => false, "message" => "Error saving Order."]);
+                return $this->asFailure("Error saving Order.");
             } else {
                 // Check supported languages for order service
                 if ($order->getTranslator()->service !== Constants::TRANSLATOR_DEFAULT) {
@@ -549,12 +548,9 @@ public function actionSaveOrder()
 
                         if ($unsupported || !empty($unsupportedLangs)) {
                             $transaction->rollBack();
-                            return $this->asJson(
-                                ["success" => false,
-                                "message" => "The following language pair(s) are not supported by "
+                            return $this->asFailure("The following language pair(s) are not supported by "
                                 .ucfirst($order->getTranslator()->service).": "
                                 .implode(", ", array_column($unsupportedLangs, "language"))
-                                ]
                             );
                         }
                     }
@@ -566,7 +562,7 @@ public function actionSaveOrder()
                     Craft::error('[' . __METHOD__ . '] Couldn’t create the order file', 'translations');
                     $transaction->rollBack();
 
-                    return $this->asJson(["success" => false, "message" => "Error saving order."]);
+                    return $this->asFailure("Error saving order files.");
                 } else {
                     $order->status = Constants::ORDER_STATUS_NEW;
                     $order->dateOrdered = new DateTime();
@@ -576,7 +572,7 @@ public function actionSaveOrder()
                     if (! $success) {
                         Craft::error('[' . __METHOD__ . '] Couldn’t save the order', 'translations');
                         $transaction->rollBack();
-                        return $this->asJson(["success" => false, "message" => "Couldn’t save the order."]);
+                        return $this->asFailure("Couldn’t save the order.");
                     }
                 }
 
@@ -614,7 +610,7 @@ public function actionSaveOrder()
         } catch (Exception $e) {
             Craft::error('[' . __METHOD__ . '] Couldn’t save the order. Error: ' . $e->getMessage(), 'translations');
             $transaction->rollBack();
-            return $this->asJson(["success" => false, "message" => "Couldn’t save the order. Error: ".$e->getMessage()]);
+            return $this->asFailure($e->getMessage());
         }
 
         $redirectUrl = Translations::$plugin->urlHelper->cpUrl(
@@ -622,18 +618,18 @@ public function actionSaveOrder()
         );
 
         if ($job) {
-            Craft::$app->getSession()->setNotice(
+            $this->setSuccessFlash(
                 Translations::$plugin->translator->translate(
                     'app',
                     'Sending order to Acclaro, refer queue for updates'
                 )
             );
-            return $this->asJson(["success" => true, "message" => "", "url" => $redirectUrl]);
+            return $this->asSuccess(null, [], $redirectUrl);
         } else {
-            Craft::$app->getSession()->setNotice(
+            $this->setSuccessFlash(
                 Translations::$plugin->translator->translate('app', 'New order created: ' . $order->title)
             );
-            return $this->asJson(["success" => true, "message" => "", "url" => $redirectUrl]);
+            return $this->asSuccess(null, [], $redirectUrl);
         }
     }
 
@@ -707,8 +703,7 @@ public function actionCloneOrder()
         $variables['elements'] = [];
 
         foreach ($data['elements'] as $elementId) {
-            $element = Craft::$app->getElements()
-                ->getElementById((int) $elementId, null, $variables['order']->sourceSite);
+            $element = Translations::$plugin->elementRepository->getElementById((int) $elementId, $variables['order']->sourceSite);
 
             if ($element) {
                 $variables['elements'][] = $element;
@@ -794,20 +789,15 @@ public function actionUpdateOrder()
         $sourceSite = Craft::$app->getRequest()->getBodyParam('sourceSite');
 
         if (!$currentUser->can('translations:orders:create')) {
-            return $this->asJson(
-                [
-                    "success" => false,
-                    "message" => "User does not have permission to perform this action."
-                ]
-            );
+            return $this->asFailure("User does not have permission to perform this action.");
         }
 
         if (!$orderId = Craft::$app->getRequest()->getParam('id')) {
-            return $this->asJson(["success" => false, "message" => "Invalid OrderId."]);
+            return $this->asFailure("Invalid OrderId.");
         }
 
         if (!$order = $this->service->getOrderById($orderId)) {
-            return $this->asJson(["success" => false, "message" => "Invalid Order."]);
+            return $this->asFailure("Invalid Order.");
         }
 
         // Authenticate service
@@ -822,7 +812,7 @@ public function actionUpdateOrder()
 
         if (!$authenticate && !$isDefaultTranslator) {
             $message = Translations::$plugin->translator->translate('app', 'Invalid API key');
-            return $this->asJson(["success" => false, "message" => $message]);
+            return $this->asFailure($message);
         }
 
         $queueOrders = Craft::$app->getSession()->get('queueOrders');
@@ -831,7 +821,7 @@ public function actionUpdateOrder()
                 Craft::$app->getQueue()->status($key) == Queue::STATUS_WAITING ||
                 Craft::$app->getQueue()->status($key) == Queue::STATUS_RESERVED
             ) {
-                return $this->asJson(["success" => false, "message" => "This order is currently being processed."]);
+                return $this->asFailure("This order is currently being processed.");
             } else {
                 unset($queueOrders[$key]);
                 Craft::$app->getSession()->set('queueOrders', $queueOrders);
@@ -954,9 +944,9 @@ public function actionUpdateOrder()
 
 			Craft::$app->getElements()->saveElement($order);
 
-			return $this->asJson(['success' => true, 'message' => "Order updated."]);
+			return $this->asSuccess("Order updated.");
         } catch (Exception $e) {
-            return $this->asJson(["success" => false, "message" => $e->getMessage()]);
+            return $this->asFailure($e->getMessage());
         }
     }
 
@@ -1028,14 +1018,14 @@ public function actionSaveDraftAndPublish()
         if ($job) {
             $params = [
                 'id' => (int) $job,
-                'notice' => $action == "draft" ? 'Translation drafts saved' : 'Entries published',
+                'notice' => $action == "draft" ? 'Translation draft(s) saved' : 'Translation draft(s) published',
                 'url' => Constants::URL_ORDER_DETAIL . $order->id
             ];
             Craft::$app->getView()->registerJs('$(function(){ Craft.Translations.trackJobProgressById(true, false, '. json_encode($params) .'); });');
         } else if(is_null($job)) {
             Craft::$app->getSession()->setNotice(
                 Translations::$plugin->translator->translate(
-                    'app', $action == "draft" ? 'Translation drafts saved' : 'Entries published'
+                    'app', $action == "draft" ? 'Translation draft(s) saved' : 'Translation draft(s) published'
                 )
             );
         } else {
@@ -1383,9 +1373,9 @@ public function actionUpdateOrderFilesSource()
         $orderId = Craft::$app->getRequest()->getBodyParam('id');
         $order = Translations::$plugin->orderRepository->getOrderById((int) $orderId);
 
-        if (! $order) return $this->asJson(['success' => false, 'message' => 'Order not found']);
+        if (! $order) return $this->asFailure('Order not found');
 
-        $elements = Craft::$app->getRequest()->getBodyParam('update-elements');
+        $elements = Craft::$app->getRequest()->getRequiredBodyParam('selected');
         if ($elements) $elements = json_decode($elements, true);
 
         $isDefaultTranslator = $order->translator->service === Constants::TRANSLATOR_DEFAULT;
@@ -1399,7 +1389,7 @@ public function actionUpdateOrderFilesSource()
 
             if (!$authenticate && $translator->service !== Constants::TRANSLATOR_DEFAULT) {
                 $message = Translations::$plugin->translator->translate('app', 'Invalid API key');
-                return $this->asJson(["success" => false, "message" => $message]);
+                return $this->asFailure($message);
             }
         }
 
@@ -1421,7 +1411,7 @@ public function actionUpdateOrderFilesSource()
                 if (in_array($file->elementId, $elements)) {
                     if ($file->isPublished()) continue;
 
-                    $element = Craft::$app->getElements()->getElementById($file->elementId, null, $file->sourceSite);
+                    $element = Translations::$plugin->elementRepository->getElementById($file->elementId, $file->sourceSite);
 
                     $file->source = Translations::$plugin->elementToFileConverter->convert(
                         $element,
@@ -1489,10 +1479,11 @@ public function actionUpdateOrderFilesSource()
             Craft::$app->getSession()->setNotice('Entries Updated.');
         } catch (\Exception $e) {
             $transaction->rollBack();
+            Craft::error($e, 'translations');
 
-            return $this->asJson(['success' => false, 'message' => 'Error updating source. Error: ' . $e->getMessage()]);
+            return $this->asFailure($e->getMessage());
         }
 
-        return $this->asJson(['success' => true, 'message' => 'Entries updated.']);
+        return $this->asSuccess('Entries updated.');
     }
 }
diff --git a/src/controllers/SettingsController.php b/src/controllers/SettingsController.php
index 3a2a2fa7..92b01eb7 100644
--- a/src/controllers/SettingsController.php
+++ b/src/controllers/SettingsController.php
@@ -16,12 +16,12 @@
 use craft\helpers\Path;
 use craft\helpers\FileHelper;
 use craft\helpers\App as CraftApp;
-use craft\base\VolumeInterface;
 use yii\web\NotFoundHttpException;
 
 use acclaro\translations\elements\Order;
 use acclaro\translations\Translations;
 use acclaro\translations\services\job\DeleteDrafts;
+use craft\models\Volume;
 
 /**
  * @author    Acclaro
@@ -219,7 +219,7 @@ public function actionConfigurationOptions()
 
         $allVolumes = Craft::$app->getVolumes()->getAllVolumes();
 
-        $variables['volumeOptions'] = array_map(function (VolumeInterface $volume) {
+        $variables['volumeOptions'] = array_map(function (Volume $volume) {
         	return [
         		'label' => $volume->name,
         		'value' => $volume->id,
diff --git a/src/controllers/StaticTranslationsController.php b/src/controllers/StaticTranslationsController.php
index 6a620e7a..eb88883c 100644
--- a/src/controllers/StaticTranslationsController.php
+++ b/src/controllers/StaticTranslationsController.php
@@ -54,7 +54,7 @@ public function actionSave() {
 
         Translations::$plugin->staticTranslationsRepository->set($lang, $translations);
 
-        return $this->asJson([
+        return $this->asSuccess('Static Translations saved.', [
             'success' => true,
             'errors' => []
         ]);
@@ -77,7 +77,7 @@ public function actionExport() {
         $elementQuery = StaticTranslations::find();
         $elementQuery->status = null;
         $elementQuery->source = [$source];
-        $elementQuery->search = Craft::$app->request->getRequiredBodyParam('search', null);
+        $elementQuery->search = Craft::$app->request->getBodyParam('search', null);
         $elementQuery->siteId = $siteId;
 
         $translations = Translations::$plugin->staticTranslationsRepository->get($elementQuery);
@@ -112,7 +112,7 @@ public function actionExport() {
      */
     public function actionExportFile()
     {
-        $filename = Craft::$app->getRequest()->getRequiredQueryParam('filename');
+        $filename = Craft::$app->getRequest()->getQueryParam('filename');
         if (!is_file($filename) || !Path::ensurePathIsContained($filename)) {
             throw new NotFoundHttpException(Craft::t('app', 'Invalid file name: {filename}', [
                 'filename' => $filename
diff --git a/src/controllers/TranslatorController.php b/src/controllers/TranslatorController.php
index 18e112b8..110885d1 100644
--- a/src/controllers/TranslatorController.php
+++ b/src/controllers/TranslatorController.php
@@ -33,7 +33,7 @@ public function actionDelete()
         $this->requirePostRequest();
 
         if (!Translations::$plugin->userRepository->userHasAccess('translations:translator:delete')) {
-            return;
+            return $this->asFailure('User does not have permission to perform this action.', []);
         }
 
         $translatorIds = Craft::$app->getRequest()->getBodyParam('translatorIds');
@@ -43,8 +43,7 @@ public function actionDelete()
             $translator = Translations::$plugin->translatorRepository->getTranslatorById($translatorId);
 
             if (!$translator) {
-                Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'Invalid translator.'));
-                return $this->asJson(["success" => false]);
+                return $this->asFailure('Invalid translator.', []);
             }
 
             // check if translator has any pending orders
@@ -53,19 +52,15 @@ public function actionDelete()
             $pendingOrdersCount = count($pendingOrders);
     
             if ($pendingOrdersCount > 0) {
-                Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'The translator cannot be deleted as orders have been created already.'));
-    
-                return $this->asJson(["success" => false]);
+                return $this->asFailure('The translator cannot be deleted as orders have been created already.', []);
             }
     
             Translations::$plugin->translatorRepository->deleteTranslator($translator);
         }
 
-        Craft::$app->getSession()->setNotice(Translations::$plugin->translator->translate('app', 'Translators deleted.'));
+        $this->setSuccessFlash('Translators deleted.');
 
-        return $this->asJson([
-            "success" => true
-        ]);
+        return $this->asSuccess(null, []);
     }
 
     /**
@@ -85,21 +80,18 @@ public function actionSave(array $variables = array())
         if ($translatorId) {
 
             if (!Translations::$plugin->userRepository->userHasAccess('translations:translator:edit')) {
-                Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'User is not permitted for this operation.'));
-                return;
+                return $this->asFailure(Translations::$plugin->translator->translate('app', 'User is not permitted for this operation.'));
             }
 
             $translator = Translations::$plugin->translatorRepository->getTranslatorById($translatorId);
 
             if (!$translator) {
                 // throw new HttpException(400, 'Invalid Translator');
-                Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'Invalid Translator'));
-                return;
+                return $this->asFailure(Translations::$plugin->translator->translate('app', 'Invalid Translator'));
             }
         } else {
             if (!Translations::$plugin->userRepository->userHasAccess('translations:translator:create')) {
-                Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'User is not permitted to create new translator.'));
-                return;
+                return $this->asFailure(Translations::$plugin->translator->translate('app', 'User is not permitted to create new translator.'));
             }
             $translator = Translations::$plugin->translatorRepository->makeNewTranslator();
         }
@@ -120,7 +112,7 @@ public function actionSave(array $variables = array())
             if (! $auth) {
                 $translator->status = "";
                 $variables['translator'] = $translator;
-                Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'Api token could not be authenticated.'));
+                $this->setFailFlash(Translations::$plugin->translator->translate('app', 'Api token could not be authenticated.'));
                 return $this->renderTemplate('translations/translators/_detail', $variables);
             }
         }
@@ -128,13 +120,8 @@ public function actionSave(array $variables = array())
         $translator->status = Constants::TRANSLATOR_STATUS_ACTIVE;
         Translations::$plugin->translatorRepository->saveTranslator($translator);
 
-        Craft::$app->getSession()->setNotice(Translations::$plugin->translator->translate('app', 'Translator saved.'));
-
-        if ($isContinue) {
-            $this->redirect('translations/translators/new');
-        } else {
-            $this->redirect('translations/translators');
-        }
+        $redirectTo = $isContinue ? 'translations/translators/new' : 'translations/translators';
+        return $this->asSuccess('Translator saved.', [], $redirectTo);
     }
 
     /**
@@ -196,9 +183,6 @@ public function actionGetTranslators()
             $translators = Translations::$plugin->translatorRepository->getTranslators();
         }
 
-        return $this->asJson([
-            "success" => true,
-            "data"    => json_decode(json_encode($translators), true)
-        ]);
+        return $this->asSuccess(null, json_decode(json_encode($translators), true));
     }
 }
diff --git a/src/controllers/WidgetController.php b/src/controllers/WidgetController.php
index f5100210..44402710 100644
--- a/src/controllers/WidgetController.php
+++ b/src/controllers/WidgetController.php
@@ -11,35 +11,21 @@
 namespace acclaro\translations\controllers;
 
 use Craft;
-use craft\db\Query;
 use yii\web\Response;
 use craft\helpers\Json;
 use craft\web\Controller;
-use craft\services\Users;
 use craft\elements\Entry;
 use craft\helpers\UrlHelper;
-use craft\helpers\FileHelper;
-use craft\events\WidgetEvent;
 use craft\helpers\ArrayHelper;
 use craft\base\WidgetInterface;
-use craft\widgets\MissingWidget;
 use craft\models\Updates as UpdatesModel;
-use craft\errors\WidgetNotFoundException;
-use craft\errors\MissingComponentException;
-use craft\helpers\Component as ComponentHelper;
 
 use acclaro\translations\records\FileRecord;
-use acclaro\translations\records\WidgetRecord;
 use acclaro\translations\Translations;
 use acclaro\translations\assetbundles\DashboardAssets;
 use acclaro\translations\Constants;
+use acclaro\translations\services\repository\WidgetRepository;
 
-// Widget Classes
-use acclaro\translations\widgets\News;
-use acclaro\translations\widgets\Translators;
-use acclaro\translations\widgets\RecentOrders;
-use acclaro\translations\widgets\LanguageCoverage;
-use acclaro\translations\widgets\NewAndModifiedEntries;
 use yii\web\BadRequestHttpException;
 
 /**
@@ -49,28 +35,13 @@
  */
 class WidgetController extends Controller
 {
-    /**
-     * @var int
-     */
-    private $_progress;
+    protected $service;
 
-    const EVENT_REGISTER_TRANSLATIONS_WIDGET_TYPES = 'registerTranslationsWidgetTypes';
-    /**
-     * @event WidgetEvent The event that is triggered before a widget is saved.
-     */
-    const EVENT_BEFORE_SAVE_TRANSLATIONS_WIDGET = 'beforeSaveTranslationsWidget';
-    /**
-     * @event WidgetEvent The event that is triggered after a widget is saved.
-     */
-    const EVENT_AFTER_SAVE_TRANSLATIONS_WIDGET = 'afterSaveTranslationsWidget';
-    /**
-     * @event WidgetEvent The event that is triggered before a widget is deleted.
-     */
-    const EVENT_BEFORE_DELETE_TRANSLATIONS_WIDGET = 'beforeDeleteTranslationsWidget';
-    /**
-     * @event WidgetEvent The event that is triggered after a widget is deleted.
-     */
-    const EVENT_AFTER_DELETE_TRANSLATIONS_WIDGET = 'afterDeleteTranslationsWidget';
+    public function __construct($id, $module = null)
+    {
+        parent::__construct($id, $module);
+        $this->service = new WidgetRepository();
+    }
 
     // Action Methods
     // =========================================================================
@@ -80,6 +51,8 @@ class WidgetController extends Controller
     public function actionIndex()
     {
         $this->requireLogin();
+
+        /** @var \Craft\elements\User $currentUser */
         $currentUser = Craft::$app->getUser()->getIdentity();
 
         if (!$currentUser->can('translations:dashboard')) {
@@ -91,23 +64,21 @@ public function actionIndex()
                 case $currentUser->can('translations:translator'):
                     return $this->redirect(Constants::URL_TRANSLATOR, 302, true);
                     break;
-                
+
                 case $currentUser->can('translations:settings'):
                     return $this->redirect(Constants::URL_SETTINGS, 302, true);
                     break;
-                
+
                 default:
                     return $this->redirect(Constants::URL_ENTRIES, 302, true);
                     break;
             }
         }
 
-        $pluginHandle = Constants::PLUGIN_HANDLE;
-
         $view = $this->getView();
         $namespace = $view->getNamespace();
 
-        $widgetTypes = $this->getAllWidgetTypes();
+        $widgetTypes = $this->service->getAllWidgetTypes();
         $widgetTypeInfo = [];
         $view->setNamespace('__NAMESPACE__');
 
@@ -118,12 +89,12 @@ public function actionIndex()
                 continue;
             }
             $view->startJsBuffer();
-            $widget = $this->createWidget($widgetType);
+            $widget = $this->service->createWidget($widgetType);
             $settingsHtml = $view->namespaceInputs((string)$widget->getSettingsHtml());
             $settingsJs = (string)$view->clearJsBuffer(false);
             $class = get_class($widget);
             $widgetTypeInfo[$class] = [
-                'iconSvg' => $this->_getWidgetIconSvg($widget),
+                'iconSvg' => $this->service->getWidgetIconSvg($widget),
                 'name' => $widget::displayName(),
                 'maxColspan' => $widget::maxColspan(),
                 'settingsHtml' => $settingsHtml,
@@ -141,13 +112,13 @@ public function actionIndex()
         // Assemble the list of existing widgets
         $variables['widgets'] = [];
 
-        /** @var Widget[] $widgets */
-        $widgets = $this->getAllWidgets();
+        /** @var WidgetInterface[] $widgets */
+        $widgets = $this->service->getAllWidgets();
         $allWidgetJs = '';
 
         foreach ($widgets as $widget) {
             $view->startJsBuffer();
-            $info = $this->_getWidgetInfo($widget);
+            $info = $this->service->getWidgetInfo($widget);
             $widgetJs = $view->clearJsBuffer(false);
             if ($info === false) {
                 continue;
@@ -155,7 +126,7 @@ public function actionIndex()
             // If this widget type didn't come back in our getAllWidgetTypes() call, add it now
             if (!isset($widgetTypeInfo[$info['type']])) {
                 $widgetTypeInfo[$info['type']] = [
-                    'iconSvg' => $this->_getWidgetIconSvg($widget),
+                    'iconSvg' => $this->service->getWidgetIconSvg($widget),
                     'name' => $widget::displayName(),
                     'maxColspan' => $widget::maxColspan(),
                     'selectable' => false,
@@ -191,7 +162,7 @@ public function actionIndex()
         $variables['widgetTypes'] = $widgetTypeInfo;
         $variables['selectedSubnavItem'] = 'dashboard';
         $variables['isSelectableWidget'] = $isSelectableWidget;
-        
+
         return $this->renderTemplate('translations/_index', $variables);
     }
 
@@ -241,7 +212,8 @@ public function actionCreateWidget(): Response
             'settings' => $settings,
         ];
 
-        $widget = $this->createWidget($config);
+        $widget = $this->service->createWidget($config);
+
         return $this->_saveAndReturnWidget($widget);
     }
 
@@ -257,15 +229,17 @@ public function actionSaveWidgetSettings(): Response
         $this->requireAcceptsJson();
         $request = Craft::$app->getRequest();
         $widgetId = $request->getRequiredBodyParam('widgetId');
+
         // Get the existing widget
         /** @var Widget $widget */
-        $widget = $this->getWidgetById($widgetId);
+        $widget = $this->service->getWidgetById($widgetId);
         if (!$widget) {
             throw new BadRequestHttpException();
         }
+
         // Create a new widget model with the new settings
         $settings = $request->getBodyParam('widget' . $widget->id . '-settings');
-        $widget = $this->createWidget([
+        $widget = $this->service->createWidget([
             'id' => $widget->id,
             'dateCreated' => $widget->dateCreated,
             'dateUpdated' => $widget->dateUpdated,
@@ -273,6 +247,7 @@ public function actionSaveWidgetSettings(): Response
             'type' => get_class($widget),
             'settings' => $settings,
         ]);
+
         return $this->_saveAndReturnWidget($widget);
     }
 
@@ -285,8 +260,10 @@ public function actionDeleteUserWidget(): Response
     {
         $this->requirePostRequest();
         $this->requireAcceptsJson();
+
         $widgetId = Json::decode(Craft::$app->getRequest()->getRequiredBodyParam('id'));
-        $this->deleteWidgetById($widgetId);
+        $this->service->deleteWidgetById($widgetId);
+
         return $this->asJson(['success' => true]);
     }
 
@@ -299,13 +276,15 @@ public function actionChangeWidgetColspan(): Response
     {
         $this->requirePostRequest();
         $this->requireAcceptsJson();
+
         $request = Craft::$app->getRequest();
         $widgetId = $request->getRequiredBodyParam('id');
         $colspan = $request->getRequiredBodyParam('colspan');
         foreach (explode(',', $widgetId) as $id) {
-            $this->changeWidgetColspan($id, $colspan);
+            $this->service->changeWidgetColspan($id, $colspan);
         }
-        return $this->asJson(['success' => true]);
+
+        return $this->asSuccess(null, []);
     }
 
     /**
@@ -317,8 +296,10 @@ public function actionReorderUserWidgets(): Response
     {
         $this->requirePostRequest();
         $this->requireAcceptsJson();
+
         $widgetIds = Json::decode(Craft::$app->getRequest()->getRequiredBodyParam('ids'));
-        $this->reorderWidgets($widgetIds);
+        $this->service->reorderWidgets($widgetIds);
+
         return $this->asJson(['success' => true]);
     }
 
@@ -354,7 +335,7 @@ public function actionGetLanguageCoverage($limit = 0)
                 ->site($site)
                 // ->enabledForSite()
                 ->count();
-                
+
                 // Get in progress entry translation count
                 $inQueue = FileRecord::find()
                     ->select(['elementId'])
@@ -382,14 +363,14 @@ public function actionGetLanguageCoverage($limit = 0)
                 $data[$i]['enabledEntries'] = $enabledEntries;
                 $data[$i]['inQueue'] = $inQueue;
                 $data[$i]['translated'] = $translated;
-                $data[$i]['percentage'] = $enabledEntries ? number_format((($translated / $enabledEntries)*100), 0) : 0;    
-                $data[$i]['color'] = $colorArr[$this->getClosest((int) $data[$i]['percentage'], $colorArr)];
-    
+                $data[$i]['percentage'] = $enabledEntries ? number_format((($translated / $enabledEntries)*100), 0) : 0;
+                $data[$i]['color'] = $colorArr[$this->service->getClosest((int) $data[$i]['percentage'], $colorArr)];
+
                 // Sort the data by highest percentage
                 usort($data, function($a, $b) {
                     return $b['percentage'] <=> $a['percentage'];
                 });
-    
+
                 if ($i + 1 < $limit) {
                     $i++;
                 } else {
@@ -397,12 +378,8 @@ public function actionGetLanguageCoverage($limit = 0)
                 }
             }
         }
-        
-        return $this->asJson([
-            'success' => true,
-            'data' => $data,
-            'error' => null
-        ]);
+
+        return $this->asSuccess(null, $data);
     }
 
     public function actionGetRecentlyModified($limit = 0)
@@ -456,7 +433,7 @@ public function actionGetRecentlyModified($limit = 0)
             if ($fileRecord) {
                 $fileId = $fileRecord->id;
                 // Now we can get the element
-                $element = Craft::$app->getElements()->getElementById($id, null, Craft::$app->getSites()->getPrimarySite()->id);
+                $element = Translations::$plugin->elementRepository->getElementById($id, Craft::$app->getSites()->getPrimarySite()->id);
                 // Get the elements translated file
                 $file = Translations::$plugin->fileRepository->getFileById($fileId);
 
@@ -501,12 +478,12 @@ public function actionGetRecentlyModified($limit = 0)
                         $data[$i]['fileDate'] = $file->dateUpdated->format('M j, Y g:i a');
                         $data[$i]['wordDifference'] = (int)$wordCount == $wordCount && (int)$wordCount > 0 ? '+'.$wordCount : $wordCount;
                         $data[$i]['diff'] = $diffHtml;
-    
+
                         // Sort data array by most recent
                         usort($data, function($a, $b) {
                             return $b['entryDateTimestamp'] <=> $a['entryDateTimestamp'];
                         });
-    
+
                         // Only return set limit
                         if ($i + 1 < $limit) {
                             $i++;
@@ -518,11 +495,7 @@ public function actionGetRecentlyModified($limit = 0)
             }
         }
 
-        return $this->asJson([
-            'success' => true,
-            'data' => $data,
-            'error' => null
-        ]);
+        return $this->asSuccess(null, $data);
     }
 
     public function actionGetRecentEntries($limit = 0)
@@ -532,7 +505,7 @@ public function actionGetRecentEntries($limit = 0)
 
         // Set variables
         $limit = Craft::$app->getRequest()->getParam('limit');
-        $days = Craft::$app->getRequest()->getParam('days');
+        $days = Craft::$app->getRequest()->getParam('days', '7');
         $data = [];
         $i = 0;
 
@@ -558,7 +531,7 @@ public function actionGetRecentEntries($limit = 0)
             // exclude entries for which order has been created
             if (in_array($id, $entriesInOrders)) continue;
             // Now we can get the element
-            $element = Craft::$app->getElements()->getElementById($id, null, Craft::$app->getSites()->getPrimarySite()->id);
+            $element = Translations::$plugin->elementRepository->getElementById($id, Craft::$app->getSites()->getPrimarySite()->id);
 
             // Current entries XML
             $currentXML = Translations::$plugin->elementToFileConverter->convert(
@@ -597,519 +570,39 @@ public function actionGetRecentEntries($limit = 0)
             }
         }
 
-        return $this->asJson([
-            'success' => true,
-            'data' => $data,
-            'error' => null
-        ]);
-    }
-
-    // Public Methods
-    // =========================================================================
-
-    /**
-     * Returns all available widget type classes.
-     *
-     * @return string[]
-     */
-    public function getAllWidgetTypes(): array
-    {
-        $widgetTypes = [
-            News::class,
-            Translators::class,
-            RecentOrders::class,
-            NewAndModifiedEntries::class,
-            LanguageCoverage::class,
-        ];
-        
-        return $widgetTypes;
+        return $this->asSuccess(null, $data);
     }
 
-    /**
-     * Creates a widget with a given config.
-     *
-     * @param mixed $config The widget’s class name, or its config, with a `type` value and optionally a `settings` value.
-     * @return WidgetInterface
-     */
-    public function createWidget($config): WidgetInterface
-    {
-        if (is_string($config)) {
-            $config = ['type' => $config];
-        }
-        try {
-            /** @var Widget $widget */
-            $widget = ComponentHelper::createComponent($config, WidgetInterface::class);
-        } catch (MissingComponentException $e) {
-            $config['errorMessage'] = $e->getMessage();
-            $config['expectedType'] = $config['type'];
-            unset($config['type']);
-            $widget = new MissingWidget($config);
-        }
-        return $widget;
-    }
-
-    /**
-     * Returns the dashboard widgets for the current user.
-     *
-     * @return WidgetInterface[] The widgets
-     */
-    public function getAllWidgets(): array
-    {
-        $widgets = $this->_getUserWidgets();
-        // If there are no widgets, this is the first time they've hit the dashboard.
-        if (!$widgets) {
-            // Add the defaults and try again
-            $this->_addDefaultUserWidgets();
-            $widgets = $this->_getUserWidgets();
-        }
-        return $widgets;
-    }
-
-    /**
-     * Returns whether the current user has a widget of the given type.
-     *
-     * @param string $type The widget type
-     * @return bool Whether the current user has a widget of the given type
-     */
-    public function doesUserHaveWidget(string $type): bool
-    {
-        return WidgetRecord::find()
-            ->where([
-                'userId' => Craft::$app->getUser()->getIdentity()->id,
-                'type' => $type,
-            ])
-            ->exists();
-    }
-
-    /**
-     * Returns a widget by its ID.
-     *
-     * @param int $id The widget’s ID
-     * @return WidgetInterface|null The widget, or null if it doesn’t exist
-     */
-    public function getWidgetById(int $id)
-    {
-        $result = $this->_createWidgetsQuery()
-            ->where(['id' => $id, 'userId' => Craft::$app->getUser()->getIdentity()->id])
-            ->one();
-        return $result ? $this->createWidget($result) : null;
-    }
-
-    /**
-     * Saves a widget for the current user.
-     *
-     * @param WidgetInterface $widget The widget to be saved
-     * @param bool $runValidation Whether the widget should be validated
-     * @return bool Whether the widget was saved successfully
-     * @throws \Throwable if reasons
-     */
-    public function saveWidget(WidgetInterface $widget, bool $runValidation = true): bool
-    {
-        /** @var Widget $widget */
-        $isNewWidget = $widget->getIsNew();
-        // Fire a 'beforeSaveWidget' event
-        if ($this->hasEventHandlers(self::EVENT_BEFORE_SAVE_TRANSLATIONS_WIDGET)) {
-            $this->trigger(self::EVENT_BEFORE_SAVE_TRANSLATIONS_WIDGET, new WidgetEvent([
-                'widget' => $widget,
-                'isNew' => $isNewWidget,
-            ]));
-        }
-        if (!$widget->beforeSave($isNewWidget)) {
-            return false;
-        }
-        if ($runValidation && !$widget->validate()) {
-            Craft::info( '['. __METHOD__ .'] Widget not saved due to validation error.', 'translations' );
-            return false;
-        }
-        $transaction = Craft::$app->getDb()->beginTransaction();
-        try {
-            $widgetRecord = $this->_getUserWidgetRecordById($widget->id);
-            $widgetRecord->type = get_class($widget);
-            $widgetRecord->settings = $widget->getSettings();
-            if ($isNewWidget) {
-                // Set the sortOrder
-                $maxSortOrder = (new Query())
-                    ->from([Constants::TABLE_WIDGET])
-                    ->where(['userId' => Craft::$app->getUser()->getIdentity()->id])
-                    ->max('[[sortOrder]]');
-
-                $widgetRecord->sortOrder = $maxSortOrder + 1;
-            }
-            $widgetRecord->save(false);
-            // Now that we have a widget ID, save it on the model
-            if ($isNewWidget) {
-                $widget->id = $widgetRecord->id;
-            }
-            $widget->afterSave($isNewWidget);
-            $transaction->commit();
-        } catch (\Throwable $e) {
-            $transaction->rollBack();
-            throw $e;
-        }
-        // Fire an 'afterSaveWidget' event
-        $this->trigger(self::EVENT_AFTER_SAVE_TRANSLATIONS_WIDGET, new WidgetEvent([
-            'widget' => $widget,
-            'isNew' => $isNewWidget,
-        ]));
-        return true;
-    }
-
-    /**
-     * Soft-deletes a widget by its ID.
-     *
-     * @param int $widgetId The widget’s ID
-     * @return bool Whether the widget was deleted successfully
-     */
-    public function deleteWidgetById(int $widgetId): bool
-    {
-        $widget = $this->getWidgetById($widgetId);
-        if (!$widget) {
-            return false;
-        }
-        return $this->deleteWidget($widget);
-    }
-
-    /**
-     * Soft-deletes a widget.
-     *
-     * @param WidgetInterface $widget The widget to be deleted
-     * @return bool Whether the widget was deleted successfully
-     * @throws \Throwable if reasons
-     */
-    public function deleteWidget(WidgetInterface $widget): bool
-    {
-        $widgets = [$widget];
-
-        foreach ($widgets as $widget) {
-            /** @var Widget $widget */
-            // Fire a 'beforeDeleteWidget' event
-            if ($this->hasEventHandlers(self::EVENT_BEFORE_DELETE_TRANSLATIONS_WIDGET)) {
-                $this->trigger(self::EVENT_BEFORE_DELETE_TRANSLATIONS_WIDGET, new WidgetEvent([
-                    'widget' => $widget,
-                ]));
-            }
-            if (!$widget->beforeDelete()) {
-                return false;
-            }
-            $transaction = Craft::$app->getDb()->beginTransaction();
-            try {
-                $widgetRecord = $this->_getUserWidgetRecordById($widget->id);
-                $widgetRecord->delete();
-                $widget->afterDelete();
-                $transaction->commit();
-            } catch (\Throwable $e) {
-                $transaction->rollBack();
-                throw $e;
-            }
-            // Fire an 'afterDeleteWidget' event
-            if ($this->hasEventHandlers(self::EVENT_AFTER_DELETE_TRANSLATIONS_WIDGET)) {
-                $this->trigger(self::EVENT_AFTER_DELETE_TRANSLATIONS_WIDGET, new WidgetEvent([
-                    'widget' => $widget,
-                ]));
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Reorders widgets.
-     *
-     * @param int[] $widgetIds The widget IDs
-     * @return bool Whether the widgets were reordered successfully
-     * @throws \Throwable if reasons
-     */
-    public function reorderWidgets(array $widgetIds): bool
-    {
-        $transaction = Craft::$app->getDb()->beginTransaction();
-        try {
-            foreach ($widgetIds as $widgetOrder => $widgetId) {
-                $widgetRecord = $this->_getUserWidgetRecordById($widgetId);
-                $widgetRecord->sortOrder = $widgetOrder + 1;
-                $widgetRecord->save();
-            }
-            $transaction->commit();
-        } catch (\Throwable $e) {
-            $transaction->rollBack();
-            throw $e;
-        }
-        return true;
-    }
-
-    /**
-     * Changes the colspan of a widget.
-     *
-     * @param int $widgetId
-     * @param int $colspan
-     * @return bool
-     */
-    public function changeWidgetColspan(int $widgetId, int $colspan): bool
-    {
-        $widgetRecord = $this->_getUserWidgetRecordById($widgetId);
-        $widgetRecord->colspan = $colspan;
-        $widgetRecord->save();
-        return true;
-    }
-
-    // Private Methods
-    // =========================================================================
-    /**
-     * Adds the default widgets to the logged-in user.
-     */
-    private function _addDefaultUserWidgets()
-    {
-        $user = Craft::$app->getUser()->getIdentity();
-        $this->saveWidget($this->createWidget(RecentOrders::class));
-        $this->saveWidget($this->createWidget(NewAndModifiedEntries::class));
-        $this->saveWidget($this->createWidget(LanguageCoverage::class));
-        $this->saveWidget($this->createWidget(Translators::class));
-        $this->saveWidget($this->createWidget(News::class));
-
-        // Update user preferences
-        $preferences = [
-            'hasTranslationsDashboard' => true,
-        ];
-
-        $usersService = new Users();
-        $usersService->saveUserPreferences($user, $preferences);
-    }
-
-    /**
-     * Gets a widget's record.
-     *
-     * @param int|null $widgetId
-     * @return WidgetRecord
-     */
-    private function _getUserWidgetRecordById(int $widgetId = null): WidgetRecord
-    {
-        $userId = Craft::$app->getUser()->getIdentity()->id;
-
-        if ($widgetId !== null) {
-            $widgetRecord = WidgetRecord::findOne([
-                'id' => $widgetId,
-                'userId' => $userId
-            ]);
-            if (!$widgetRecord) {
-                $this->_noWidgetExists($widgetId);
-            }
-        } else {
-            $widgetRecord = new WidgetRecord();
-            $widgetRecord->userId = $userId;
-        }
-        return $widgetRecord;
-    }
-
-    /**
-     * Gets a widget's record.
-     *
-     * @param int|null $widgetId
-     * @return WidgetRecord
-     */
-    private function _getUserWidgetRecordByType(string $widgetType = null): WidgetRecord
-    {
-        $userId = Craft::$app->getUser()->getIdentity()->id;
-
-        if ($widgetType !== null) {
-            $widgetRecord = WidgetRecord::findOne([
-                'type' => $widgetType,
-                'userId' => $userId
-            ]);
-            if (!$widgetRecord) {
-                throw new WidgetNotFoundException("No widget exists of Type '{$widgetType}'");
-            }
-        } else {
-            $widgetRecord = new WidgetRecord();
-            $widgetRecord->userId = $userId;
-        }
-        return $widgetRecord;
-    }
-
-    /**
-     * Throws a "No widget exists" exception.
-     *
-     * @param int $widgetId
-     * @throws WidgetNotFoundException
-     */
-    private function _noWidgetExists(int $widgetId)
-    {
-        throw new WidgetNotFoundException("No widget exists with the ID '{$widgetId}'");
-    }
-    /**
-     * Returns the widget records for the current user.
-     *
-     * @return WidgetInterface[]|false
-     * @throws Exception if no user is logged-in
-     */
-    private function _getUserWidgets()
-    {
-        $user = Craft::$app->getUser()->getIdentity();
-        if (!$user) {
-            throw new \Exception('No logged-in user');
-        }
-        
-        // Get value from user preferences
-        $usersService = new Users();
-        $hasTranslationsDashboard = $usersService->getUserPreference($user->id, 'hasTranslationsDashboard');
-
-        if (!$hasTranslationsDashboard) {
-            return false;
-        }
-
-        $results = $this->_createWidgetsQuery()
-            ->where(['userId' => $user->id])
-            ->orderBy(['sortOrder' => SORT_ASC])
-            ->all();
-        $widgets = [];
-        foreach ($results as $result) {
-            $widgets[] = $this->createWidget($result);
-        }
-
-        return $widgets;
-    }
-    
-    /**
-     * @return Query
-     */
-    private function _createWidgetsQuery(): Query
-    {
-        return (new Query())
-            ->select([
-                'id',
-                'dateCreated',
-                'dateUpdated',
-                'colspan',
-                'type',
-                'settings',
-            ])
-            ->from([Constants::TABLE_WIDGET]);
-    }
-
-    /**
-     * Returns the info about a widget required to display its body and settings in the Dashboard.
-     *
-     * @param WidgetInterface $widget
-     * @return array|false
-     */
-    private function _getWidgetInfo(WidgetInterface $widget)
-    {
-        /** @var Widget $widget */
-        $view = $this->getView();
-        $namespace = $view->getNamespace();
-
-        // Get the body HTML
-        $widgetBodyHtml = $widget->getBodyHtml();
-        if ($widgetBodyHtml === false) {
-            return false;
-        }
-        // Get the settings HTML + JS
-        $view->setNamespace('widget' . $widget->id . '-settings');
-        $view->startJsBuffer();
-        $settingsHtml = $view->namespaceInputs((string)$widget->getSettingsHtml());
-        $settingsJs = $view->clearJsBuffer(false);
-        // Get the colspan (limited to the widget type's max allowed colspan)
-        $colspan = ($widget->colspan ?: $widget->minColspan());
-        if (($maxColspan = $widget::maxColspan()) && $colspan > $maxColspan) {
-            $colspan = $maxColspan;
-        }
-        $view->setNamespace($namespace);
-        return [
-            'id' => $widget->id,
-            'type' => get_class($widget),
-            'colspan' => $colspan,
-            'title' => $widget->getTitle(),
-            'name' => $widget->displayName(),
-            'bodyHtml' => $widgetBodyHtml,
-            'settingsHtml' => $settingsHtml,
-            'settingsJs' => (string)$settingsJs,
-        ];
-    }
-
-    /**
-     * Returns a widget type’s SVG icon.
-     *
-     * @param WidgetInterface $widget
-     * @return string
-     */
-    private function _getWidgetIconSvg(WidgetInterface $widget): string
-    {
-        $iconPath = $widget::iconPath();
-        if ($iconPath === null) {
-            return $this->_getDefaultWidgetIconSvg($widget);
-        }
-        if (!is_file($iconPath)) {
-            Craft::warning( '['. __METHOD__ .'] Widget icon file doesn\'t exist: {$iconPath}', 'translations' );
-            return $this->_getDefaultWidgetIconSvg($widget);
-        }
-        if (!FileHelper::isSvg($iconPath)) {
-            Craft::warning( '['. __METHOD__ .'] Widget icon file is not an SVG: {$iconPath}', 'translations' );
-            return $this->_getDefaultWidgetIconSvg($widget);
-        }
-        return file_get_contents($iconPath);
-    }
-
-    /**
-     * Returns the default icon SVG for a given widget type.
-     *
-     * @param WidgetInterface $widget
-     * @return string
-     */
-    private function _getDefaultWidgetIconSvg(WidgetInterface $widget): string
-    {
-        return $this->getView()->renderTemplate('_includes/defaulticon.svg', [
-            'label' => $widget::displayName()
-        ]);
-    }
+    // PRIVATE METHODS
 
     /**
      * Attempts to save a widget and responds with JSON.
      *
-     * @param WidgetInterface $widget
+     * @param \Craft\base\Widget $widget
      * @return Response
      */
     private function _saveAndReturnWidget(WidgetInterface $widget): Response
     {
-        /** @var Widget $widget */
-        if ($this->saveWidget($widget)) {
-            $info = $this->_getWidgetInfo($widget);
-            $view = $this->getView();
-            $additionalInfo = [
-                'iconSvg' => $this->_getWidgetIconSvg($widget),
-                'name' => $widget::displayName(),
-                'maxColspan' => $widget::maxColspan(),
-                'selectable' => false,
-            ];
-            return $this->asJson([
-                'success' => true,
-                'info' => $info,
-                'additionalInfo' => $additionalInfo,
-                'headHtml' => $view->getHeadHtml(),
-                'footHtml' => $view->getBodyHtml(),
+        if (! $this->service->saveWidget($widget)) {
+            return $this->asFailure(data: [
+                'errors' => $widget->getFirstErrors(),
             ]);
         }
-        $allErrors = [];
-        foreach ($widget->getErrors() as $attribute => $errors) {
-            foreach ($errors as $error) {
-                $allErrors[] = $error;
-            }
-        }
-        return $this->asJson([
-            'errors' => $allErrors
-        ]);
-    }
 
-    private function getClosest($search, $arr) {
-        $closest = null;
-        foreach ($arr as $key => $item) {
-           if ($closest === null || abs($search - $closest) > abs($key - $search)) {
-              $closest = $key;
-           }
-        }
-        return $closest;
-     }
+        $info = $this->service->getWidgetInfo($widget);
+        $view = $this->getView();
+        $additionalInfo = [
+            'iconSvg' => $this->service->getWidgetIconSvg($widget),
+            'name' => $widget::displayName(),
+            'maxColspan' => $widget::maxColspan(),
+            'selectable' => false,
+        ];
 
-     private function setProgress(float $progress)
-    {
-        if ($progress !== $this->_progress) {
-            $this->_progress = round(100 * $progress);
-        }
+        return $this->asSuccess(data: [
+            'info' => $info,
+            'additionalInfo' => $additionalInfo,
+            'headHtml' => $view->getHeadHtml(),
+            'footHtml' => $view->getBodyHtml(),
+        ]);
     }
 }
diff --git a/src/elements/Order.php b/src/elements/Order.php
index fabff378..9d3da977 100644
--- a/src/elements/Order.php
+++ b/src/elements/Order.php
@@ -25,6 +25,7 @@
 use acclaro\translations\elements\db\OrderQuery;
 use acclaro\translations\elements\actions\OrderDelete;
 use acclaro\translations\elements\actions\OrderEdit;
+use craft\elements\User;
 
 /**
  * @author    Acclaro
@@ -41,10 +42,6 @@ class Order extends Element
 
     protected $_files;
 
-    public $id;
-
-    public $title;
-
     public $translatorId;
 
     public $ownerId;
@@ -69,8 +66,6 @@ class Order extends Element
 
     public $dateOrdered;
 
-    public $dateUpdated;
-
     public $serviceOrderId;
 
     public $entriesCount;
@@ -94,6 +89,9 @@ class Order extends Element
      */
     public static function displayName(): string
     {
+        // To Show Colum Header as Name inspite of order in index page table.
+        if(debug_backtrace()[1]['function'] == 'getTableAttributes')
+            return Translations::$plugin->translator->translate('app', 'Name');
         return Translations::$plugin->translator->translate('app', 'Order');
     }
 
@@ -121,7 +119,7 @@ public static function pluralLowerDisplayName(): string
         return StringHelper::toLowerCase(static::pluralDisplayName());
     }
 
-    public static function refHandle()
+    public static function refHandle(): ?string
     {
         return 'order';
     }
@@ -141,9 +139,19 @@ public static function isLocalized(): bool
         return false;
     }
 
-    public function getIsEditable(): bool
+    public function canView(User $user): bool
     {
-        return true;
+        return $user->can('translations:orders:create');
+    }
+
+    public function canSave(User $user): bool
+    {
+        return $user->can('translations:orders:edit');
+    }
+
+    public function canDelete(User $user): bool
+    {
+        return $user->can('translations:orders:delete');
     }
 
     /**
@@ -159,7 +167,7 @@ public static function hasStatuses(): bool
         return false;
     }
 
-    protected static function defineActions(string $source = null): array
+    protected static function defineActions(string $source): array
     {
         $actions = [OrderDelete::class, OrderEdit::class];
 
@@ -174,7 +182,7 @@ protected static function defineActions(string $source = null): array
         return $actions;
     }
 
-    protected static function defineSources(string $context = null): array
+    protected static function defineSources(string $context): array
     {
         $sources = [
             [
@@ -335,10 +343,10 @@ public function getTableAttributeHtml(string $attribute): string
                 return $languages;
 
             case 'title':
-            case 'entriesCount':
             case 'wordCount':
                 return $value ? $value : '';
-
+            case 'entriesCount':
+                return count($this->getElements());
             case 'serviceOrderId':
                 if (!$value && ( !is_null($this->getTranslator()) && $this->getTranslator()->service !== Constants::TRANSLATOR_DEFAULT))
                 {
@@ -393,8 +401,7 @@ public function getTableAttributeHtml(string $attribute): string
     protected static function defineTableAttributes(): array
     {
         $attributes = [
-            'title' => ['label' => Translations::$plugin->translator->translate('app', 'Name')],
-            'serviceOrderId' => ['label' => Translations::$plugin->translator->translate('app', 'ID')],
+            // 'serviceOrderId' => ['label' => Translations::$plugin->translator->translate('app', 'ID')],
             'ownerId' => ['label' => Translations::$plugin->translator->translate('app', 'Owner')],
             'entriesCount' => ['label' => Translations::$plugin->translator->translate('app', 'Entries')],
             'wordCount' => ['label' => Translations::$plugin->translator->translate('app', 'Words')],
@@ -411,7 +418,6 @@ protected static function defineTableAttributes(): array
     protected static function defineDefaultTableAttributes(string $source): array
     {
         return [
-            'title',
             'status',
             'translatorId',
             'dateOrdered',
@@ -430,14 +436,14 @@ public function criteriaAttributes()
 
     public function getTargetAlertHtml() {
         $html = '';
-        if (!$this->isPublished() && $this->isTmMisaligned() && $this->trackTargetChanges) {
+        if (!($this->isPublished() || $this->isCanceled()) && $this->isTmMisaligned() && $this->trackTargetChanges) {
             $html .= '<span class="nowrap pl-5"><span class="warning order-warning font-size-15" data-icon="alert"> This order contains misaligned content that might affect translation memory accuracy. </span></span>';
         }
 
         return $html;
     }
 
-    public function rules()
+    public function rules(): array
     {
         $rules = parent::rules();
         $rules[] = [['translatorId', 'ownerId', 'sourceSite', 'targetSites', 'activityLog', 'entriesCount', 'wordCount', 'elementIds',],'required'];
@@ -467,7 +473,7 @@ public function getElements()
 
         foreach ($elementIds as $key => $elementId) {
             if (!array_key_exists($elementId, $this->_elements)) {
-                $element = Craft::$app->elements->getElementById($elementId, null, $this->sourceSite);
+                $element = Translations::$plugin->elementRepository->getElementById($elementId, $this->sourceSite);
 
                 $element ? $this->_elements[$elementId] = $element : '';
             }
@@ -476,7 +482,7 @@ public function getElements()
         return $this->_elements;
     }
 
-    public function getUrl()
+    public function getUrl(): ?string
     {
         return Constants::URL_ORDER_DETAIL . $this->id;
     }
@@ -582,7 +588,7 @@ public function logActivity($message)
         $this->activityLog = json_encode($activityLog);
     }
 
-    public function getCpEditUrl()
+    public function getCpEditUrl(): ?string
     {
         return Translations::$plugin->urlHelper->cpUrl(Constants::URL_ORDER_DETAIL.$this->id);
     }
@@ -628,6 +634,10 @@ public function getStatusLabel()
 
     public function isTmMisaligned($ignoreNew = true)
     {
+        if (!$this->hasDefaultTranslator() && ($this->isComplete() || $this->isReviewReady() || $this->isPublished())) {
+            return false;
+        }
+
         foreach ($this->getFiles() as $file) {
             if ($file->isPublished() || ($ignoreNew && $file->isNew())) continue;
 
@@ -760,7 +770,7 @@ public function beforeSave(bool $isNew): bool
         return true;
     }
 
-    public function afterSave(bool $isNew)
+    public function afterSave(bool $isNew): void
     {
         if (!$isNew) {
             $record = OrderRecord::findOne($this->id);
@@ -801,7 +811,7 @@ public function beforeDelete(): bool
         return true;
     }
 
-    public function afterDelete()
+    public function afterDelete(): void
     {
     }
 }
diff --git a/src/elements/StaticTranslations.php b/src/elements/StaticTranslations.php
index df4009ba..7f8da4a4 100644
--- a/src/elements/StaticTranslations.php
+++ b/src/elements/StaticTranslations.php
@@ -43,12 +43,20 @@ public static function displayName(): string
         return Translations::$plugin->translator->translate('app', 'Static Translation');
     }
 
-    public function __toString()
+    /**
+     * @inheritdoc
+     */
+    public static function pluralDisplayName(): string
+    {
+        return Craft::t('app', 'Static Translations');
+    }
+
+    public function __toString(): string
     {
         try{
             return $this->original;
         } catch (\Exception $e) {
-            ErrorHandler::convertExceptionToError($e);
+            \yii\base\ErrorHandler::convertExceptionToError($e);
         }
     }
 
@@ -168,6 +176,14 @@ protected static function defineTableAttributes(): array
         return $attributes;
     }
 
+    protected static function defineDefaultTableAttributes(string $source): array
+    {
+        return [
+            'original',
+            'field'
+        ];
+    }
+
     public static function find(): ElementQueryInterface
     {
         return new StaticTranslationQuery(get_called_class());
@@ -176,18 +192,17 @@ public static function find(): ElementQueryInterface
     /**
      * @inheritdoc
      */
-    public static function indexHtml(ElementQueryInterface $elementQuery, array $disabledElementIds = null, array $viewState, string $sourceKey = null, string $context = null, bool $includeContainer, bool $showCheckboxes): string
+    public static function indexHtml(ElementQueryInterface $elementQuery, ?array $disabledElementIds, array $viewState, ?string $sourceKey, ?string $context, bool $includeContainer, bool $showCheckboxes): string
     {
-
         // if not getting siteId then set primary site id
         if (empty($elementQuery->siteId)) {
             $primarySite = Craft::$app->getSites()->getPrimarySite();
             $elementQuery->siteId = $primarySite->id;
         }
 
-        $attributes = Craft::$app->getElementIndexes()->getTableAttributes(static::class, $sourceKey);
-        if (!empty($elementQuery->siteId)) {
+        $attributes = self::removeDisplayName(Craft::$app->getElementSources()->getTableAttributes(static::class, $sourceKey));
 
+        if (!empty($elementQuery->siteId)) {
             $currentSite = Craft::$app->getSites()->getSiteById($elementQuery->siteId);
             $lang = Craft::$app->getI18n()->getLocaleById($currentSite->language);
             $trans = 'Target: '.ucfirst($lang->displayName).' ('.$currentSite->language.')';
@@ -204,6 +219,7 @@ public static function indexHtml(ElementQueryInterface $elementQuery, array $dis
             'viewMode' => $viewState['mode'],
             'context' => $context,
             'disabledElementIds' => $disabledElementIds,
+            'collapsedElementIds' => Craft::$app->getRequest()->getParam('collapsedElementIds'),
             'attributes' => $attributes,
             'elements' => $elements,
             'showCheckboxes' => $showCheckboxes
@@ -243,4 +259,12 @@ public static function countTranslation($source) {
 
         return count($translations);
     }
+
+    /**
+     * Used to remove default first column in attributes
+     */
+    private static function removeDisplayName($attributes) {
+        unset($attributes[0]);
+        return $attributes;
+    }
 }
diff --git a/src/elements/actions/OrderDelete.php b/src/elements/actions/OrderDelete.php
index e60c65f8..ef0148a6 100644
--- a/src/elements/actions/OrderDelete.php
+++ b/src/elements/actions/OrderDelete.php
@@ -45,7 +45,7 @@ public function getTriggerLabel(): string
     /**
      * @inheritdoc
      */
-    public function getConfirmationMessage()
+    public function getConfirmationMessage(): ?string
     {
         if ($this->confirmationMessage !== null) {
             return $this->confirmationMessage;
@@ -92,11 +92,6 @@ public function performAction(ElementQueryInterface $query): bool
                                 $draft = $elementRepository->getDraftById($file->draftId);
                                 $elementRepository->deleteDraft($draft);
                                 break;
-                            case ($element instanceof Category):
-                                $elementRepository = Translations::$plugin->categoryDraftRepository;
-                                $draft = $elementRepository->getDraftById($file->draftId);
-                                $elementRepository->deleteDraft($draft);
-                                break;
                             case ($element instanceof Asset):
                                 $elementRepository = Translations::$plugin->assetDraftRepository;
                                 $draft = $elementRepository->getDraftById($file->draftId);
diff --git a/src/elements/actions/OrderEdit.php b/src/elements/actions/OrderEdit.php
index a475dc95..3b8cb605 100644
--- a/src/elements/actions/OrderEdit.php
+++ b/src/elements/actions/OrderEdit.php
@@ -20,7 +20,7 @@ class OrderEdit extends Edit
      /**
      * @inheritdoc
      */
-    public function getTriggerHtml()
+    public function getTriggerHtml(): ?string
     {
         $type = Json::encode(static::class);
 
diff --git a/src/elements/db/OrderQuery.php b/src/elements/db/OrderQuery.php
index d453ad77..831f71c7 100644
--- a/src/elements/db/OrderQuery.php
+++ b/src/elements/db/OrderQuery.php
@@ -10,13 +10,13 @@ class OrderQuery extends ElementQuery
     /**
      * @inheritdoc
      */
-    protected $defaultOrderBy = ['translations_orders.dateCreated' => SORT_DESC];
+    protected array $defaultOrderBy = ['translations_orders.dateCreated' => SORT_DESC];
 
-    public $status;
+    public array|string|null $status = null;
 
     public $elementIds;
     
-    public function status($value)
+    public function status(array|string|null $value): self
     {
         $this->status = $value;
 
diff --git a/src/elements/db/StaticTranslationQuery.php b/src/elements/db/StaticTranslationQuery.php
index 73e78a65..bd7cff03 100644
--- a/src/elements/db/StaticTranslationQuery.php
+++ b/src/elements/db/StaticTranslationQuery.php
@@ -9,7 +9,6 @@ class StaticTranslationQuery extends ElementQuery
     /**
      * @inheritdoc
      */
-    public $id;
     public $source;
     public $translateStatus;
     public $pluginHandle;
diff --git a/src/migrations/Install.php b/src/migrations/Install.php
index e976287c..25375732 100644
--- a/src/migrations/Install.php
+++ b/src/migrations/Install.php
@@ -203,25 +203,6 @@ protected function createTables()
             );
         }
 
-        $tableSchema = Craft::$app->db->schema->getTableSchema(Constants::TABLE_CATEGORY_DRAFT);
-        if ($tableSchema === null) {
-            $tablesCreated = true;
-            $this->createTable(
-                Constants::TABLE_CATEGORY_DRAFT,
-                [
-                    'id'            => $this->primaryKey(),
-                    'name'          => $this->string()->notNull(),
-                    'title'         => $this->string()->notNull(),
-                    'categoryId'    => $this->integer()->notNull(),
-                    'site'          => $this->integer()->notNull(),
-                    'data'          => $this->mediumText()->notNull(),
-                    'dateCreated'   => $this->dateTime()->notNull(),
-                    'dateUpdated'   => $this->dateTime()->notNull(),
-                    'uid'           => $this->uid()
-                ]
-            );
-        }
-
         $tableSchema = Craft::$app->db->schema->getTableSchema(Constants::TABLE_ASSET_DRAFT);
         if ($tableSchema === null) {
             $tablesCreated = true;
@@ -303,8 +284,6 @@ protected function removeTables()
 
         $this->dropTableIfExists(Constants::TABLE_GLOBAL_SET_DRAFT);
 
-        $this->dropTableIfExists(Constants::TABLE_CATEGORY_DRAFT);
-
         $this->dropTableIfExists(Constants::TABLE_ASSET_DRAFT);
 
         $this->dropTableIfExists(Constants::TABLE_ORDERS);
diff --git a/src/migrations/m220511_051205_remove_translations_categorydrafts_table.php b/src/migrations/m220511_051205_remove_translations_categorydrafts_table.php
new file mode 100644
index 00000000..ab5e2193
--- /dev/null
+++ b/src/migrations/m220511_051205_remove_translations_categorydrafts_table.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace acclaro\translations\migrations;
+
+use Craft;
+use craft\db\Migration;
+
+/**
+ * m220511_051205_remove_translations_categorydrafts_table migration.
+ */
+class m220511_051205_remove_translations_categorydrafts_table extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function safeUp(): bool
+    {
+        $this->dropTableIfExists('{{%translations_categorydrafts}}');
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function safeDown(): bool
+    {
+        echo "m220511_051205_remove_translations_categorydrafts_table cannot be reverted.\n";
+        return false;
+    }
+}
diff --git a/src/models/AssetDraftModel.php b/src/models/AssetDraftModel.php
index 81cefcc0..a25468e3 100644
--- a/src/models/AssetDraftModel.php
+++ b/src/models/AssetDraftModel.php
@@ -10,6 +10,7 @@
 
 namespace acclaro\translations\models;
 
+use Craft;
 use craft\elements\Asset;
 use craft\behaviors\DraftBehavior;
 use craft\validators\SiteIdValidator;
@@ -18,8 +19,6 @@
 use craft\behaviors\CustomFieldBehavior;
 use acclaro\translations\records\AssetDraftRecord;
 
-use Craft;
-use craft\base\Model;
 
 /**
  * @author    Acclaro
@@ -30,10 +29,6 @@ class AssetDraftModel extends Asset
 {
     protected $_asset = null;
 
-    public $id;
-
-    public $draftId;
-
     public $name;
 
     public $assetId;
@@ -45,10 +40,10 @@ class AssetDraftModel extends Asset
     public $sourceSite;
 
     /**
-     * @param array|null    $attributes
+     * @param array $attributes
      */
     public function __construct(
-        $attributes = null
+        $attributes = []
     ) {
         parent::__construct($attributes);
     }
@@ -56,7 +51,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function rules()
+    public function rules(): array
     {
         $rules = parent::rules();
         $rules[] = [['name', 'assetId', 'site', 'data'], 'required'];
@@ -80,11 +75,11 @@ public static function populateModel($attributes)
         $fieldContent = isset($assetData['fields']) ? $assetData['fields'] : null;
         // $attributes['draftId'] = $attributes['id'];
         $attributes['id'] = $attributes['assetId'];
-        
+
         $attributes = array_diff_key($attributes, array_flip(array('data', 'fields', 'assetId')));
-        
+
         $attributes = array_merge($attributes, $assetData);
-        
+
         $draft = parent::setAttributes($attributes);
 
         if ($fieldContent) {
@@ -115,7 +110,7 @@ public function getAsset()
         return $this->_asset;
     }
 
-    public function getUrl($transform = null, ?bool $generateNow = null)
+    public function getUrl($transform = null, ?bool $generateNow = null): ?string
     {
         return '';
     }
@@ -123,19 +118,19 @@ public function getUrl($transform = null, ?bool $generateNow = null)
     /**
      * {@inheritdoc}
      */
-    public function getCpEditUrl()
+    public function getCpEditUrl(): ?string
     {
         $asset = $this->getAsset();
 
         $path = 'translations/assets/'.$asset->id.'/drafts/'.$this->draftId;
-        
+
         return Translations::$plugin->urlHelper->cpUrl($path);
     }
 
     /**
      * @inheritdoc
      */
-    public function behaviors()
+    public function behaviors(): array
     {
         $behaviors = parent::behaviors();
         $behaviors['customFields'] = [
diff --git a/src/models/CategoryDraftModel.php b/src/models/CategoryDraftModel.php
deleted file mode 100644
index 2b01b599..00000000
--- a/src/models/CategoryDraftModel.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * Translations for Craft plugin for Craft CMS 3.x
- *
- * Translations for Craft eliminates error prone and costly copy/paste workflows for launching human translated Craft CMS web content.
- *
- * @link      http://www.acclaro.com/
- * @copyright Copyright (c) 2018 Acclaro
- */
-
-namespace acclaro\translations\models;
-
-use craft\elements\Category;
-use craft\behaviors\DraftBehavior;
-use craft\validators\SiteIdValidator;
-use acclaro\translations\Translations;
-use craft\behaviors\FieldLayoutBehavior;
-use craft\behaviors\CustomFieldBehavior;
-use acclaro\translations\records\CategoryDraftRecord;
-
-use Craft;
-use craft\base\Model;
-
-/**
- * @author    Acclaro
- * @package   Translations
- * @since     1.0.0
- */
-class CategoryDraftModel extends Category
-{
-    protected $_category = null;
-
-    public $id;
-
-    public $draftId;
-
-    public $name;
-
-    public $categoryId;
-
-    public $site;
-
-    public $data;
-    
-    public $sourceSite;
-
-    /**
-     * @param array|null    $attributes
-     */
-    public function __construct(
-        $attributes = null
-    ) {
-        parent::__construct($attributes);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        $rules = parent::rules();
-        $rules[] = [['name', 'categoryId', 'site', 'data'], 'required'];
-        $rules[] = ['site', SiteIdValidator::class];
-
-        return $rules;
-    }
-
-    public function getFieldLayout()
-    {
-        
-        return parent::getFieldLayout();
-    }
-
-    public function getHandle()
-    {
-        return $this->getCategory()->handle;
-    }
-
-    public static function populateModel($attributes)
-    {
-        if ($attributes instanceof CategoryDraftRecord) {
-            $attributes = $attributes->getAttributes();
-        }
-
-        $categoryData = json_decode($attributes['data'], true);
-        $fieldContent = isset($categoryData['fields']) ? $categoryData['fields'] : null;
-        $attributes['id'] = $attributes['categoryId'];
-        
-        $attributes = array_diff_key($attributes, array_flip(array('data', 'fields', 'categoryId')));
-        
-        $attributes = array_merge($attributes, $categoryData);
-        
-        $draft = parent::setAttributes($attributes);
-
-        if ($fieldContent) {
-            $post = array();
-
-            foreach ($fieldContent as $fieldId => $fieldValue) {
-                $field = Craft::$app->fields->getFieldById($fieldId);
-
-                if ($field) {
-                    $post[$field->handle] = $fieldValue;
-                }
-            }
-
-            $draft->setFieldValues($post);
-        }
-
-        return $draft;
-    }
-
-    public function getCategory()
-    {
-        if (is_null($this->categoryId)) {
-            $this->_category = Translations::$plugin->categoryRepository->getCategoryById($this->id); // this works for creating orders
-        } else {
-            $this->_category = Translations::$plugin->categoryRepository->getCategoryById($this->categoryId); // this works for edit draft
-        }
-
-        return $this->_category;
-    }
-
-    public function getUrl()
-    {
-        return '';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCpEditUrl()
-    {
-        $category = $this->getCategory();
-
-        $catUrl = $category->id . ($category->slug ? '-' . $category->slug : '');
-        $path = 'translations/categories/'.$category->getGroup()->handle.'/'.$catUrl.'/drafts/'.$this->draftId;
-        
-        return Translations::$plugin->urlHelper->cpUrl($path);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function behaviors()
-    {
-        $behaviors = parent::behaviors();
-        $behaviors['customFields'] = [
-            'class' => CustomFieldBehavior::class,
-            'hasMethods' => false,
-        ];
-        $behaviors['fieldLayout'] = [
-            'class' => FieldLayoutBehavior::class,
-            'elementType' => Category::class,
-        ];
-        $behaviors['draft'] = [
-            'class' => DraftBehavior::class,
-            'creatorId' => 1,
-            'draftName' => 'Category Draft',
-            'draftNotes' => '',
-            'trackChanges' => true,
-        ];
-        return $behaviors;
-    }
-}
diff --git a/src/models/FileModel.php b/src/models/FileModel.php
index 03464857..c6fee54b 100644
--- a/src/models/FileModel.php
+++ b/src/models/FileModel.php
@@ -65,7 +65,7 @@ class FileModel extends Model
 
     public $reference;
 
-    public function init()
+    public function init(): void
     {
         parent::init();
 
@@ -76,7 +76,7 @@ public function init()
         $this->targetSite = $this->targetSite ?: '';
     }
 
-    public function rules()
+    public function rules(): array
     {
         return [
             [['orderId', 'elementId', 'draftId', 'sourceSite', 'targetSite'], 'required'],
@@ -133,7 +133,7 @@ public function getStatusColor()
 
     public function hasDraft()
     {
-        return $this->draftId ?: null;
+        return $this->_service->getDraft($this);
     }
 
     public function isNew()
@@ -178,7 +178,7 @@ public function getCpEditUrl()
 
 	public function getUiLabel()
 	{
-		if ($this->isComplete()) {
+        if ($this->isComplete() && $this->hasDraft()) {
 			return Translations::$plugin->orderRepository->getFileTitle($this);
 		}
 		if ($element = $this->getElement($this->isPublished())) {
@@ -188,9 +188,16 @@ public function getUiLabel()
 		return 'Not Found!';
 	}
 
+    public function hasPreview()
+    {
+        $element = $this->getElement();
+
+        return $element instanceof (Constants::CLASS_ENTRY) || $element instanceof (Constants::CLASS_CATEGORY);
+    }
+
 	public function getPreviewUrl()
 	{
-		$previewUrl = Translations::$plugin->urlGenerator->generateFileWebUrl($this->getElement($this->isPublished()), $this);
+        $previewUrl = Translations::$plugin->urlGenerator->generateFileWebUrl($this->getElement(), $this);
 
 		if ($this->isPublished()) return $previewUrl;
 
@@ -208,15 +215,16 @@ public function hasSourceTargetDiff()
 		return $hasDiff;
 	}
 
-	public function getElement($isApplied = null)
+    public function getElement()
 	{
-		$site = $isApplied ? $this->targetSite : $this->sourceSite;
-		$element = Craft::$app->getElements()->getElementById($this->elementId, null, $site);
+        $element = Translations::$plugin->elementRepository->getElementById($this->elementId, $this->targetSite);
 
 		if (! $element) {
-			$element = Craft::$app->getElements()->getElementById($this->elementId, null, $this->sourceSite);
+            $element = Translations::$plugin->elementRepository->getElementById($this->elementId, $this->sourceSite);
 		}
-		if ($isApplied && $element->getIsDraft()) {
+
+        /** Check element as an entry could have been deleted */
+        if ($element && $element->getIsDraft()) {
 			$element = $element->getCanonical();
 		}
 
@@ -243,15 +251,15 @@ public function hasTmMisalignments($ignoreReference = false)
 
     public function getTmMisalignmentFile()
     {
-        $element = Craft::$app->elements->getElementById($this->elementId, null, $this->sourceSite);
+        $element = Translations::$plugin->elementRepository->getElementById($this->elementId, $this->sourceSite);
 
         $targetSite = $this->targetSite;
         $source = $this->source;
 
-        $targetElement = Craft::$app->elements->getElementById($this->elementId, null, $targetSite);
+        $targetElement = Translations::$plugin->elementRepository->getElementById($this->elementId, $targetSite);
 
         if ($this->isComplete()) {
-            $draft = Translations::$plugin->draftRepository->getDraftById($this->draftId, $targetSite);
+            $draft = $this->_service->getDraft($this);
             $targetElement = $draft ?: $targetElement;
         }
 
diff --git a/src/models/GlobalSetDraftModel.php b/src/models/GlobalSetDraftModel.php
index 9fc07148..db968b1f 100644
--- a/src/models/GlobalSetDraftModel.php
+++ b/src/models/GlobalSetDraftModel.php
@@ -30,12 +30,6 @@ class GlobalSetDraftModel extends GlobalSet
 {
     protected $_globalSet = null;
 
-    public $id;
-
-    public $draftId;
-
-    public $name;
-
     public $globalSetId;
 
     public $site;
@@ -43,10 +37,10 @@ class GlobalSetDraftModel extends GlobalSet
     public $data;
 
     /**
-     * @param array|null    $attributes
+     * @param array $attributes
      */
     public function __construct(
-        $attributes = null
+        $attributes = []
     ) {
         parent::__construct($attributes);
     }
@@ -54,7 +48,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function rules()
+    public function rules(): array
     {
         $rules = parent::rules();
         $rules[] = [['name', 'globalSetId', 'site', 'data'], 'required'];
@@ -67,10 +61,10 @@ public function rules()
         return $rules;
     }
 
-    public function getFieldLayout()
+    public function getFieldLayout(): ?\craft\models\FieldLayout
     {
         $globalSet = $this->getGlobalSet();
-        
+
         return $globalSet->getFieldLayout();
     }
 
@@ -88,11 +82,11 @@ public static function populateModel($attributes)
         $globalSetData = json_decode($attributes['data'], true);
         $fieldContent = isset($globalSetData['fields']) ? $globalSetData['fields'] : null;
         $attributes['id'] = $attributes['globalSetId'];
-        
+
         $attributes = array_diff_key($attributes, array_flip(array('data', 'fields', 'globalSetId')));
-        
+
         $attributes = array_merge($attributes, $globalSetData);
-        
+
         $draft = parent::setAttributes($attributes);
 
         if ($fieldContent) {
@@ -123,7 +117,7 @@ public function getGlobalSet()
         return $this->_globalSet;
     }
 
-    public function getUrl()
+    public function getUrl(): ?string
     {
         return '';
     }
@@ -131,19 +125,19 @@ public function getUrl()
     /**
      * {@inheritdoc}
      */
-    public function getCpEditUrl()
+    public function getCpEditUrl(): ?string
     {
         $globalSet = $this->getGlobalSet();
 
         $path = 'translations/globals/'.$globalSet->handle.'/drafts/'.$this->draftId;
-        
+
         return Translations::$plugin->urlHelper->cpUrl($path);
     }
 
     /**
      * @inheritdoc
      */
-    public function behaviors()
+    public function behaviors(): array
     {
         $behaviors = parent::behaviors();
         $behaviors['customFields'] = [
diff --git a/src/models/Settings.php b/src/models/Settings.php
index f63fa833..72fa7ba5 100644
--- a/src/models/Settings.php
+++ b/src/models/Settings.php
@@ -36,7 +36,7 @@ class Settings extends Model
     /** @var int The Volume ID where uploads will be saved */
     public $uploadVolume = 0;
 
-    public function rules()
+    public function rules(): array
     {
         return [];
     }
diff --git a/src/models/TranslationModel.php b/src/models/TranslationModel.php
index 77a0817a..cbadadc9 100644
--- a/src/models/TranslationModel.php
+++ b/src/models/TranslationModel.php
@@ -36,7 +36,7 @@ class TranslationModel extends Model
 
     public $attributes;
 
-    public function rules()
+    public function rules(): array
     {
         return [
             ['id', 'number', 'integerOnly' => true],
diff --git a/src/models/TranslatorModel.php b/src/models/TranslatorModel.php
index f0eff0e9..40c18d9f 100644
--- a/src/models/TranslatorModel.php
+++ b/src/models/TranslatorModel.php
@@ -41,7 +41,7 @@ class TranslatorModel extends Model
     
     public $dateUpdated;
 
-    public function rules()
+    public function rules(): array
     {
         return [
             ['id', 'number', 'integerOnly' => true],
@@ -51,7 +51,7 @@ public function rules()
         ];
     }
 
-    public function fields()
+    public function fields(): array
     {
         return [
             'label' => '',
diff --git a/src/records/CategoryDraftRecord.php b/src/records/CategoryDraftRecord.php
deleted file mode 100644
index 832d1924..00000000
--- a/src/records/CategoryDraftRecord.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Translations for Craft plugin for Craft CMS 3.x
- *
- * Translations for Craft eliminates error prone and costly copy/paste workflows for launching human translated Craft CMS web content.
- *
- * @link      http://www.acclaro.com/
- * @copyright Copyright (c) 2018 Acclaro
- */
-
-namespace acclaro\translations\records;
-
-use craft\db\ActiveRecord;
-use acclaro\translations\Constants;
-
-/**
- * @author    Acclaro
- * @package   Translations
- * @since     1.0.0
- */
-class CategoryDraftRecord extends ActiveRecord
-{
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return Constants::TABLE_CATEGORY_DRAFT;
-    }
-}
diff --git a/src/services/App.php b/src/services/App.php
index 79c1a47d..111242c4 100644
--- a/src/services/App.php
+++ b/src/services/App.php
@@ -25,12 +25,12 @@ class App extends Component
      * @var UrlHelper
      */
     public $urlHelper;
-    
+
     /**
      * @var UrlGenerator
      */
     public $urlGenerator;
-    
+
     /**
      * @var Translator
      */
@@ -40,22 +40,17 @@ class App extends Component
      * @var ElementCloner
      */
     public $elementCloner;
-    
+
     /**
      * @var repository\TranslationRepository
      */
     public $translationRepository;
-    
+
     /**
      * @var repository\CategoryRepository
      */
     public $categoryRepository;
 
-    /**
-     * @var repository\CategoryDraftRepository
-     */
-    public $categoryDraftRepository;
-
     /**
      * @var repository\AssetDraftRepository
      */
@@ -65,12 +60,12 @@ class App extends Component
      * @var repository\TagRepository
      */
     public $tagRepository;
-    
+
     /**
      * @var repository\DraftRepository
      */
     public $draftRepository;
-    
+
     /**
      * @var repository\EntryRepository
      */
@@ -80,42 +75,47 @@ class App extends Component
      * @var repository\ElementRepository
      */
     public $elementRepository;
-    
+
     /**
      * @var repository\FileRepository
      */
     public $fileRepository;
-    
+
     /**
      * @var repository\GlobalSetRepository
      */
     public $globalSetRepository;
-    
+
     /**
      * @var repository\GlobalSetDraftRepository
      */
     public $globalSetDraftRepository;
-    
+
     /**
      * @var repository\SiteRepository
      */
     public $siteRepository;
-    
+
     /**
      * @var repository\OrderRepository
      */
     public $orderRepository;
-    
+
     /**
      * @var repository\TranslatorRepository
      */
     public $translatorRepository;
-    
+
     /**
      * @var repository\UserRepository
      */
     public $userRepository;
 
+    /**
+     * @var repository\WidgetRepository
+     */
+    public $widgetRepository;
+
     /**
      * @var repository\StaticTranslationsRepository
      */
@@ -125,48 +125,48 @@ class App extends Component
      * @var WordCounter
      */
     public $wordCounter;
-    
+
     /**
      * @var fieldtranslator\Factory
      */
     public $fieldTranslatorFactory;
-    
+
     /**
      * @var translator\Factory
      */
     public $translatorFactory;
-    
+
     /**
      * @var ElementTranslator
      */
     public $elementTranslator;
-    
+
     /**
      * @var ElementToFileConverter
      */
     public $elementToFileConverter;
-    
+
     /**
      * @var Services
      */
     public $services;
-    
+
     /**
      * @var OrderSearchParams
      */
     public $orderSearchParams;
-    
+
     /**
      * @var OrderDelete
      */
     public $orderDelete;
-    
+
     /**
      * @var OrderEdit
      */
     public $orderEdit;
-    
-    public function init()
+
+    public function init(): void
     {
         $this->services = new Services();
         $this->urlHelper = new UrlHelper();
@@ -175,7 +175,6 @@ public function init()
         $this->elementCloner = new ElementCloner();
         $this->translationRepository = new repository\TranslationRepository();
         $this->categoryRepository = new repository\CategoryRepository();
-        $this->categoryDraftRepository = new repository\CategoryDraftRepository();
         $this->assetDraftRepository = new repository\AssetDraftRepository();
         $this->tagRepository = new repository\TagRepository();
         $this->draftRepository = new repository\DraftRepository();
@@ -188,6 +187,7 @@ public function init()
         $this->orderRepository = new repository\OrderRepository();
         $this->translatorRepository = new repository\TranslatorRepository();
         $this->userRepository = new repository\UserRepository();
+        $this->widgetRepository = new repository\WidgetRepository();
         $this->staticTranslationsRepository = new repository\StaticTranslationsRepository();
         $this->wordCounter = new WordCounter();
         $this->fieldTranslatorFactory = new fieldtranslator\Factory();
diff --git a/src/services/ElementCloner.php b/src/services/ElementCloner.php
index 5f251fd6..270d193a 100644
--- a/src/services/ElementCloner.php
+++ b/src/services/ElementCloner.php
@@ -36,7 +36,7 @@ public function cloneElement(Element $existingElement)
                 $newElement->title = $existingElement->title;
             }
 
-            foreach ($existingElement->getFieldLayout()->getFields() as $fieldLayoutField) {
+            foreach ($existingElement->getFieldLayout()->getCustomFields() as $fieldLayoutField) {
                 $this->cloneField($existingElement, $newElement, $fieldLayoutField->getField());
             }
         }
diff --git a/src/services/ElementToFileConverter.php b/src/services/ElementToFileConverter.php
index 6f9a61be..e548552b 100644
--- a/src/services/ElementToFileConverter.php
+++ b/src/services/ElementToFileConverter.php
@@ -255,7 +255,8 @@ private function reportXmlErrors() {
     	return $msg;
     }
 
-    private function csvToJson($file_content) {
+    public function csvToJson($file_content)
+    {
         $jsonData = [];
         $contentArray = explode("\n", $file_content, 2);
 
diff --git a/src/services/ElementTranslator.php b/src/services/ElementTranslator.php
index a408ac1e..2d94ed26 100644
--- a/src/services/ElementTranslator.php
+++ b/src/services/ElementTranslator.php
@@ -36,7 +36,7 @@ public function toTranslationSource(Element $element, $sourceSite=null)
 
         }
 
-        foreach ($element->getFieldLayout()->getFields() as $layoutField) {
+        foreach ($element->getFieldLayout()->getCustomFields() as $layoutField) {
             $field = Craft::$app->fields->getFieldById($layoutField->id);
             $fieldSource = $this->fieldToTranslationSource($element, $field, $sourceSite);
 
@@ -136,7 +136,7 @@ public function toPostArrayFromTranslationTarget(Element $element, $sourceSite,
     {
         $post = array();
 
-        foreach($element->getFieldLayout()->getFields() as $key => $layoutField) {
+        foreach($element->getFieldLayout()->getCustomFields() as $key => $layoutField) {
             $field = Craft::$app->fields->getFieldById($layoutField->id);
             $fieldHandle = $field->handle;
 
@@ -173,7 +173,7 @@ public function toPostArray(Element $element)
     {
         $source = array();
 
-        foreach($element->getFieldLayout()->getFields() as $layoutField) {
+        foreach($element->getFieldLayout()->getCustomFields() as $layoutField) {
             $field = Craft::$app->fields->getFieldById($layoutField->id);
 
             $fieldSource = $this->fieldToPostArray($element, $field);
@@ -192,7 +192,7 @@ public function getWordCount(Element $element)
             $wordCount += Translations::$plugin->wordCounter->getWordCount($element->title);
             $wordCount += Translations::$plugin->wordCounter->getWordCount($element->slug);
         }
-        foreach($element->getFieldLayout()->getFields() as $layoutField) {
+        foreach($element->getFieldLayout()->getCustomFields() as $layoutField) {
             $field = Craft::$app->fields->getFieldById($layoutField->id);
 
             $wordCount += $this->getFieldWordCount($element, $field);
@@ -247,8 +247,6 @@ public function getFieldWordCount(Element $element, Field $field)
     {
         $fieldType = $field;
 
-        $fieldHandle = $field->handle;
-
         // Check if field is translatable or is nested field
         if ($field->getIsTranslatable() || in_array(get_class($field), Constants::NESTED_FIELD_TYPES)) {
             $translator = Translations::$plugin->fieldTranslatorFactory->makeTranslator($fieldType);
diff --git a/src/services/Exporter.php b/src/services/Exporter.php
index f516640e..dcbc896b 100644
--- a/src/services/Exporter.php
+++ b/src/services/Exporter.php
@@ -16,6 +16,8 @@ class Exporter extends ElementExporter
 
     protected $allSites;
 
+    protected null|array $selectedOrderIds = null;
+
     protected $allTranslators;
 
     protected $keyMap = [
@@ -39,7 +41,7 @@ public function __construct($type)
      * @param  ElementQueryInterface  $query
      * @return array|callable|resource|string
      */
-    public function export(ElementQueryInterface $query)
+    public function export(ElementQueryInterface $query): mixed
     {
         $this->setSitesArray();
 
@@ -56,6 +58,7 @@ public function export(ElementQueryInterface $query)
         $query->with($eagerLoadableFields);
 
         foreach ($query->each() as $element) {
+            if ($this->selectedOrderIds && !in_array($element->id, $this->selectedOrderIds)) continue;
             // Get the basic array representation excluding custom fields
             $attributes = array_flip($element->attributes());
 
@@ -88,6 +91,11 @@ public function export(ElementQueryInterface $query)
         return $this->filterResponseData($data);
     }
 
+    public function setOrderIds($ids)
+    {
+        $this->selectedOrderIds = $ids;
+    }
+
     /**
      * @param $data
      * @return array
@@ -111,7 +119,6 @@ protected function filterResponseData($data)
         return $rawData;
     }
 
-
     /**
      * @param $ids
      * @return array
@@ -154,7 +161,7 @@ protected function getElementsName($elementIds, $sourceSite=null)
     {
         $elementIds = json_decode($elementIds, true);
         foreach ($elementIds as $elementId){
-            $element = Craft::$app->getElements()->getElementById($elementId, null, $sourceSite);
+            $element = Translations::$plugin->elementRepository->getElementById($elementId, $sourceSite);
             $this->elementsTitle[$elementId] = is_object($element) ? $element->title : 'N/A';
         }
 
diff --git a/src/services/UrlGenerator.php b/src/services/UrlGenerator.php
index 741d4bac..4cbd7993 100644
--- a/src/services/UrlGenerator.php
+++ b/src/services/UrlGenerator.php
@@ -17,7 +17,6 @@
 use craft\elements\Category;
 use craft\elements\GlobalSet;
 
-use acclaro\translations\Constants;
 use acclaro\translations\Translations;
 use acclaro\translations\elements\Order;
 use acclaro\translations\models\FileModel;
@@ -59,9 +58,14 @@ public function generateFileUrl(Element $element, FileModel $file)
         $sitesService = Craft::$app->getSites();
         $targetSite = $sitesService->getSiteById($file->targetSite) ?? $sitesService->getSiteById($file->sourceSite) ?? $sitesService->getPrimarySite();
 
+        $data = [
+            'site' => $targetSite->handle,
+        ];
+
         if ($element instanceof GlobalSet) {
             if ($file->draftId && $file->isComplete()) {
-                return Translations::$plugin->urlHelper->cpUrl('translations/globals/'.$element->handle.'/drafts/'.$file->draftId);
+                $url = sprintf('translations/globals/%s/drafts/%s?site=%s', $element->handle, $file->draftId, $data['site']);
+                return Translations::$plugin->urlHelper->cpUrl($url);
             }
             return preg_replace(
                 '/(\/'.Craft::$app->sites->getSiteById($element->siteId)->handle.')/',
@@ -70,44 +74,29 @@ public function generateFileUrl(Element $element, FileModel $file)
             );
         }
 
-        if ($element instanceof Category) {
-            $catUri = $element->id.'-'.$element->slug;
-
-            if ($file->draftId && $file->isComplete()) {
-                return Translations::$plugin->urlHelper->cpUrl("translations/categories/".$element->getGroup()->handle."/".$catUri."/drafts/".$file->draftId);
-            }
-            return Translations::$plugin->urlHelper->url(
-                $element->getCpEditUrl($element),
-                ['site' => $targetSite->handle]
-            );
-        }
-
         if ($element instanceof Asset) {
             if ($file->draftId && $file->isComplete()) {
-                return Translations::$plugin->urlHelper->cpUrl('translations/assets/'.$element->id.'/drafts/'.$file->draftId);
+                $url = sprintf('translations/assets/%s/drafts/%s?site=%s', $element->id, $file->draftId, $data['site']);
+                return Translations::$plugin->urlHelper->cpUrl($url);
             }
             return Translations::$plugin->urlHelper->url($element->getCpEditUrl(),
                 ['site' => $targetSite->handle]
             );
         }
 
-        $data = [
-            'site' => $targetSite->handle,
-        ];
-
-        if ($file->draftId && $file->isComplete()) {
-            $data['draftId'] = $file->draftId;
-        }
-        if ($file->status === Constants::FILE_STATUS_PUBLISHED) {
+        if ($file->isPublished()) {
             $element = $element->getIsDraft() ? $element->getCanonical(true) : $element;
+        } elseif ($file->isComplete() && $file->hasDraft()) {
+            $data['draftId'] = $file->draftId;
         }
+
         return Translations::$plugin->urlHelper->url($element->getCpEditUrl(), $data);
     }
 
     public function generateFileWebUrl(Element $element, FileModel $file)
     {
-        if ($file->status === Constants::FILE_STATUS_PUBLISHED) {
-            if ($element instanceof GlobalSet || $element instanceof Category || $element instanceof Asset) {
+        if ($file->isPublished()) {
+            if (!$file->hasPreview()) {
                 return '';
             }
 
@@ -124,19 +113,19 @@ public function generateCpUrl($path)
 
     public function generateElementPreviewUrl(Element $element, $siteId = null)
     {
-        if ($element instanceof GlobalSet || $element instanceof Category || $element instanceof Asset) {
+        if ($element instanceof GlobalSet || $element instanceof Asset) {
             return '';
         }
 
         $className = get_class($element);
 
-        if ($className === Entry::class && !$element->getIsDraft()) {
+        if (($className === Entry::class || $className === Category::class) && !$element->getIsDraft()) {
             $previewUrl = $element->url;
         } else {
             $route = [
                 'preview/preview', [
                     'elementType' => $className,
-                    'sourceId' => $element->getCanonicalId(),
+                    'canonicalId' => $element->getCanonicalId(),
                     'siteId' => $siteId ? $siteId : $element->siteId,
                     'draftId' => $element->draftId,
                     'revisionId' => $element->revisionId
@@ -173,7 +162,7 @@ private function getPrimaryPreviewTargetUrl($element)
             $uri = $targets[0]['urlFormat'] ?? null;
 
             if ($uri) {
-                return str_replace('//', '/', $this->normalizeUri($uri, $element));
+                return $this->normalizeUri($uri, $element);
             }
         }
 
diff --git a/src/services/api/AcclaroApiClient.php b/src/services/api/AcclaroApiClient.php
index 65ad95e4..16dc9cbd 100644
--- a/src/services/api/AcclaroApiClient.php
+++ b/src/services/api/AcclaroApiClient.php
@@ -107,16 +107,19 @@ public function request($method, $endpoint, $query = array(), $files = array())
         if ($files) {
             foreach ($files as $key => $file) {
                 if ( ! is_array( $file ) ) {
-                    // var_dump(pathinfo($file));
-                    $response = $this->client->request($method, $endpoint.'?'.http_build_query($query, '', '&'), [
-                        'multipart' => [
-                            [
-                                'name' => 'file',
-                                'contents' => fopen( $file, 'r' ),
-                                'filename' => pathinfo($file)['basename']
+                    try {
+                        $response = $this->client->request($method, $endpoint . '?' . http_build_query($query, '', '&'), [
+                            'multipart' => [
+                                [
+                                    'name' => 'file',
+                                    'contents' => fopen($file, 'r'),
+                                    'filename' => pathinfo($file)['basename']
+                                ]
                             ]
-                        ]
-                    ]);
+                        ]);
+                    } catch (Exception $e) {
+                        Craft::error($e, Constants::PLUGIN_HANDLE);
+                    }
                 }
             }
         } else {
@@ -127,7 +130,6 @@ public function request($method, $endpoint, $query = array(), $files = array())
             try {
                 $response = $this->client->send($request, ['timeout' => 0]);
             } catch (Exception $e) {
-                //@TODO
 				Craft::error($e, Constants::PLUGIN_HANDLE);
                 return null;
             }
@@ -136,7 +138,7 @@ public function request($method, $endpoint, $query = array(), $files = array())
         if ($this->loggingEnabled) $this->log($response, $endpoint);
 
         if ($response->getStatusCode() != 200) {
-            //@TODO
+            Craft::error('Error code recieved in response', Constants::PLUGIN_HANDLE);
             return null;
         }
 
diff --git a/src/services/fieldtranslator/AssetsFieldTranslator.php b/src/services/fieldtranslator/AssetsFieldTranslator.php
index 2c1fc5e5..e5f9efe9 100644
--- a/src/services/fieldtranslator/AssetsFieldTranslator.php
+++ b/src/services/fieldtranslator/AssetsFieldTranslator.php
@@ -25,14 +25,14 @@ public function toTranslationSource(ElementTranslator $elementTranslator, Elemen
 
         $blocks = $element->getFieldValue($field->handle)->siteId($sourceSite)->all();
 
-        if ($blocks) 
+        if ($blocks)
         {
-            foreach ($blocks as $block) 
+            foreach ($blocks as $block)
             {
                 $source[sprintf('%s.%s.%s', $field->handle, $block->id, 'title')] = $block->title;
 
                 $element = Craft::$app->assets->getAssetById($block->id, $sourceSite);
-                foreach ($element->getFieldLayout()->getFields() as $layoutField) {
+                foreach ($element->getFieldLayout()->getCustomFields() as $layoutField) {
                     $assetField = Craft::$app->fields->getFieldById($layoutField->id);
                     $fieldSource = $elementTranslator->fieldToTranslationSource($element, $assetField, $sourceSite);
 
@@ -55,20 +55,19 @@ public function toPostArray(ElementTranslator $elementTranslator, Element $eleme
 
         $post[$fieldHandle] = [];
 
-        if (!$blocks) 
+        if (!$blocks)
         {
             return '';
         }
 
-        foreach ($blocks as $i => $block) 
-        {             
+        foreach ($blocks as $i => $block) {
             $post[$fieldHandle][$block->id] = $block->id;
         }
         return $post;
     }
 
     public function toPostArrayFromTranslationTarget(ElementTranslator $elementTranslator, Element $element, Field $field, $sourceSite, $targetSite, $fieldData)
-    { 
+    {
         $fieldHandle = $field->handle;
 
         $blocks = $element->getFieldValue($fieldHandle)->siteid($sourceSite)->all();
diff --git a/src/services/fieldtranslator/CategoryFieldTranslator.php b/src/services/fieldtranslator/CategoryFieldTranslator.php
index 6917fec1..6c80345a 100644
--- a/src/services/fieldtranslator/CategoryFieldTranslator.php
+++ b/src/services/fieldtranslator/CategoryFieldTranslator.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Translations for Craft plugin for Craft CMS 3.x
  *
@@ -57,4 +58,4 @@ public function translateRelated(ElementTranslator $elementTranslator, Element $
 
         return $category->id;
     }
-}
\ No newline at end of file
+}
diff --git a/src/services/fieldtranslator/VizyFieldTranslator.php b/src/services/fieldtranslator/VizyFieldTranslator.php
index 2e015639..ec9388e5 100644
--- a/src/services/fieldtranslator/VizyFieldTranslator.php
+++ b/src/services/fieldtranslator/VizyFieldTranslator.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Translations for Craft plugin for Craft CMS 3.x
  *
@@ -17,12 +18,14 @@
 
 class VizyFieldTranslator extends GenericFieldTranslator
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function toTranslationSource(ElementTranslator $elementTranslator, Element $element, Field $field, $sourceSite = null)
-    {
-        $source = [];
+	protected $skipNsmFields = ['sex', 'country', 'countryCode', 'administrativeArea', 'mapUrl', 'sortingCode', 'placeData', 'recipient', 'locale', 'dependentLocality', 'additionalName'];
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function toTranslationSource(ElementTranslator $elementTranslator, Element $element, Field $field, $sourceSite = null)
+	{
+		$source = [];
 
 		$blocks = $element->getFieldValue($field->handle)->all();
 
@@ -37,10 +40,10 @@ public function toTranslationSource(ElementTranslator $elementTranslator, Elemen
 	}
 
 	/**
-     * {@inheritdoc}
-     */
-    public function toPostArrayFromTranslationTarget(ElementTranslator $elementTranslator, Element $element, Field $field, $sourceSite, $targetSite, $targetData)
-    {
+	 * {@inheritdoc}
+	 */
+	public function toPostArrayFromTranslationTarget(ElementTranslator $elementTranslator, Element $element, Field $field, $sourceSite, $targetSite, $targetData)
+	{
 		$postArray = [];
 
 		$blocks = $element->getFieldValue($field->handle)->all();
@@ -76,7 +79,7 @@ private function fieldToTranslationSource($block, $key, $sourceSite)
 				$source = array_merge($source, $this->customFieldsToSourceArray($block->serializeValue(), $key));
 				break;
 			default:
-				foreach ($block->getFieldLayout()->getFields() as $field) {
+				foreach ($block->getFieldLayout()->getCustomFields() as $field) {
 					if ($this->getIsTranslatable($field)) {
 						$newKey = sprintf('%s.%s', $key, $field->handle);
 						$value = $block->getFieldValue($field->handle);
diff --git a/src/services/job/ApplyDrafts.php b/src/services/job/ApplyDrafts.php
index 9d72bb31..abc0919e 100644
--- a/src/services/job/ApplyDrafts.php
+++ b/src/services/job/ApplyDrafts.php
@@ -19,7 +19,7 @@ class ApplyDrafts extends BaseJob
     public $orderId;
     public $elementIds;
 
-    public function execute($queue)
+    public function execute($queue): void
     {
         Translations::$plugin->draftRepository->applyDrafts($this->orderId, $this->elementIds, $queue);
     }
@@ -28,7 +28,7 @@ public function updateProgress($queue, $progress) {
         $this->setProgress($queue, $progress);
     }
 
-    protected function defaultDescription()
+    protected function defaultDescription(): ?string
     {
         return Constants::JOB_APPLYING_DRAFT;
     }
diff --git a/src/services/job/CreateDrafts.php b/src/services/job/CreateDrafts.php
index 3c3776ea..2fa09412 100644
--- a/src/services/job/CreateDrafts.php
+++ b/src/services/job/CreateDrafts.php
@@ -22,7 +22,7 @@ class CreateDrafts extends BaseJob
     public $publish;
     public $fileIds;
 
-    public function execute($queue)
+    public function execute($queue): void
     {
         Translations::$plugin->draftRepository->createOrderDrafts(
             $this->orderId, $this->wordCounts, $this->publish, $this->fileIds, $queue
@@ -33,7 +33,7 @@ public function updateProgress($queue, $progress) {
         $queue->setProgress($progress);
     }
 
-    protected function defaultDescription()
+    protected function defaultDescription(): ?string
     {
         return $this->publish ? Constants::JOB_APPLYING_DRAFT : Constants::JOB_CREATING_DRAFT;
     }
diff --git a/src/services/job/DeleteDrafts.php b/src/services/job/DeleteDrafts.php
index 0f1ca9b9..18e921e1 100644
--- a/src/services/job/DeleteDrafts.php
+++ b/src/services/job/DeleteDrafts.php
@@ -15,13 +15,12 @@
 
 use craft\queue\BaseJob;
 use craft\elements\Entry;
-use acclaro\translations\Translations;
 
 class DeleteDrafts extends BaseJob
 {
     public $drafts;
 
-    public function execute($queue)
+    public function execute($queue): void
     {
         $totalElements = count($this->drafts);
         $currentElement = 0;
@@ -33,10 +32,10 @@ public function execute($queue)
 
             try {
                 $draft = Entry::find()
-                            ->draftId($id)
-                            ->anyStatus()
-                            ->siteId('*')
-                            ->one();
+                    ->draftId($id)
+                    ->status(null)
+                    ->siteId('*')
+                    ->one();
 
 
                 if ($draft) {
@@ -50,7 +49,7 @@ public function execute($queue)
         }
     }
 
-    protected function defaultDescription()
+    protected function defaultDescription(): ?string
     {
         return Constants::JOB_DELETING_DRAFT;
     }
diff --git a/src/services/job/ImportFiles.php b/src/services/job/ImportFiles.php
index c96c3f95..e05db869 100644
--- a/src/services/job/ImportFiles.php
+++ b/src/services/job/ImportFiles.php
@@ -36,7 +36,7 @@ class ImportFiles extends BaseJob
      */
     public $fileNames;
 
-    public function execute($queue)
+    public function execute($queue): void
     {
         $this->order = Translations::$plugin->orderRepository->getOrderById($this->orderId);
 
@@ -52,7 +52,7 @@ public function execute($queue)
         }
     }
 
-    protected function defaultDescription()
+    protected function defaultDescription(): ?string
     {
         return Constants::JOB_IMPORTING_FILES;
     }
diff --git a/src/services/job/RegeneratePreviewUrls.php b/src/services/job/RegeneratePreviewUrls.php
index b040cbba..aecb4770 100644
--- a/src/services/job/RegeneratePreviewUrls.php
+++ b/src/services/job/RegeneratePreviewUrls.php
@@ -20,7 +20,7 @@ class RegeneratePreviewUrls extends BaseJob
     public $filePreviewUrls;
     public $files;
 
-    public function execute($queue)
+    public function execute($queue): void
     {
 
         Translations::$plugin->fileRepository->regeneratePreviewUrls($this->order, $this->filePreviewUrls, $this->files, $queue);
@@ -30,7 +30,7 @@ public function updateProgress($queue, $progress) {
         $this->setProgress($queue, $progress);
     }
 
-    protected function defaultDescription()
+    protected function defaultDescription(): ?string
     {
         return Constants::JOB_REGENERATING_PREVIEW_URL;
     }
diff --git a/src/services/job/SyncOrder.php b/src/services/job/SyncOrder.php
index 76ea41fa..6cb840a4 100644
--- a/src/services/job/SyncOrder.php
+++ b/src/services/job/SyncOrder.php
@@ -17,7 +17,7 @@ class SyncOrder extends BaseJob
 {
     public $order;
 
-    public function execute($queue)
+    public function execute($queue): void
     {
 
         Translations::$plugin->orderRepository->syncOrder($this->order, $queue);
@@ -27,7 +27,7 @@ public function updateProgress($queue, $progress) {
         $queue->setProgress($progress);
     }
 
-    protected function defaultDescription()
+    protected function defaultDescription(): ?string
     {
         return 'Syncing order '. $this->order->title;
     }
diff --git a/src/services/job/acclaro/SendOrder.php b/src/services/job/acclaro/SendOrder.php
index cc3a31bf..9227d599 100644
--- a/src/services/job/acclaro/SendOrder.php
+++ b/src/services/job/acclaro/SendOrder.php
@@ -20,7 +20,7 @@ class SendOrder extends BaseJob
     public $sandboxMode;
     public $settings;
 
-    public function execute($queue)
+    public function execute($queue): void
     {
 
         Translations::$plugin->orderRepository->sendAcclaroOrder($this->order, $this->settings, $queue);
@@ -30,7 +30,7 @@ public function updateProgress($queue, $progress) {
         $this->setProgress($queue, $progress);
     }
 
-    protected function defaultDescription()
+    protected function defaultDescription(): ?string
     {
         return Constants::JOB_ACCLARO_SENDING_ORDER;
     }
diff --git a/src/services/job/acclaro/UpdateReviewFileUrls.php b/src/services/job/acclaro/UpdateReviewFileUrls.php
index b948d13b..34fdba92 100644
--- a/src/services/job/acclaro/UpdateReviewFileUrls.php
+++ b/src/services/job/acclaro/UpdateReviewFileUrls.php
@@ -20,7 +20,7 @@ class UpdateReviewFileUrls extends BaseJob
     public $sandboxMode;
     public $settings;
 
-    public function execute($queue)
+    public function execute($queue): void
     {
         $acclaroApiClient = new AcclaroApiClient(
             $this->settings['apiToken'],
@@ -48,7 +48,7 @@ public function execute($queue)
         }
     }
 
-    protected function defaultDescription()
+    protected function defaultDescription(): ?string
     {
         return Constants::JOB_ACCLARO_UPDATING_REVIEW_URL;
     }
diff --git a/src/services/repository/AssetDraftRepository.php b/src/services/repository/AssetDraftRepository.php
index b7521159..51d73eb5 100644
--- a/src/services/repository/AssetDraftRepository.php
+++ b/src/services/repository/AssetDraftRepository.php
@@ -40,37 +40,40 @@ public function makeNewDraft()
     public function getDraftById($draftId)
     {
         $record = AssetDraftRecord::findOne($draftId);
+        $assetDraft = null;
 
-        $assetDraft = new AssetDraftModel($record->toArray([
-            'id',
-            'name',
-            'title',
-            'assetId',
-            'site',
-            'data'
-        ]));
+        if ($record) {
+            $assetDraft = new AssetDraftModel($record->toArray([
+                'id',
+                'name',
+                'title',
+                'assetId',
+                'site',
+                'data'
+            ]));
 
-        $asset = Craft::$app->assets->getAssetById($assetDraft->assetId);
+            $asset = Craft::$app->assets->getAssetById($assetDraft->assetId);
 
-        $assetDraft->draftId = $assetDraft->id;
-        $assetDraft->folderId = $asset->folderId;
-        
-        $assetData = json_decode($record['data'], true);
-        $fieldContent = isset($assetData['fields']) ? $assetData['fields'] : null;
+            $assetDraft->draftId = $assetDraft->id;
+            $assetDraft->folderId = $asset->folderId;
 
-        if ($fieldContent) {
-            $post = array();
+            $assetData = json_decode($record['data'], true);
+            $fieldContent = isset($assetData['fields']) ? $assetData['fields'] : null;
 
-            foreach ($fieldContent as $fieldId => $fieldValue) {
-                $field = Craft::$app->fields->getFieldById($fieldId);
+            if ($fieldContent) {
+                $post = array();
 
-                if ($field) {
-                    $post[$field->handle] = $fieldValue;
+                foreach ($fieldContent as $fieldId => $fieldValue) {
+                    $field = Craft::$app->fields->getFieldById($fieldId);
+
+                    if ($field) {
+                        $post[$field->handle] = $fieldValue;
+                    }
                 }
-            }
 
-            $assetDraft->setFieldValues($post);
-            Craft::$app->getElements()->saveElement($assetDraft);
+                $assetDraft->setFieldValues($post);
+                Craft::$app->getElements()->saveElement($assetDraft);
+            }
         }
 
         return $assetDraft;
@@ -125,7 +128,7 @@ public function saveDraft(Asset $draft, array $content = [])
                     array(':assetId' => $draft->id, ':site' => $draft->site)
                 )
                 ->count('id');
-            
+
             $draft->name = Translations::$plugin->translator->translate('app', 'Draft {num}', array('num' => $totalDrafts + 1));
         }
 
@@ -151,14 +154,14 @@ public function saveDraft(Asset $draft, array $content = [])
                 $content[$fieldHandle] = $draft->getBehavior('customFields')->$fieldHandle;
             }
         }
-        
+
         $asset = $this->getAssetById($record->assetId, $draft->site);
 
-        foreach ($asset->getFieldLayout()->getFields() as $layoutField) {
+        foreach ($asset->getFieldLayout()->getCustomFields() as $layoutField) {
             $field = Craft::$app->fields->getFieldById($layoutField->id);
 
             if ($field->getIsTranslatable() || in_array(get_class($field), Constants::NESTED_FIELD_TYPES)) {
-                if (isset($content[$field->handle]) && $content[$field->handle] !== null) { 
+                if (isset($content[$field->handle]) && $content[$field->handle] !== null) {
                     $data['fields'][$field->id] = $content[$field->handle];
                 }
             }
@@ -175,7 +178,7 @@ public function saveDraft(Asset $draft, array $content = [])
                 }
 
                 $draft->draftId = $record->id;
-                
+
                 return true;
             }
         } catch (Exception $e) {
@@ -204,7 +207,7 @@ public function publishDraft(Asset $draft)
         $asset->setScenario(Element::SCENARIO_LIVE);
 
         $success = Craft::$app->elements->saveElement($asset);
-        
+
         if (!$success) {
             Craft::error( '['. __METHOD__ .'] Couldn’t publish draft "'.$draft->title.'"', 'translations' );
             return false;
@@ -252,7 +255,7 @@ public function deleteDraft(Asset $draft)
                 if ($transaction !== null) {
                     $transaction->commit();
                 }
-                
+
                 return true;
             }
         } catch (Exception $e) {
diff --git a/src/services/repository/CategoryDraftRepository.php b/src/services/repository/CategoryDraftRepository.php
deleted file mode 100644
index ffbb56c7..00000000
--- a/src/services/repository/CategoryDraftRepository.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-/**
- * Translations for Craft plugin for Craft CMS 3.x
- *
- * Translations for Craft eliminates error prone and costly copy/paste workflows for launching human translated Craft CMS web content.
- *
- * @link      http://www.acclaro.com/
- * @copyright Copyright (c) 2018 Acclaro
- */
-
-namespace acclaro\translations\services\repository;
-
-use Craft;
-use Exception;
-use craft\base\Element;
-use craft\elements\Category;
-use acclaro\translations\Constants;
-use acclaro\translations\Translations;
-use acclaro\translations\models\CategoryDraftModel;
-use acclaro\translations\records\CategoryDraftRecord;
-
-class CategoryDraftRepository
-{
-    public function makeNewDraft()
-    {
-        return new CategoryDraftModel();
-    }
-
-    public function getDraftById($draftId)
-    {
-        $record = CategoryDraftRecord::findOne($draftId);
-
-        $categoryDraft = new CategoryDraftModel($record->toArray([
-            'id',
-            'name',
-            'title',
-            'categoryId',
-            'site',
-            'data'
-        ]));
-
-        $category = Craft::$app->categories->getCategoryById($categoryDraft->categoryId);
-        $categoryDraft->groupId = $category->groupId;
-
-        $categoryDraft->draftId = $categoryDraft->id;
-        
-        $categoryData = json_decode($record['data'], true);
-        $fieldContent = isset($categoryData['fields']) ? $categoryData['fields'] : null;
-
-        if ($fieldContent) {
-            $post = array();
-
-            foreach ($fieldContent as $fieldId => $fieldValue) {
-                $field = Craft::$app->fields->getFieldById($fieldId);
-
-                if ($field) {
-                    $post[$field->handle] = $fieldValue;
-                }
-            }
-
-            $categoryDraft->setFieldValues($post);
-        }
-
-        return $categoryDraft;
-    }
-    
-    public function getDraftsByCategoryId($categoryId, $site = null)
-    {
-        $attributes = array(
-            'categoryId' => $categoryId,
-            'site' => $site ?: Craft::$app->sites->getPrimarySite()->id
-        );
-
-        $records = CategoryDraftModel::find()->where($attributes)->all();
-
-        foreach ($records as $key => $record) {
-            $categoryDrafts[$key] = new CategoryDraftModel($record->toArray([
-                'id',
-                'name',
-                'title',
-                'categoryId',
-                'site',
-                'data'
-            ]));
-
-            $categoryDrafts[$key]->draftId = $categoryDrafts[$key]->id;
-        }
-
-        return $records ? $categoryDrafts : array();
-    }
-
-    public function getDraftRecord(Category $draft)
-    {
-        if (isset($draft->draftId)) {
-            $record = CategoryDraftRecord::findOne($draft->draftId);
-
-            if (!$record) {
-                throw new Exception(Translations::$plugin->translator->translate('app', 'No draft exists with the ID “{id}”.', array('id' => $draft->draftId)));
-            }
-        } else {
-            $record = new CategoryDraftRecord();
-            $record->categoryId = $draft->id;
-            $record->site = $draft->site;
-            $record->name = $draft->name;
-            $record->title = $draft->title;
-        }
-
-        return $record;
-    }
-
-    public function saveDraft(Category $draft, array $content = [])
-    {
-        $record = $this->getDraftRecord($draft);
-
-        if (!$draft->name && $draft->id) {
-            $totalDrafts = Craft::$app->getDb()->createCommand()
-                ->from('translations_categorydrafts')
-                ->where(
-                    array('and', 'categoryId = :categoryId', 'site = :site'),
-                    array(':categoryId' => $draft->id, ':site' => $draft->site)
-                )
-                ->count('id');
-            
-            $draft->name = Translations::$plugin->translator->translate('app', 'Draft {num}', array('num' => $totalDrafts + 1));
-        }
-
-        if (is_null($draft->categoryId)) {
-            $record->categoryId = $draft->id; // This works for creating an order
-        } else {
-            $record->categoryId = $draft->categoryId; // This works post-order
-        }
-        $record->site = $draft->site;
-        $record->name = $draft->name;
-        $record->title = $draft->title;
-
-        $data = array(
-            'fields' => array(),
-        );
-
-        $category = Craft::$app->getCategories()->getCategoryById($record->categoryId, $draft->site);
-        if (empty($draft->groupId)) {
-            $draft->groupId = $category->groupId;
-        }
-
-        $draft->siteId = $draft->site;
-        
-        $content = $content ?? [];
-
-        if (empty($content)) {
-            foreach ($draft->getDirtyFields() as $key => $fieldHandle) {
-                $content[$fieldHandle] = $draft->getBehavior('customFields')->$fieldHandle;
-            }
-        }
-
-        foreach ($draft->getFieldLayout()->getFields() as $layoutField) {
-            $field = Craft::$app->fields->getFieldById($layoutField->id);
-
-            if ($field->getIsTranslatable() || in_array(get_class($field), Constants::NESTED_FIELD_TYPES)) {
-                if (isset($content[$field->handle]) && $content[$field->handle] !== null) { 
-                    $data['fields'][$field->id] = $content[$field->handle];
-                }
-            }
-        }
-
-        $record->data = $data;
-
-        $transaction = Craft::$app->db->getTransaction() === null ? Craft::$app->db->beginTransaction() : null;
-
-        try {
-            if ($record->save(false)) {
-                if ($transaction !== null) {
-                    $transaction->commit();
-                }
-
-                $draft->draftId = $record->id;
-                
-                return true;
-            }
-        } catch (Exception $e) {
-            if ($transaction !== null) {
-                $transaction->rollback();
-            }
-
-            throw $e;
-        }
-
-        return false;
-    }
-
-    public function publishDraft(Category $draft)
-    {
-        $post = [];
-
-        foreach ($draft->getDirtyFields() as $key => $fieldHandle) {
-            $post[$fieldHandle] = $draft->getBehavior('customFields')->$fieldHandle;
-        }
-
-        $category = Craft::$app->categories->getCategoryById($draft->categoryId, $draft->site);
-        $category->title = $draft->title;
-        $category->setFieldValues($post);
-        
-        $success = Craft::$app->elements->saveElement($category);
-        
-        if (!$success) {
-            Craft::error( '['. __METHOD__ .'] Couldn’t publish draft "'.$draft->title.'"', 'translations' );
-            return false;
-        }
-
-        return true;
-    }
-
-    public function deleteDraft(Category $draft)
-    {
-        try {
-            $record = $this->getDraftRecord($draft);
-        } catch (Exception $e) {
-            return false;
-        }
-
-        $transaction = Craft::$app->db->getTransaction() === null ? Craft::$app->db->beginTransaction() : null;
-
-        try {
-            if ($record->delete(false)) {
-                if ($transaction !== null) {
-                    $transaction->commit();
-                }
-                
-                return true;
-            }
-        } catch (Exception $e) {
-            if ($transaction !== null) {
-                $transaction->rollback();
-            }
-
-            throw $e;
-        }
-    }
-
-    public function createDraft(Category $category, $site, $orderName, $sourceSite)
-    {
-        try {
-            $draft = $this->makeNewDraft();
-            
-            $draft->name = sprintf('%s [%s]', $orderName, $site);
-            $draft->id = $category->id;
-            $draft->title = $category->title;
-            $draft->site = $site;
-            $draft->siteId = $site;
-            $draft->sourceSite = $sourceSite;
-
-            $post = Translations::$plugin->elementTranslator->toPostArray($category);
-
-            $draft->setFieldValues($post);
-
-            $this->saveDraft($draft, $post);
-            return $draft;
-        } catch (Exception $e) {
-
-            Craft::error( '['. __METHOD__ .'] CreateDraft exception:: '.$e->getMessage(), 'translations');
-            return [];
-        }
-
-    }
-}
diff --git a/src/services/repository/CategoryRepository.php b/src/services/repository/CategoryRepository.php
index e75fdf84..383f0305 100644
--- a/src/services/repository/CategoryRepository.php
+++ b/src/services/repository/CategoryRepository.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Translations for Craft plugin for Craft CMS 3.x
  *
@@ -11,28 +12,38 @@
 namespace acclaro\translations\services\repository;
 
 use Craft;
+use craft\base\Component;
 use craft\elements\Category;
 
-class CategoryRepository
+class CategoryRepository extends Component
 {
     public function find($attributes = null)
     {
         return Category::find()
-                ->siteId($attributes['siteId'])
-                ->groupId($attributes['groupId'])
-                ->one();
+            ->siteId($attributes['siteId'])
+            ->groupId($attributes['groupId'])
+            ->one();
     }
 
-    public function getCategoryById($id, $site=null)
+    public function getCategoryById($id, $site = null)
     {
         return Craft::$app->getCategories()->getCategoryById($id, $site);
     }
 
+    public function getDraftById($draftId, $siteId)
+    {
+        return Category::find()
+            ->draftId($draftId)
+            ->siteId($siteId)
+            ->status(null)
+            ->one();
+    }
+
     public function saveCategory(Category $category)
     {
         $success = Craft::$app->elements->saveElement($category);
         if (!$success) {
-            Craft::error( '['. __METHOD__ .'] Couldn’t save the category "'.$category->title.'"', 'translations' );
+            Craft::error('[' . __METHOD__ . '] Couldn’t save the category "' . $category->title . '"', 'translations');
         }
     }
 }
diff --git a/src/services/repository/DraftRepository.php b/src/services/repository/DraftRepository.php
index 9635002e..ffd76224 100644
--- a/src/services/repository/DraftRepository.php
+++ b/src/services/repository/DraftRepository.php
@@ -14,7 +14,6 @@
 use Exception;
 use craft\elements\Asset;
 use craft\elements\Entry;
-use craft\elements\Category;
 use craft\elements\GlobalSet;
 use yii\web\NotFoundHttpException;
 use craft\errors\InvalidElementException;
@@ -28,30 +27,12 @@
 
 class DraftRepository
 {
-    /**
-     * @return \craft\elements\Entry|null
-     */
-    public function makeNewDraft($entry, $creatorId, $name, $notes, $newAttributes)
-    {
-        $draft = Craft::$app->getDrafts()->createDraft(
-            $entry,
-            $creatorId,
-            $name,
-            $notes,
-            $newAttributes
-        );
-
-        $draft->setAttributes($newAttributes, false);
-
-        return $draft;
-    }
-
     public function getDraftById($draftId, $siteId)
     {
         $draft = Entry::find()
             ->draftId($draftId)
             ->siteId($siteId)
-            ->anyStatus()
+            ->status(null)
             ->one();
 
         return $draft;
@@ -67,12 +48,42 @@ public function saveDraft($element)
         return Craft::$app->elements->saveElement($element, true, true, false);
     }
 
-    public function publishDraft(Entry $draft)
+    public function publishDraft($element, FileModel $file, $draft)
     {
-        // Let's save the draft before we pass it to publishDraft()
-        Craft::$app->elements->saveElement($draft, true, true, false);
+        $success = null;
 
-        return Craft::$app->getDrafts()->publishDraft($draft);
+        if ($draft) {
+            switch (get_class($element)) {
+                case Asset::class:
+                    $assetDraftRepo = Translations::$plugin->assetDraftRepository;
+
+                    // keep original asset name
+                    $draft->name = $element->title;
+                    $draft->site = $file->targetSite;
+
+                    $success = $assetDraftRepo->publishDraft($draft);
+
+                    if ($success) {
+                        $assetDraftRepo->deleteDraft($draft);
+                    }
+                    break;
+                case GlobalSet::class:
+                    $globalSetDraftRepo = Translations::$plugin->globalSetDraftRepository;
+
+                    // keep original global set name
+                    $draft->name = $element->name;
+                    $success = $globalSetDraftRepo->publishDraft($draft);
+
+                    if ($success) {
+                        $globalSetDraftRepo->deleteDraft($draft);
+                    }
+                    break;
+                default:
+                    $success = $this->applyTranslationDraft($file->id, $file, $draft);
+            }
+        }
+
+        return $success;
     }
 
     public function isTranslationDraft($draftId, $elementId=null)
@@ -128,7 +139,7 @@ public function applyTranslationDraft($fileId, $file='', $draft='')
 
         // Get file's draft
         if(!$draft){
-            $draft = Translations::$plugin->draftRepository->getDraftById($file->draftId, $file->targetSite);
+            $draft = $file->hasDraft();
         }
 
         if (!$draft) {
@@ -142,7 +153,7 @@ public function applyTranslationDraft($fileId, $file='', $draft='')
             }
 
             // Apply the draft to the entry
-            $newEntry = Craft::$app->getDrafts()->publishDraft($draft);
+            $newEntry = Craft::$app->getDrafts()->applyDraft($draft);
         } catch (InvalidElementException $e) {
             Craft::$app->getSession()->setError(Craft::t('app', 'Couldn’t publish draft.'));
             // Send the draft back to the template
@@ -170,32 +181,27 @@ public function createOrderDrafts($orderId, $wordCounts, $publish, $fileIds, $qu
                 continue;
             }
 
-            $element = Craft::$app->getElements()->getElementById($file->elementId, null, $order->sourceSite);
+            $element = Translations::$plugin->elementRepository->getElementById($file->elementId, $order->sourceSite);
             $isFileReady = $file->isReviewReady();
 
             if ($queue) {
                 $createDrafts->updateProgress($queue, $currentElement++/$totalElements);
             }
 
-			// Create draft only if not already exist
-			if ($file->draftId && $this->getDraftById($file->draftId, $file->targetSite)) {
+            // Create draft only if not already exist
+            if ($file->hasDraft()) {
                 $file->status = Constants::FILE_STATUS_COMPLETE;
                 Translations::$plugin->fileRepository->saveFile($file);
-			} else {
-				$isNewDraft = true;
-				$this->createDrafts($element, $order, $file->targetSite, $wordCounts, $file);
+            } else {
+                $isNewDraft = true;
+                $this->createDrafts($element, $order, $file->targetSite, $wordCounts, $file);
             }
 
             try {
                 if ($isFileReady) {
-                    $translation_service = $order->translator->service;
-                    if ($translation_service !== Constants::TRANSLATOR_DEFAULT) {
-                        $translation_service = Constants::TRANSLATOR_DEFAULT;
-                    }
-
-                    //Translation Service
+                    // Translation Service Always Local
                     $translationService = Translations::$plugin->translatorFactory
-                        ->makeTranslationService($translation_service, $order->translator->getSettings());
+                        ->makeTranslationService(Constants::TRANSLATOR_DEFAULT, $order->translator->getSettings());
 
                     $translationService->updateIOFile($order, $file);
 
@@ -234,19 +240,16 @@ public function createOrderDrafts($orderId, $wordCounts, $publish, $fileIds, $qu
     public function createDrafts($element, $order, $site, $wordCounts, $file=null)
     {
 		$element = $element->getIsDraft() ? $element->getCanonical() : $element;
+
         switch (get_class($element)) {
-            case Entry::class:
-                $draft = Translations::$plugin->entryRepository->createDraft($element, $site, $order->title);
-                break;
             case GlobalSet::class:
                 $draft = Translations::$plugin->globalSetDraftRepository->createDraft($element, $site, $order->title);
                 break;
-            case Category::class:
-                $draft = Translations::$plugin->categoryDraftRepository->createDraft($element, $site, $order->title, $order->sourceSite);
-                break;
             case Asset::class:
                 $draft = Translations::$plugin->assetDraftRepository->createDraft($element, $site, $order->title, $order->sourceSite);
                 break;
+            default:
+                $draft = Translations::$plugin->entryRepository->createDraft($element, $site, $order->title);
         }
 
         if (!($file instanceof FileModel)) {
@@ -258,7 +261,7 @@ public function createDrafts($element, $order, $site, $wordCounts, $file=null)
             return false;
         }
 
-        if ($draft instanceof GlobalSet || $draft instanceof Category || $draft instanceof Asset) {
+        if (!$file->hasPreview()) {
             $targetSite = $draft->site;
         } else {
             $targetSite = $draft->siteId;
@@ -323,70 +326,10 @@ public function applyDrafts($orderId, $elementIds, $fileIds, $queue=null)
                     $applyDraft->updateProgress($queue, $currentElement++ / $totalElements);
                 }
 
-                $element = Craft::$app->getElements()->getElementById($file->elementId, null, $file->sourceSite);
-
-                if ($element instanceof GlobalSet) {
-                    $draft = Translations::$plugin->globalSetDraftRepository->getDraftById($file->draftId);
-
-                    // keep original global set name
-                    $draft->name = $element->name;
-
-                    if ($draft) {
-                        $success = Translations::$plugin->globalSetDraftRepository->publishDraft($draft);
-
-                        if ($success) {
-                            Translations::$plugin->globalSetDraftRepository->deleteDraft($draft);
-                        }
-                    } else {
-                        $success = false;
-                    }
-
-                    // $uri = Translations::$plugin->urlGenerator->generateFileUrl($element, $file);
-                } else if ($element instanceof Category) {
-                    $draft = Translations::$plugin->categoryDraftRepository->getDraftById($file->draftId);
-
-                    // keep original category name
-                    $draft->name = $element->title;
-                    $draft->site = $file->targetSite;
-
-                    if ($draft) {
-                        $success = Translations::$plugin->categoryDraftRepository->publishDraft($draft);
-
-                        if ($success) {
-                            Translations::$plugin->categoryDraftRepository->deleteDraft($draft);
-                        }
-                    } else {
-                        $success = false;
-                    }
-
-                    // $uri = Translations::$plugin->urlGenerator->generateFileUrl($element, $file);
-                } else if ($element instanceof Asset) {
-                    $draft = Translations::$plugin->assetDraftRepository->getDraftById($file->draftId);
-
-                    // keep original asset name
-                    $draft->name = $element->title;
-                    $draft->site = $file->targetSite;
-
-                    if ($draft) {
-                        $success = Translations::$plugin->assetDraftRepository->publishDraft($draft);
+                $draft = $file->hasDraft();
+                $element = $file->getElement();
+                $success = $this->publishDraft($element, $file, $draft);
 
-                        if ($success) {
-                            Translations::$plugin->assetDraftRepository->deleteDraft($draft);
-                        }
-                    } else {
-                        $success = false;
-                    }
-
-                    // $uri = Translations::$plugin->urlGenerator->generateFileUrl($element, $file);
-                } else {
-                    $draft = $this->getDraftById($file->draftId, $file->targetSite);
-
-                    if ($draft) {
-                        $success = $this->applyTranslationDraft($file->id, $file, $draft);
-                    } else {
-                        $success = false;
-                    }
-                }
                 if ($success) {
                     $oldTokenRoute = json_encode(array(
                         'action' => 'entries/view-shared-entry',
@@ -442,6 +385,8 @@ public function applyDrafts($orderId, $elementIds, $fileIds, $queue=null)
      */
     public function deleteDraft($draftId, $siteId)
     {
+        if (! $draftId) return;
+
         $transaction = Craft::$app->getDb()->beginTransaction();
 
         try {
diff --git a/src/services/repository/ElementRepository.php b/src/services/repository/ElementRepository.php
index 77796dea..e768feff 100644
--- a/src/services/repository/ElementRepository.php
+++ b/src/services/repository/ElementRepository.php
@@ -15,9 +15,9 @@
 
 class ElementRepository
 {
-	public function getElementById($elementId, $siteId)
+    public function getElementById($elementId, $siteId = null)
     {
-		return Craft::$app->elements->getElementById($elementId, null, $siteId);
+        return Craft::$app->getElements()->getElementById($elementId, null, $siteId);
     }
 
     public function getElementByDraftId($draftId, $siteId = null)
@@ -25,11 +25,12 @@ public function getElementByDraftId($draftId, $siteId = null)
         if (! $siteId) {
             $siteId = Craft::$app->getSites()->getPrimarySite()->id;
         }
+
         return Entry::find()
             ->draftId($draftId)
             ->provisionalDrafts(false)
             ->siteId($siteId)
-            ->anyStatus()
+            ->status(null)
             ->one();
     }
 }
diff --git a/src/services/repository/EntryRepository.php b/src/services/repository/EntryRepository.php
index 8acea56c..7b59ff0a 100644
--- a/src/services/repository/EntryRepository.php
+++ b/src/services/repository/EntryRepository.php
@@ -12,16 +12,16 @@
 
 use Craft;
 use craft\elements\User;
-use craft\elements\Entry;
 use craft\base\Component;
 use craft\services\Drafts;
 use craft\events\DraftEvent;
 use craft\behaviors\DraftBehavior;
 use acclaro\translations\Translations;
+use craft\base\ElementInterface;
 
 class EntryRepository extends Component
 {
-    public function createDraft(Entry $entry, $site, $orderName)
+    public function createDraft(ElementInterface $entry, $site, $orderName)
     {
         $allSitesHandle = Translations::$plugin->siteRepository->getAllSitesHandle();
 
@@ -49,12 +49,12 @@ public function createDraft(Entry $entry, $site, $orderName)
         }
     }
 
-	private function makeNewDraft($source, $creatorId, $name, $notes, $newAttributes, $provisional = false)
+	private function makeNewDraft($canonical, $creatorId, $name, $notes, $newAttributes, $provisional = false)
 	{
-		$canonical = $source->getIsDraft() ? $source->getCanonical() : $source;
+		$canonical = $canonical->getIsDraft() ? $canonical->getCanonical() : $canonical;
 		// Fire a 'beforeCreateDraft' event
         $event = new DraftEvent([
-            'source' => $source,
+            'canonical' => $canonical,
             'creatorId' => $creatorId,
             'provisional' => $provisional,
             'draftName' => $name,
@@ -67,7 +67,7 @@ private function makeNewDraft($source, $creatorId, $name, $notes, $newAttributes
 		$transaction = Craft::$app->getDb()->beginTransaction();
         try {
             // Create the draft row
-            $draftId = (new Drafts())->insertDraftRow($name, $notes, $creatorId, $canonical->id, $source::trackChanges(), $provisional);
+            $draftId = (new Drafts())->insertDraftRow($name, $notes, $creatorId, $canonical->id, $canonical::trackChanges(), $provisional);
 
             // Duplicate the element
             $newAttributes['isProvisionalDraft'] = $provisional;
@@ -78,10 +78,10 @@ private function makeNewDraft($source, $creatorId, $name, $notes, $newAttributes
                 'creatorId' => $creatorId,
                 'draftName' => $name,
                 'draftNotes' => $notes,
-                'trackChanges' => $source::trackChanges(),
+                'trackChanges' => $canonical::trackChanges(),
             ];
 
-            $draft = Craft::$app->getElements()->duplicateElement($source, $newAttributes);
+            $draft = Craft::$app->getElements()->duplicateElement($canonical, $newAttributes);
 
             $transaction->commit();
         } catch (\Throwable $e) {
@@ -92,7 +92,7 @@ private function makeNewDraft($source, $creatorId, $name, $notes, $newAttributes
         // Fire an 'afterCreateDraft' event
         if ($this->hasEventHandlers('afterCreateDraft')) {
             $this->trigger('afterCreateDraft', new DraftEvent([
-                'source' => $source,
+                'canonical' => $canonical,
                 'creatorId' => $creatorId,
                 'provisional' => $provisional,
                 'draftName' => $name,
diff --git a/src/services/repository/FileRepository.php b/src/services/repository/FileRepository.php
index cf317c6c..a34abb63 100644
--- a/src/services/repository/FileRepository.php
+++ b/src/services/repository/FileRepository.php
@@ -13,6 +13,10 @@
 use Craft;
 use Exception;
 use yii\db\Query;
+use craft\elements\Asset;
+use craft\elements\Category;
+use craft\elements\GlobalSet;
+
 use acclaro\translations\Constants;
 use acclaro\translations\Translations;
 use acclaro\translations\models\FileModel;
@@ -209,7 +213,8 @@ public function deleteByDraftId($draftId, $elementId=null)
 
         if ($record && $record->draftId) {
             $element = Translations::$plugin->elementRepository->getElementByDraftId($record->draftId, $record->sourceSite);
-            Craft::$app->getElements()->deleteElement($element);
+            if ($element)
+                Craft::$app->getElements()->deleteElement($element);
         }
 
         return $record->delete();
@@ -226,8 +231,18 @@ public function delete($orderId, $elementId = null, $targetSite = null)
 
         foreach($records as $record) {
             if ($record && $record->draftId) {
-                $element = Translations::$plugin->elementRepository->getElementByDraftId($record->draftId, $record->sourceSite);
-                Craft::$app->getElements()->deleteElement($element);
+                $file = new FileModel($record->toArray([
+                    'id',
+                    'orderId',
+                    'elementId',
+                    'draftId',
+                    'sourceSite',
+                    'targetSite',
+                    'status',
+                ]));
+
+                if ($element = $file->hasDraft())
+                    Craft::$app->getElements()->deleteElement($element);
             }
             $record->delete();
         }
@@ -370,7 +385,7 @@ public function createOrderFiles($order, $wordCounts)
 
     public function createOrderFile($order, $elementId, $targetSite)
     {
-        $element = Craft::$app->getElements()->getElementById($elementId);
+        $element = Translations::$plugin->elementRepository->getElementById($elementId);
         $wordCount = Translations::$plugin->elementTranslator->getWordCount($element) ?? 0;
 
         $file = $this->makeNewFile();
@@ -403,7 +418,7 @@ public function getUploadedFilesWordCount($asset, $format)
             return 0;
         }
 
-        $element = Craft::$app->getElements()->getElementById($elementId);
+        $element = Translations::$plugin->elementRepository->getElementById($elementId);
 
         if (! $element) return 0;
 
@@ -486,12 +501,11 @@ public function isReferenceChanged($file)
     public function checkTmMisalignments($file)
     {
         try {
-            $elementRepository = Translations::$plugin->elementRepository;
-            $element = $elementRepository->getElementById($file->elementId, $file->targetSite);
+            $element = $file->getElement();
             $source = $file->source;
 
             if ($file->isComplete()) {
-                $element = $elementRepository->getElementByDraftId($file->draftId, $file->targetSite);
+                $element = $this->getDraft($file);
                 $source = $file->target;
             }
 
@@ -528,6 +542,31 @@ public function checkTmMisalignments($file)
         return false;
     }
 
+    // Draft Actions
+
+    public function getDraft(FileModel $file)
+    {
+        $draft = null;
+
+        if ($file->draftId && $element = $file->getElement()) {
+            switch (get_class($element)) {
+                case GlobalSet::class:
+                    $draft = Translations::$plugin->globalSetDraftRepository->getDraftById($file->draftId);
+                    break;
+                case Category::class:
+                    $draft = Translations::$plugin->categoryRepository->getDraftById($file->draftId, $file->targetSite);
+                    break;
+                case Asset::class:
+                    $draft = Translations::$plugin->assetDraftRepository->getDraftById($file->draftId);
+                    break;
+                default:
+                    $draft = Translations::$plugin->draftRepository->getDraftById($file->draftId, $file->targetSite);
+            }
+        }
+
+        return $draft;
+    }
+
     public function createReferenceData(array $data, $ignoreCommon = true)
     {
         $sourceLanguage = Craft::$app->sites->getSiteById($data['sourceElementSite'])->language;
diff --git a/src/services/repository/GlobalSetDraftRepository.php b/src/services/repository/GlobalSetDraftRepository.php
index 3858c4ef..fb819ba1 100644
--- a/src/services/repository/GlobalSetDraftRepository.php
+++ b/src/services/repository/GlobalSetDraftRepository.php
@@ -31,6 +31,8 @@ public function getDraftById($draftId)
     {
         $record = GlobalSetDraftRecord::findOne($draftId);
 
+        if (!$record) return null;
+
         $globalSetDraft = new GlobalSetDraftModel($record->toArray([
             'id',
             'name',
@@ -135,7 +137,7 @@ public function saveDraft(GlobalSet $draft, array $content = [])
 
         $content = $content ?? Translations::$plugin->elementTranslator->toPostArray($draft);
 
-        foreach ($draft->getFieldLayout()->getFields() as $layoutField) {
+        foreach ($draft->getFieldLayout()->getCustomFields() as $layoutField) {
             $field = Craft::$app->fields->getFieldById($layoutField->id);
 
             if ($field->getIsTranslatable() || in_array(get_class($field), Constants::NESTED_FIELD_TYPES)) {
diff --git a/src/services/repository/OrderRepository.php b/src/services/repository/OrderRepository.php
index 787301d4..18388733 100644
--- a/src/services/repository/OrderRepository.php
+++ b/src/services/repository/OrderRepository.php
@@ -38,7 +38,7 @@ class OrderRepository
      */
     public function getOrderById($orderId)
     {
-        return Craft::$app->elements->getElementById($orderId);
+        return Translations::$plugin->elementRepository->getElementById($orderId);
     }
 
     /**
@@ -94,7 +94,7 @@ public function getOpenOrders()
     }
 
     /**
-     * @return \craft\elements\db\ElementQuery
+     * @return array
      */
     public function getInProgressOrders()
     {
@@ -112,7 +112,7 @@ public function getInProgressOrders()
     }
 
     /**
-     * @return \craft\elements\db\ElementQuery
+     * @return array
      */
     public function getInProgressOrdersByTranslatorId($translatorId)
     {
@@ -124,7 +124,7 @@ public function getInProgressOrdersByTranslatorId($translatorId)
     }
 
     /**
-     * @return \craft\elements\db\ElementQuery
+     * @return array
      */
     public function getCompleteOrders()
     {
@@ -483,19 +483,19 @@ public function getNewStatus($order)
      */
     public function getFileTitle($file) {
 
-		$element = Craft::$app->getElements()->getElementById($file->elementId, null, $file->sourceSite);
+        $element = Translations::$plugin->elementRepository->getElementById($file->elementId, $file->sourceSite);
 
         if ($element instanceof GlobalSet) {
             $draftElement = Translations::$plugin->globalSetDraftRepository->getDraftById($file->draftId);
         } else if ($element instanceof Category) {
-            $draftElement = Translations::$plugin->categoryDraftRepository->getDraftById($file->draftId);
+            $draftElement = Translations::$plugin->categoryRepository->getDraftById($file->draftId, $file->targetSite);
         } else if ($element instanceof Asset) {
             $draftElement = Translations::$plugin->assetDraftRepository->getDraftById($file->draftId);
         } else {
             $draftElement = Translations::$plugin->draftRepository->getDraftById($file->draftId, $file->targetSite);
         }
 
-		return $draftElement->title ?? $element->title;
+        return $draftElement->title ?? $draftElement->name ?? $element->title;
     }
 
     /**
@@ -514,6 +514,10 @@ public function getIsSourceChanged($order): ?array
 
                 try {
                     $element = Craft::$app->getElements()->getElementById($file->elementId, null, $file->sourceSite);
+
+                    /** Skip in case the source entry is deleted */
+                    if (! $element) throw new Exception('Source entry not found');
+
                     $wordCount = Translations::$plugin->elementTranslator->getWordCount($element);
                     $converter = Translations::$plugin->elementToFileConverter;
 
@@ -557,7 +561,7 @@ public function getIsTargetChanged($order): ?array
 		$originalIds = [];
 
 		foreach ($order->getFiles() as $file) {
-			if ($file->isPublished() || $file->isNew()) continue;
+            if ($file->isPublished() || $file->isNew() || $file->isModified()) continue;
 
 			if ($file->hasTmMisalignments()) array_push($originalIds, $file->elementId);
 		}
diff --git a/src/services/repository/WidgetRepository.php b/src/services/repository/WidgetRepository.php
new file mode 100644
index 00000000..53b3c7cf
--- /dev/null
+++ b/src/services/repository/WidgetRepository.php
@@ -0,0 +1,492 @@
+<?php
+
+/**
+ * Translations for Craft plugin for Craft CMS 3.x
+ *
+ * Translations for Craft eliminates error prone and costly copy/paste workflows for launching human translated Craft CMS web content.
+ *
+ * @link      http://www.acclaro.com/
+ * @copyright Copyright (c) 2018 Acclaro
+ */
+
+namespace acclaro\translations\services\repository;
+
+use acclaro\translations\Constants;
+use Craft;
+use craft\db\Query;
+use craft\services\Users;
+use craft\helpers\Component;
+use craft\helpers\FileHelper;
+use craft\events\WidgetEvent;
+use craft\base\WidgetInterface;
+use craft\widgets\MissingWidget;
+use craft\errors\WidgetNotFoundException;
+use craft\errors\MissingComponentException;
+use acclaro\translations\records\WidgetRecord;
+
+// Widget Classes
+use acclaro\translations\widgets\News;
+use acclaro\translations\widgets\Translators;
+use acclaro\translations\widgets\RecentOrders;
+use acclaro\translations\widgets\LanguageCoverage;
+use acclaro\translations\widgets\NewAndModifiedEntries;
+use yii\base\Component as BaseComponent;
+
+class WidgetRepository extends BaseComponent
+{
+    /**
+     * @event WidgetEvent The event that is triggered before a widget is saved.
+     */
+    const EVENT_BEFORE_SAVE_TRANSLATIONS_WIDGET = 'beforeSaveTranslationsWidget';
+    /**
+     * @event WidgetEvent The event that is triggered after a widget is saved.
+     */
+    const EVENT_AFTER_SAVE_TRANSLATIONS_WIDGET = 'afterSaveTranslationsWidget';
+    /**
+     * @event WidgetEvent The event that is triggered before a widget is deleted.
+     */
+    const EVENT_BEFORE_DELETE_TRANSLATIONS_WIDGET = 'beforeDeleteTranslationsWidget';
+    /**
+     * @event WidgetEvent The event that is triggered after a widget is deleted.
+     */
+    const EVENT_AFTER_DELETE_TRANSLATIONS_WIDGET = 'afterDeleteTranslationsWidget';
+
+    /**
+     * Returns all available widget type classes.
+     *
+     * @return string[]
+     */
+    public function getAllWidgetTypes(): array
+    {
+        $widgetTypes = [
+            News::class,
+            Translators::class,
+            RecentOrders::class,
+            NewAndModifiedEntries::class,
+            LanguageCoverage::class,
+        ];
+
+        return $widgetTypes;
+    }
+
+    /**
+     * Creates a widget with a given config.
+     *
+     * @param mixed $config The widget’s class name, or its config, with a `type` value and optionally a `settings` value.
+     * @return WidgetInterface
+     */
+    public function createWidget($config): WidgetInterface
+    {
+        if (is_string($config)) {
+            $config = ['type' => $config];
+        }
+
+        try {
+            /** @var Widget $widget */
+            $widget = Component::createComponent($config, WidgetInterface::class);
+        } catch (MissingComponentException $e) {
+            $config['errorMessage'] = $e->getMessage();
+            $config['expectedType'] = $config['type'];
+            unset($config['type']);
+            $widget = new MissingWidget($config);
+        }
+        return $widget;
+    }
+
+    /**
+     * Returns the dashboard widgets for the current user.
+     *
+     * @return WidgetInterface[] The widgets
+     */
+    public function getAllWidgets(): array
+    {
+        $widgets = $this->_getUserWidgets();
+        // If there are no widgets, this is the first time they've hit the dashboard.
+        if (!$widgets) {
+            // Add the defaults and try again
+            $this->_addDefaultUserWidgets();
+            $widgets = $this->_getUserWidgets();
+        }
+        return $widgets;
+    }
+
+    /**
+     * Returns whether the current user has a widget of the given type.
+     *
+     * @param string $type The widget type
+     * @return bool Whether the current user has a widget of the given type
+     */
+    public function doesUserHaveWidget(string $type): bool
+    {
+        return WidgetRecord::find()
+            ->where([
+                'userId' => Craft::$app->getUser()->getIdentity()->id,
+                'type' => $type,
+            ])
+            ->exists();
+    }
+
+    /**
+     * Returns a widget by its ID.
+     *
+     * @param int $id The widget’s ID
+     * @return WidgetInterface|null The widget, or null if it doesn’t exist
+     */
+    public function getWidgetById(int $id)
+    {
+        $result = $this->_createWidgetsQuery()
+            ->where(['id' => $id, 'userId' => Craft::$app->getUser()->getIdentity()->id])
+            ->one();
+        return $result ? $this->createWidget($result) : null;
+    }
+
+    /**
+     * Saves a widget for the current user.
+     *
+     * @param WidgetInterface $widget The widget to be saved
+     * @param bool $runValidation Whether the widget should be validated
+     * @return bool Whether the widget was saved successfully
+     * @throws \Throwable if reasons
+     */
+    public function saveWidget(WidgetInterface $widget, bool $runValidation = true): bool
+    {
+        /** @var Widget $widget */
+        $isNewWidget = $widget->getIsNew();
+        // Fire a 'beforeSaveWidget' event
+        if ($this->hasEventHandlers(self::EVENT_BEFORE_SAVE_TRANSLATIONS_WIDGET)) {
+            $this->trigger(self::EVENT_BEFORE_SAVE_TRANSLATIONS_WIDGET, new WidgetEvent([
+                'widget' => $widget,
+                'isNew' => $isNewWidget,
+            ]));
+        }
+        if (!$widget->beforeSave($isNewWidget)) {
+            return false;
+        }
+        if ($runValidation && !$widget->validate()) {
+            Craft::info('[' . __METHOD__ . '] Widget not saved due to validation error.', 'translations');
+            return false;
+        }
+        $transaction = Craft::$app->getDb()->beginTransaction();
+        try {
+            $widgetRecord = $this->_getUserWidgetRecordById($widget->id);
+            $widgetRecord->type = get_class($widget);
+            $widgetRecord->settings = $widget->getSettings();
+            if ($isNewWidget) {
+                // Set the sortOrder
+                $maxSortOrder = (new Query())
+                    ->from([Constants::TABLE_WIDGET])
+                    ->where(['userId' => Craft::$app->getUser()->getIdentity()->id])
+                    ->max('[[sortOrder]]');
+
+                $widgetRecord->sortOrder = $maxSortOrder + 1;
+            }
+            $widgetRecord->save(false);
+            // Now that we have a widget ID, save it on the model
+            if ($isNewWidget) {
+                $widget->id = $widgetRecord->id;
+            }
+            $widget->afterSave($isNewWidget);
+            $transaction->commit();
+        } catch (\Throwable $e) {
+            $transaction->rollBack();
+            throw $e;
+        }
+        // Fire an 'afterSaveWidget' event
+        $this->trigger(self::EVENT_AFTER_SAVE_TRANSLATIONS_WIDGET, new WidgetEvent([
+            'widget' => $widget,
+            'isNew' => $isNewWidget,
+        ]));
+        return true;
+    }
+
+    /**
+     * Soft-deletes a widget by its ID.
+     *
+     * @param int $widgetId The widget’s ID
+     * @return bool Whether the widget was deleted successfully
+     */
+    public function deleteWidgetById(int $widgetId): bool
+    {
+        $widget = $this->getWidgetById($widgetId);
+        if (!$widget) {
+            return false;
+        }
+        return $this->deleteWidget($widget);
+    }
+
+    /**
+     * Soft-deletes a widget.
+     *
+     * @param WidgetInterface $widget The widget to be deleted
+     * @return bool Whether the widget was deleted successfully
+     * @throws \Throwable if reasons
+     */
+    public function deleteWidget(WidgetInterface $widget): bool
+    {
+        $widgets = [$widget];
+
+        foreach ($widgets as $widget) {
+            /** @var Widget $widget */
+            // Fire a 'beforeDeleteWidget' event
+            if ($this->hasEventHandlers(self::EVENT_BEFORE_DELETE_TRANSLATIONS_WIDGET)) {
+                $this->trigger(self::EVENT_BEFORE_DELETE_TRANSLATIONS_WIDGET, new WidgetEvent([
+                    'widget' => $widget,
+                ]));
+            }
+            if (!$widget->beforeDelete()) {
+                return false;
+            }
+            $transaction = Craft::$app->getDb()->beginTransaction();
+            try {
+                $widgetRecord = $this->_getUserWidgetRecordById($widget->id);
+                $widgetRecord->delete();
+                $widget->afterDelete();
+                $transaction->commit();
+            } catch (\Throwable $e) {
+                $transaction->rollBack();
+                throw $e;
+            }
+            // Fire an 'afterDeleteWidget' event
+            if ($this->hasEventHandlers(self::EVENT_AFTER_DELETE_TRANSLATIONS_WIDGET)) {
+                $this->trigger(self::EVENT_AFTER_DELETE_TRANSLATIONS_WIDGET, new WidgetEvent([
+                    'widget' => $widget,
+                ]));
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Reorders widgets.
+     *
+     * @param int[] $widgetIds The widget IDs
+     * @return bool Whether the widgets were reordered successfully
+     * @throws \Throwable if reasons
+     */
+    public function reorderWidgets(array $widgetIds): bool
+    {
+        $transaction = Craft::$app->getDb()->beginTransaction();
+        try {
+            foreach ($widgetIds as $widgetOrder => $widgetId) {
+                $widgetRecord = $this->_getUserWidgetRecordById($widgetId);
+                $widgetRecord->sortOrder = $widgetOrder + 1;
+                $widgetRecord->save();
+            }
+            $transaction->commit();
+        } catch (\Throwable $e) {
+            $transaction->rollBack();
+            throw $e;
+        }
+        return true;
+    }
+
+    /**
+     * Changes the colspan of a widget.
+     *
+     * @param int $widgetId
+     * @param int $colspan
+     * @return bool
+     */
+    public function changeWidgetColspan(int $widgetId, int $colspan): bool
+    {
+        $widgetRecord = $this->_getUserWidgetRecordById($widgetId);
+        $widgetRecord->colspan = $colspan;
+        $widgetRecord->save();
+        return true;
+    }
+
+    /**
+     * Returns the info about a widget required to display its body and settings in the Dashboard.
+     *
+     * @param WidgetInterface $widget
+     * @return array|false
+     */
+    public function getWidgetInfo(WidgetInterface $widget)
+    {
+        /** @var Widget $widget */
+        $view = Craft::$app->getView();
+        $namespace = $view->getNamespace();
+
+        // Get the body HTML
+        $widgetBodyHtml = $widget->getBodyHtml();
+        if ($widgetBodyHtml === false) {
+            return false;
+        }
+        // Get the settings HTML + JS
+        $view->setNamespace('widget' . $widget->id . '-settings');
+        $view->startJsBuffer();
+        $settingsHtml = $view->namespaceInputs((string)$widget->getSettingsHtml());
+        $settingsJs = $view->clearJsBuffer(false);
+        // Get the colspan (limited to the widget type's max allowed colspan)
+        $colspan = ($widget->colspan ?: $widget->minColspan());
+        if (($maxColspan = $widget::maxColspan()) && $colspan > $maxColspan) {
+            $colspan = $maxColspan;
+        }
+        $view->setNamespace($namespace);
+        return [
+            'id' => $widget->id,
+            'type' => get_class($widget),
+            'colspan' => $colspan,
+            'title' => $widget->getTitle(),
+            'name' => $widget->displayName(),
+            'bodyHtml' => $widgetBodyHtml,
+            'settingsHtml' => $settingsHtml,
+            'settingsJs' => (string)$settingsJs,
+        ];
+    }
+
+    /**
+     * Returns a widget type’s SVG icon.
+     *
+     * @param WidgetInterface $widget
+     * @return string
+     */
+    public function getWidgetIconSvg(WidgetInterface $widget): string
+    {
+        $iconPath = $widget::icon();
+        if ($iconPath === null) {
+            return $this->_getDefaultWidgetIconSvg($widget);
+        }
+        if (!is_file($iconPath)) {
+            Craft::warning('[' . __METHOD__ . '] Widget icon file doesn\'t exist: {$iconPath}', 'translations');
+            return $this->_getDefaultWidgetIconSvg($widget);
+        }
+        if (!FileHelper::isSvg($iconPath)) {
+            Craft::warning('[' . __METHOD__ . '] Widget icon file is not an SVG: {$iconPath}', 'translations');
+            return $this->_getDefaultWidgetIconSvg($widget);
+        }
+        return file_get_contents($iconPath);
+    }
+
+    public function getClosest($search, $arr)
+    {
+        $closest = null;
+        foreach ($arr as $key => $item) {
+            if ($closest === null || abs($search - $closest) > abs($key - $search)) {
+                $closest = $key;
+            }
+        }
+        return $closest;
+    }
+
+    // Private Methods
+    // =========================================================================
+    /**
+     * Adds the default widgets to the logged-in user.
+     */
+    private function _addDefaultUserWidgets()
+    {
+        $user = Craft::$app->getUser()->getIdentity();
+        $this->saveWidget($this->createWidget(RecentOrders::class));
+        $this->saveWidget($this->createWidget(NewAndModifiedEntries::class));
+        $this->saveWidget($this->createWidget(LanguageCoverage::class));
+        $this->saveWidget($this->createWidget(Translators::class));
+        $this->saveWidget($this->createWidget(News::class));
+
+        // Update user preferences
+        $preferences = [
+            'hasTranslationsDashboard' => true,
+        ];
+
+        $usersService = new Users();
+        $usersService->saveUserPreferences($user, $preferences);
+    }
+
+    /**
+     * Gets a widget's record.
+     *
+     * @param int|null $widgetId
+     * @return WidgetRecord
+     */
+    private function _getUserWidgetRecordById(int $widgetId = null): WidgetRecord
+    {
+        $userId = Craft::$app->getUser()->getIdentity()->id;
+
+        if ($widgetId !== null) {
+            $widgetRecord = WidgetRecord::findOne([
+                'id' => $widgetId,
+                'userId' => $userId
+            ]);
+            if (!$widgetRecord) {
+                $this->_noWidgetExists($widgetId);
+            }
+        } else {
+            $widgetRecord = new WidgetRecord();
+            $widgetRecord->userId = $userId;
+        }
+        return $widgetRecord;
+    }
+
+    /**
+     * Throws a "No widget exists" exception.
+     *
+     * @param int $widgetId
+     * @throws WidgetNotFoundException
+     */
+    private function _noWidgetExists(int $widgetId)
+    {
+        throw new WidgetNotFoundException("No widget exists with the ID '{$widgetId}'");
+    }
+    /**
+     * Returns the widget records for the current user.
+     *
+     * @return WidgetInterface[]|false
+     * @throws Exception if no user is logged-in
+     */
+    private function _getUserWidgets()
+    {
+        $user = Craft::$app->getUser()->getIdentity();
+        if (!$user) {
+            throw new \Exception('No logged-in user');
+        }
+
+        // Get value from user preferences
+        $usersService = new Users();
+        $hasTranslationsDashboard = $usersService->getUserPreference($user->id, 'hasTranslationsDashboard');
+
+        if (!$hasTranslationsDashboard) {
+            return false;
+        }
+
+        $results = $this->_createWidgetsQuery()
+            ->where(['userId' => $user->id])
+            ->orderBy(['sortOrder' => SORT_ASC])
+            ->all();
+        $widgets = [];
+        foreach ($results as $result) {
+            $widgets[] = $this->createWidget($result);
+        }
+
+        return $widgets;
+    }
+
+    /**
+     * @return Query
+     */
+    private function _createWidgetsQuery(): Query
+    {
+        return (new Query())
+            ->select([
+                'id',
+                'dateCreated',
+                'dateUpdated',
+                'colspan',
+                'type',
+                'settings',
+            ])
+            ->from([Constants::TABLE_WIDGET]);
+    }
+
+    /**
+     * Returns the default icon SVG for a given widget type.
+     *
+     * @param WidgetInterface $widget
+     * @return string
+     */
+    private function _getDefaultWidgetIconSvg(WidgetInterface $widget): string
+    {
+        return Craft::$app->getView()->renderTemplate('_includes/defaulticon.svg', [
+            'label' => $widget::displayName()
+        ]);
+    }
+}
diff --git a/src/services/translator/AcclaroTranslationService.php b/src/services/translator/AcclaroTranslationService.php
index 7ea050b7..ac0d9c7d 100644
--- a/src/services/translator/AcclaroTranslationService.php
+++ b/src/services/translator/AcclaroTranslationService.php
@@ -77,11 +77,17 @@ public function authenticate()
      */
     public function updateOrder(Order $order)
     {
-        if ($order->isCanceled()) return;
+        if ($order->isCanceled()) {
+            $error = sprintf('Can not update canceled order. OrderId: %s', $order->id);
+            Craft::error($error, Constants::PLUGIN_HANDLE);
+            return;
+        }
 
         $orderResponse = $this->acclaroApiClient->getOrder($order->serviceOrderId);
 
         if (empty($orderResponse->status)) {
+            $error = sprintf('Empty order response from acclaro. OrderId: %s', $order->id);
+            Craft::error($error, Constants::PLUGIN_HANDLE);
             return;
         }
 
@@ -121,11 +127,17 @@ public function updateOrder(Order $order)
     public function updateFile(Order $order, FileModel $file)
     {
         try {
-            if ($file->isCanceled()) return;
+            if ($file->isCanceled()) {
+                $error = sprintf('Can not update canceled file. FileId: %s', $file->id);
+                Craft::error($error, Constants::PLUGIN_HANDLE);
+                return;
+            }
 
             $fileInfoResponse = $this->acclaroApiClient->getFileInfo($order->serviceOrderId);
 
             if (!is_array($fileInfoResponse)) {
+                $error = sprintf('Invalid file Info from acclaro. FileId: %s', $file->id);
+                Craft::error($error, Constants::PLUGIN_HANDLE);
                 return;
             }
             // find the matching file
@@ -230,7 +242,7 @@ public function sendOrderFile($order, $file) {
 
         if ($file) {
 
-            $element = Craft::$app->elements->getElementById($file->elementId, null, $file->sourceSite);
+            $element = Translations::$plugin->elementRepository->getElementById($file->elementId, $file->sourceSite);
 
             $sourceSite = Translations::$plugin->siteRepository->normalizeLanguage(Craft::$app->getSites()->getSiteById($file->sourceSite)->language);
             $targetSite = Translations::$plugin->siteRepository->normalizeLanguage(Craft::$app->getSites()->getSiteById($file->targetSite)->language);
diff --git a/src/services/translator/Export_ImportTranslationService.php b/src/services/translator/Export_ImportTranslationService.php
index 7af0f771..6535c18c 100644
--- a/src/services/translator/Export_ImportTranslationService.php
+++ b/src/services/translator/Export_ImportTranslationService.php
@@ -10,13 +10,10 @@
 
 namespace acclaro\translations\services\translator;
 
-use Craft;
 use craft\elements\Asset;
-use craft\elements\Entry;
 use craft\elements\Category;
 use craft\elements\GlobalSet;
 
-use acclaro\translations\Constants;
 use acclaro\translations\Translations;
 use acclaro\translations\elements\Order;
 use acclaro\translations\models\FileModel;
@@ -78,23 +75,26 @@ public function updateIOFile(Order $order, FileModel $file)
         $target = $file->target;
         $file->dateDelivered = new \DateTime();
 
-        $element = Craft::$app->elements->getElementById($file->elementId, null, $file->sourceSite);
+        $element = Translations::$plugin->elementRepository->getElementById($file->elementId, $file->sourceSite);
 
         if ($element->getIsDraft()) $element = $element->getCanonical();
 
-        if ($element instanceof GlobalSet) {
-            $draft = Translations::$plugin->globalSetDraftRepository->getDraftById($file->draftId, $file->targetSite);
-        } else if ($element instanceof Category) {
-            $draft = Translations::$plugin->categoryDraftRepository->getDraftById($file->draftId, $file->targetSite);
-
-            $category = Craft::$app->getCategories()->getCategoryById($draft->categoryId, $draft->site);
-            $draft->groupId = $category->groupId;
-        } else if ($element instanceof Asset) {
-            $draft = Translations::$plugin->assetDraftRepository->getDraftById($file->draftId, $file->targetSite);
-        }else {
-            $draft = Translations::$plugin->draftRepository->getDraftById($file->draftId, $file->targetSite);
+        switch (true) {
+            case $element instanceof Asset:
+                $elementRepository = Translations::$plugin->assetDraftRepository;
+                break;
+            case $element instanceof Category:
+                $elementRepository = Translations::$plugin->categoryRepository;
+                break;
+            case $element instanceof GlobalSet:
+                $elementRepository = Translations::$plugin->globalSetDraftRepository;
+                break;
+            default:
+                $elementRepository = Translations::$plugin->draftRepository;
         }
 
+        $draft = $elementRepository->getDraftById($file->draftId, $file->targetSite);
+
         return $this->updateDraft($element, $draft, $target, $file->sourceSite, $file->targetSite, $order);
     }
 
@@ -104,46 +104,16 @@ public function updateDraft($element, $draft, $translatedContent, $sourceSite, $
         $targetData = Translations::$plugin->elementTranslator->getTargetData($translatedContent);
 
         switch (true) {
-            // Update Entry Drafts
-            case $draft instanceof Entry:
-                $draft->title = isset($targetData['title']) ? $targetData['title'] : $draft->title;
-                $draft->slug = isset($targetData['slug']) ? $targetData['slug'] : $draft->slug;
-
-				$post = Translations::$plugin->elementTranslator->toPostArrayFromTranslationTarget($draft, $sourceSite, $targetSite, $targetData);
-                $draft->setFieldValues($post);
-                $draft->siteId = $targetSite;
-
-                $res = Translations::$plugin->draftRepository->saveDraft($draft);
-                if ($res !== true) {
-                    if(is_array($res)){
-                        $errorMessage = '';
-                        foreach ($res as $r){
-                            $errorMessage .= implode('; ', $r);
-                        }
-                        $order->logActivity(
-                            Translations::$plugin->translator->translate('app', 'Error saving drafts content. Error: '.$errorMessage)
-                        );
-                    } else {
-                        $order->logActivity(
-                            sprintf(Translations::$plugin->translator->translate('app', 'Unable to save draft, please review your XML for entry [%s]'), $element->title)
-                        );
-                    }
-
-                    return false;
-                }
-                break;
-
-            // Update Category Drafts
-            case $draft instanceof Category:
-                $draft->title = isset($targetData['title']) ? $targetData['title'] : $draft->title;
-                $draft->slug = isset($targetData['slug']) ? $targetData['slug'] : $draft->slug;
+                // Update GlobalSet Drafts
+            case $draft instanceof GlobalSet:
                 $draft->siteId = $targetSite;
 
+                // $element->siteId = $targetSite;
                 $post = Translations::$plugin->elementTranslator->toPostArrayFromTranslationTarget($element, $sourceSite, $targetSite, $targetData);
 
                 $draft->setFieldValues($post);
 
-                $res = Translations::$plugin->categoryDraftRepository->saveDraft($draft, $post);
+                $res = Translations::$plugin->globalSetDraftRepository->saveDraft($draft, $post);
                 if (!$res) {
                     $order->logActivity(
                         sprintf(Translations::$plugin->translator->translate('app', 'Unable to save draft, please review your XML for entry [%s]'), $element->title)
@@ -152,17 +122,16 @@ public function updateDraft($element, $draft, $translatedContent, $sourceSite, $
                     return false;
                 }
                 break;
-
-            // Update GlobalSet Drafts
-            case $draft instanceof GlobalSet:
+                // Update Asset Drafts
+            case $draft instanceof Asset:
+                $draft->title = isset($targetData['title']) ? $targetData['title'] : $draft->title;
                 $draft->siteId = $targetSite;
 
-                // $element->siteId = $targetSite;
                 $post = Translations::$plugin->elementTranslator->toPostArrayFromTranslationTarget($element, $sourceSite, $targetSite, $targetData);
 
                 $draft->setFieldValues($post);
 
-                $res = Translations::$plugin->globalSetDraftRepository->saveDraft($draft, $post);
+                $res = Translations::$plugin->assetDraftRepository->saveDraft($draft, $post);
                 if (!$res) {
                     $order->logActivity(
                         sprintf(Translations::$plugin->translator->translate('app', 'Unable to save draft, please review your XML for entry [%s]'), $element->title)
@@ -171,26 +140,33 @@ public function updateDraft($element, $draft, $translatedContent, $sourceSite, $
                     return false;
                 }
                 break;
-            // Update Asset Drafts
-            case $draft instanceof Asset:
+            default:
                 $draft->title = isset($targetData['title']) ? $targetData['title'] : $draft->title;
-                $draft->siteId = $targetSite;
+                $draft->slug = isset($targetData['slug']) ? $targetData['slug'] : $draft->slug;
 
+                /** Use source entry as first argument as the draft in target site might have different block structure as compared to source leading into missing some blocks */
                 $post = Translations::$plugin->elementTranslator->toPostArrayFromTranslationTarget($element, $sourceSite, $targetSite, $targetData);
-
                 $draft->setFieldValues($post);
+                $draft->siteId = $targetSite;
 
-                $res = Translations::$plugin->assetDraftRepository->saveDraft($draft, $post);
-                if (!$res) {
-                    $order->logActivity(
-                        sprintf(Translations::$plugin->translator->translate('app', 'Unable to save draft, please review your XML for entry [%s]'), $element->title)
-                    );
+                $res = Translations::$plugin->draftRepository->saveDraft($draft);
+                if ($res !== true) {
+                    if (is_array($res)) {
+                        $errorMessage = '';
+                        foreach ($res as $r) {
+                            $errorMessage .= implode('; ', $r);
+                        }
+                        $order->logActivity(
+                            Translations::$plugin->translator->translate('app', 'Error saving drafts content. Error: ' . $errorMessage)
+                        );
+                    } else {
+                        $order->logActivity(
+                            sprintf(Translations::$plugin->translator->translate('app', 'Unable to save draft, please review your XML for entry [%s]'), $element->title)
+                        );
+                    }
 
                     return false;
                 }
-                break;
-            default:
-                break;
         }
 
         return true;
diff --git a/src/templates/_components/_forms/button.twig b/src/templates/_components/_forms/button.twig
new file mode 100644
index 00000000..077f84a2
--- /dev/null
+++ b/src/templates/_components/_forms/button.twig
@@ -0,0 +1,74 @@
+{# Sync api orders button #}
+{% macro syncOrderButton(disabled) %}
+    <div class="btngroup">
+        {% set config = {
+            class: 'big icon'|explodeClass|merge([disabled]),
+            label: 'Sync orders'|t('app'),
+            type: 'submit',
+            attributes: {
+                value: 'submit',
+                data: {
+                    icon: 'refresh',
+                },
+            },
+            spinner: true,
+        } %}
+
+        {{ _self.button(config) }}
+    </div>
+{% endmacro %}
+
+{# New widget button #}
+{% macro newWidgetButton(config) %}
+    <div class="buttons secondary-buttons">
+        <div class="newwidget btngroup">
+            <div id="newwidgetmenubtn" class="btn submit menubtn add icon {% if config.isSelectableWidget is empty %} link-disabled {% endif %}">
+                {{ 'New widget'|t('app') }}
+            </div>
+            <div class="menu newwidgetmenu">
+                <ul>
+                    {% for type, info in config.widgetTypes|filter(info => info.selectable) %}
+                        <li>
+                            <a data-type="{{ type }}"
+                                data-name="{{ info.name }}">
+                                <span class="icon">{{ info.iconSvg|raw }}</span>
+                                {{ info.name == 'Modified Source Entries' ? 'New & Modified Entries' : info.name }}
+                            </a>
+                        </li>
+                    {% endfor %}
+                </ul>
+            </div>
+        </div>
+{% endmacro %}
+
+{# Simple button #}
+{% macro button(config) %}
+    {% include '_includes/forms/button' with config only %}
+{% endmacro %}
+
+{# Anchor button #}
+{% macro anchorButton(config) %}
+    {% set label = config.label ?? null %}
+    {% set spinner = config.spinner ?? null %}
+
+    {% set attributes = {
+        id: config.id ?? false,
+        href: config.href ?? '#',
+        class: (config.class ?? [])|explodeClass|merge([
+            'btn',
+            not label ? 'btn-empty' : null,
+        ]|filter),
+    }|merge(config.attributes ?? {}) -%}
+
+    {% apply spaceless %}
+        {% tag 'a' with attributes %}
+            {{ label ? tag('div', {
+                class: 'label',
+                text: label,
+            }) }}
+        {% endtag %}
+        {% if spinner %}
+            <div class="spinner spinner-absolute translations-loader hidden"></div>
+        {% endif %}
+    {% endapply -%}
+{% endmacro %}
diff --git a/src/templates/_components/orders/files-tab.twig b/src/templates/_components/orders/files-tab.twig
index d864b4ba..48da305f 100644
--- a/src/templates/_components/orders/files-tab.twig
+++ b/src/templates/_components/orders/files-tab.twig
@@ -61,8 +61,14 @@
 												{{ file.uiLabel }}
 											</a>
 											{% set sourceUpdated = file.elementId in isSourceChanged %}
-											{% set targetUpdated = order.trackTargetChanges and file.hasTmMisalignments and not file.isNew %}
-											{% if element.className == constant('acclaro\\translations\\Constants::CLASS_ENTRY') %}
+											{% set targetUpdated = order.trackTargetChanges and file.hasTmMisAlignments and not file.isNew and not file.isModified %}
+
+											{# Ignore target changes for api order that are completed #}
+											{% if not order.hasDefaultTranslator and (order.isReviewReady or order.isComplete or order.isPublished) %}
+												{% set targetUpdated = false %}
+											{% endif %}
+
+											{% if file.hasPreview %}
 												<a href="{{ file.previewUrl }}" target="_blank" data-icon="world" title="{{ 'Visit webpage'|t }}"></a>
 											{% endif %}
 											{% if canUpdateFiles and not file.isPublished and (sourceUpdated or targetUpdated) %}
@@ -136,7 +142,7 @@
 									</tr>
 								</table>
 							</td>
-							<td><table><thead><th class="bg-none icon ordered desc hidden"></th></thead></table></td>
+							<td><table><thead><th class="bg-none icon ordered desc orderable hidden"><button type="button"></button></th></thead></table></td>
 						</tr>
 					{% endfor %}
 				</tbody>
diff --git a/src/templates/_components/orders/info-tab.twig b/src/templates/_components/orders/info-tab.twig
index 44a8768d..12ca677d 100644
--- a/src/templates/_components/orders/info-tab.twig
+++ b/src/templates/_components/orders/info-tab.twig
@@ -10,7 +10,7 @@
 			{% if not isDefaultTranslator and not order.isPending %}
 				{% if order.serviceOrderId %}
 					{% if isCancelable %}
-						<table class="data right"><thead><th id="cancel-order-link" class="bg-none icon ordered desc"></th></thead></table>
+						<table class="data right"><thead><th id="cancel-order-link" class="bg-none icon ordered desc orderable"><button></button></th></thead></table>
 					{% endif %}
 					<a class="right pt-5 mr--10" href="{{translator_url}}" target="_blank">#{{ order.serviceOrderId }} </a>
 				{% else %}
diff --git a/src/templates/_components/orders/settings-tab.twig b/src/templates/_components/orders/settings-tab.twig
index 6e3c94de..aeb2063d 100644
--- a/src/templates/_components/orders/settings-tab.twig
+++ b/src/templates/_components/orders/settings-tab.twig
@@ -249,7 +249,7 @@
 				{% set includeTmFilesTitle = "This field cannot be edited." %}
 			{% endif %}
 			<span class="{{ includeTmFilesClass }}">
-				<div style="margin-bottom: 0" class="{% if includeTmFilesClass %} noClick disabled {% endif %}" title="{{ includeTmFilesTitle }}">
+				<div style="margin-bottom: 0" class="{% if includeTmFilesClass %} noClick {% endif %}" title="{{ includeTmFilesTitle }}">
 					{{ forms.lightswitchField({
 						label: 'Include translation memory alignment files<p class="fw-400">\
 							Include translation memory alignment files with order submission to prevent overwriting existing content edits.</p>'|t('app'),
diff --git a/src/templates/_components/widgets/NewAndModifiedEntries/body.twig b/src/templates/_components/widgets/NewAndModifiedEntries/body.twig
index 17b08ad5..68f03c2c 100644
--- a/src/templates/_components/widgets/NewAndModifiedEntries/body.twig
+++ b/src/templates/_components/widgets/NewAndModifiedEntries/body.twig
@@ -1,3 +1,5 @@
+{% import 'translations/_components/_forms/button' as button %}
+
 <div class="tab-container mt--30">
     {% set tabs = {
             "recent-entries-widget": {label: "New Source Entries"|t, url: 'javascript:void(0)'},
@@ -29,8 +31,18 @@
                     {% endfor %}
                 </table>
             </div>
-            <div class="buttons right" style="margin-top:14px;">
-                <a href="#" id="bulk-reorder" class="btn submit disabled icon" data-icon="language" target="_blank">Re-order</a>
+            <div class="buttons right">
+                {{ button.anchorButton({
+                    label: 'Re-order'|t('app'),
+                    id: 'bulk-reorder',
+                    class: 'link-disabled icon submit',
+                    attributes: {
+                        target: '_blank',
+                        data: {
+                            icon: 'language'
+                        }
+                    }
+                }) }}
             </div>
         </div>
     </div>
@@ -43,8 +55,21 @@
                         <div class="modal-title">
                             <h1>Entry Modification Details</h1>
                             <div class="buttons">
-                                <a href="#" id="close-diff-modal" class="btn">Close</a>
-                                <a href="#" class="btn submit reorderUrl icon" data-icon="language" target="_blank">Re-order translations</a>
+                                {{ button.anchorButton({
+                                    label: 'Close'|t('app'),
+                                    id: 'close-diff-modal'
+                                }) }}
+
+                                {{ button.anchorButton({
+                                    label: 'Re-order translations'|t('app'),
+                                    class: 'submit reorderUrl',
+                                    attributes: {
+                                        target: '_blank',
+                                        data: {
+                                            icon: 'language'
+                                        }
+                                    }
+                                }) }}
                             </div>
                         </div>
                         <div class="diff-meta">
@@ -126,9 +151,23 @@
                 </table>
             </div>
 
-            <div class="buttons right" style="margin-top:14px;">
-                <a class="btn" href="{{ url('entries') }}">{{ 'View all entries'|t }}</a>
-                <a href="#" id="new-entry-orders" class="btn submit disabled" target="_blank">{{ "New order"|t('app') }}</a>
+            <div class="buttons right">
+                {{ button.anchorButton({
+                    label: 'View all entries'|t('app'),
+                    href: url('entries')
+                }) }}
+
+                {{ button.anchorButton({
+                    label: 'New order'|t('app'),
+                    id: 'new-entry-orders',
+                    class: 'link-disabled submit',
+                    attributes: {
+                        target: '_blank',
+                        data: {
+                            icon: 'language'
+                        }
+                    }
+                }) }}
             </div>
 
         </div>
diff --git a/src/templates/_components/widgets/RecentOrders/body.twig b/src/templates/_components/widgets/RecentOrders/body.twig
index 74eb624f..05b76841 100644
--- a/src/templates/_components/widgets/RecentOrders/body.twig
+++ b/src/templates/_components/widgets/RecentOrders/body.twig
@@ -1,3 +1,6 @@
+{% import '_includes/forms' as forms %}
+{% import 'translations/_components/_forms/button' as button %}
+
 <div class="recentorders-container scroll-x-auto">
     {% if orders|length %}
         <table class="data fullwidth table">
@@ -27,24 +30,28 @@
                 </tr>
             {% endfor %}
         </table>
-        <div class="buttons right" style="margin-top:14px;">
+        <div class="buttons right">
 
             {% set disabled = '' %}
             {% if (orderCountAcclaro == 0) %}
-                {% set disabled = 'disabled' %}
+                {% set disabled = 'link-disabled' %}
             {% endif %}
 
-            <a class="btn" href="{{ url('translations/orders') }}">{{ 'View all orders'|t }}</a>
-            <div class="btngroup">
-                <form id="sync-orders" class="utility orders" method="post" accept-charset="UTF-8">
-                    <input type="hidden" name="action" value="translations/order/sync-orders">
-                    {{ csrfInput() }}
-                    <div class="btngroup" style="margin-right:5px;">
-                        <button type="submit" class="btn submit {{ disabled }} icon" data-icon="refresh" value="submit" {{ disabled }}>{{ "Sync orders"|t('app') }}</button>
-                    </div>
-                    <div class="sync-status"></div>
-                </form>
-            </div>
+            {{ button.anchorButton({
+                label: 'View all orders'|t('app'),
+                href: url('translations/orders')
+            }) }}
+
+            <form id="sync-orders" class="utility orders" method="post" accept-charset="UTF-8">
+                {{ forms.hidden({
+                    name: 'action',
+                    value: 'translations/order/sync-orders'
+                }) }}
+
+                {{ csrfInput() }}
+
+                {{ button.syncOrderButton(disabled) }}
+            </form>
         </div>
     {% else %}
         <table class="data fullwidth table">
diff --git a/src/templates/_components/widgets/Translators/body.twig b/src/templates/_components/widgets/Translators/body.twig
index bcf6bfaf..c46b772d 100644
--- a/src/templates/_components/widgets/Translators/body.twig
+++ b/src/templates/_components/widgets/Translators/body.twig
@@ -1,3 +1,5 @@
+{% import 'translations/_components/_forms/button' as button %}
+
 <div class="translators-container scroll-x-auto">
     {% if translators|length %}
         <table class="data fullwidth table">
@@ -39,9 +41,13 @@
                 </tr>
             {% endfor %}
         </table>
-        
-        <div class="" style="float:right;">
-            <a class="btn icon add" href="{{ url('translations/translators/new') }}" style="margin-top:1em;">Add new</a>
+
+        <div class="buttons right">
+            {{ button.anchorButton({
+                label: 'Add new'|t('app'),
+                class: 'icon add',
+                href: url('translations/translators/new')
+            }) }}
         </div>
     {% else %}
         <table class="data fullwidth table">
diff --git a/src/templates/_index.twig b/src/templates/_index.twig
index 4668bcf5..ff3a3524 100644
--- a/src/templates/_index.twig
+++ b/src/templates/_index.twig
@@ -1,5 +1,5 @@
 {% extends "_layouts/cp" %}
-{# {% import 'translations/_macros' as macros %} #}
+{% import 'translations/_components/_forms/button' as button %}
 
 {% set title = "Translation Dashboard"|t %}
 {% set elementType = 'acclaro\\translations\\elements\\Order' %}
@@ -19,27 +19,32 @@
 {% endblock %}
 
 {% block actionButton %}
-    <a class="btn submit icon btn-create-new-order" data-icon="language" href="{{ url('translations/orders/create') }}" style="margin-right: 5px;">{{ 'New order'|t }}</a>
-    <div class="buttons secondary-buttons">
-        <div class="newwidget btngroup">
-            <div id="newwidgetmenubtn" class="btn submit menubtn add icon {% if isSelectableWidget is empty %} disabled {% endif %}">{{ 'New widget'|t('app') }}</div>
-            <div class="menu newwidgetmenu">
-                <ul>
-                    {% for type, info in widgetTypes if info.selectable %}
-                        <li>
-                            <a data-type="{{ type }}" 
-                                data-name="{{ info.name }}">
-                                <span class="icon">{{ info.iconSvg|raw }}</span>
-                                {{ info.name == 'Modified Source Entries' ? 'New & Modified Entries' : info.name }}
-                            </a>
-                        </li>
-                    {% endfor %}
-                </ul>
-            </div>
-        </div>
-
-        <div id="widgetManagerBtn" class="btn settings icon submit" title="{{ 'Settings'|t('app') }}"></div>
-    </div>
+    {{ button.anchorButton({
+        label: 'New order',
+        class: 'submit',
+        href: url('translations/orders/create'),
+        attributes: {
+            data: {
+                icon: 'language',
+            },
+        }
+    }) }}
+
+    {{ button.newWidgetButton({
+        isSelectableWidget: isSelectableWidget,
+        widgetTypes: widgetTypes,
+    }) }}
+
+    {{ button.button({
+        id: "widgetManagerBtn",
+        class: 'icon submit',
+        attributes: {
+            title: 'Settings'|t('app'),
+            data: {
+                icon: 'settings',
+            },
+        },
+    }) }}
 {% endblock %}
 
 {% do view.registerAssetBundle("acclaro\\translations\\assetbundles\\OrderAssets") %}
diff --git a/src/templates/assets/_editDraft.html b/src/templates/assets/_editDraft.html
deleted file mode 100644
index 76eeffff..00000000
--- a/src/templates/assets/_editDraft.html
+++ /dev/null
@@ -1,240 +0,0 @@
-{% extends "_layouts/element" %}
-{% import "_includes/forms" as forms %}
-
-{% set canEdit = true %}
-{% set canUpdateSource = canEdit %}
-{% set saveSourceAction = 'translations/asset/save-draft' %}
-{% set deleteSourceAction = 'translations/asset/delete-draft' %}
-{% set publishSourceAction = 'translations/asset/publish-draft' %}
-{% do view.setIsDeltaRegistrationActive(true) %}
-
-{% hook "cp.assets.edit" %}
-
-{% set crumbs = [
-    { label: 'Translations'|t, url: url('translations') },
-    { label: 'Orders'|t, url: url('translations/orders') },
-    { label: element.title, url: 'javascript:void(0)' },
-] %}
-
-{% block contextMenu %}
-    <div class="select">
-        <select class="site">
-            <option value="{{ selectedSite.handle }}" selected>{{ selectedSite.name }}</option>
-            <!-- NOTE: Remove if not needed, Commented as user can confuse draft with other sites. -->
-            <!-- {% for site in craft.app.sites.getAllSites() %}
-                <option value="{{ site.handle }}"{% if site.id == selectedSite.id %} selected {% endif %}>{{ site.name }}</option>
-            {% endfor %} -->
-        </select>
-    </div>
-{% endblock %}
-
-{% block actionButton %}
-    {% if assetUrl %}
-        <a class="btn" href="{{ assetUrl }}" target="_blank" data-icon="preview">{{ 'View'|t('app') }}</a>
-    {% endif %}
-
-    <div class="btngroup">
-        <input type="submit" class="btn submit" value="{{ 'Save'|t('app') }}">
-        <div class="btn submit menubtn"></div>
-        <div class="menu">
-            <ul>
-                <ul>
-                    <li><a class="formsubmit" data-action="{{ publishSourceAction }}">{{ 'Publish draft'|t }}</a></li>
-                </ul>
-                <hr>
-                <ul>
-                    <li><a class="formsubmit" data-action="{{ deleteSourceAction }}" data-confirm="{{ 'Are you sure you want to delete this draft?'|t }}">{{ 'Delete draft'|t }}</a></li>
-                </ul>
-            </ul>
-        </div>
-    </div>
-{% endblock %}
-
-{% block content %}
-    {{ hiddenInput('assetId', asset.id) }}
-    {{ hiddenInput('draftId', element.id) }}
-    {{ hiddenInput('site', element.site) }}
-    {{ actionInput(saveSourceAction) }}
-    {{ csrfInput() }}
-    {{ parent() }}
-
-{% endblock %}
-
-{% block details %}
-    {{ previewHtml|raw }}
-    {{ parent() }}
-{% endblock %}
-
-{% block settings %}
-    {{ forms.textField({
-        label: 'Filename'|t('app'),
-        id: 'filename',
-        name: 'filename',
-        value: asset.filename,
-        errors: asset.getErrors('newLocation'),
-    }) }}
-{% endblock %}
-
-{# {% block meta %}
-    <div class="data">
-        <h5 class="heading">{{ 'Location'|t('app') }}</h5>
-        <div class="value">
-            {{ volume.name|t('site') }}
-            {% if element.folderPath %}
-                → {{ element.folderPath|trim('/')|replace('/', ' → ') }}
-            {% endif %}
-        </div>
-    </div>
-
-    {% if formattedSize %}
-        <div class="data">
-            <h5 class="heading">{{ 'File size'|t('app') }}</h5>
-            {{ tag('div', {
-                id: 'file-size-value',
-                class: 'value',
-                text: formattedSize,
-                title: formattedSizeInBytes,
-                aria: {
-                    label: formattedSizeInBytes,
-                },
-            }) }}
-        </div>
-    {% endif %}
-
-    {% set uploader = element.getUploader() %}
-    {% if uploader %}
-        <div class="data">
-            <h5 class="heading">{{ 'Uploaded by'|t('app') }}</h5>
-            <div class="value" id="uploader-element">
-                {% include '_elements/element' with {
-                    element: uploader,
-                } %}
-            </div>
-            {% js %}
-            new Craft.ElementThumbLoader().load($('#uploader-element'));
-            {% endjs %}
-        </div>
-    {% endif %}
-
-    {% if dimensions %}
-        <div class="data">
-            <h5 class="heading">{{ 'Dimensions'|t('app') }}</h5>
-            <div id="dimensions-value" class="value">{{ dimensions }}</div>
-        </div>
-    {% endif %}
-
-    {{ parent() }}
-{% endblock %} #}
-
-{# {% js on ready %}
-    var assetId = {{ asset.id|json_encode|raw }};
-    var $previewThumbContainer = $('#preview-thumb-container');
-
-    function updatePreviewThumb() {
-        $previewThumbContainer.addClass('loading');
-        Craft.postActionRequest('assets/preview-thumb', {
-            assetId: assetId,
-            width: 350,
-            height: 190
-        }, function(response, textStatus) {
-            $previewThumbContainer.removeClass('loading');
-            if (textStatus === 'success') {
-                $previewThumbContainer.find('img').replaceWith(response.img);
-            }
-        });
-    }
-
-    $('#download-btn').on('click', function() {
-        var $form = Craft.createForm().appendTo(Garnish.$bod);
-        $(Craft.getCsrfInput()).appendTo($form);
-        $('<input/>', {
-            type: 'hidden',
-            name: 'action',
-            value: 'assets/download-asset'
-        }).appendTo($form);
-        $('<input/>', {
-            type: 'hidden',
-            name: 'assetId',
-            value: assetId
-        }).appendTo($form);
-        $('<input/>', {
-            type: 'submit',
-            value: 'Submit',
-        }).appendTo($form);
-        $form.submit();
-        $form.remove();
-    });
-
-    $('#replace-btn').on('click', function() {
-        var $fileInput = $('<input type="file" name="replaceFile" class="replaceFile hidden"/>')
-            .appendTo(Garnish.$bod);
-        var uploader = new Craft.Uploader($fileInput, {
-            url: Craft.getActionUrl('assets/replace-file'),
-            dropZone: null,
-            fileInput: $fileInput,
-            paramName: 'replaceFile',
-            events: {
-                fileuploadstart: function() {
-                    $previewThumbContainer.addClass('loading');
-                },
-                fileuploaddone: function(event, data) {
-                    if (data.result.error) {
-                        $previewThumbContainer.removeClass('loading');
-                        alert(data.result.error);
-                    } else {
-                        $('#filename').val(data.result.filename);
-                        $('#file-size-value')
-                            .text(data.result.formattedSize)
-                            .attr('title', data.result.formattedSizeInBytes);
-                        var $dimensionsVal = $('#dimensions-value');
-                        if (data.result.dimensions) {
-                            if (!$dimensionsVal.length) {
-                                $('<div class="data">' +
-                                    '<div class="heading">' + {{ 'Dimensions'|t('app')|json_encode|raw }} + '</div>' +
-                                    '<div id="dimensions-value" class="value"></div>' +
-                                    '</div>').appendTo($('#meta-details'));
-                                $dimensionsVal = $('#dimensions-value');
-                            }
-                            $dimensionsVal.text(data.result.dimensions);
-                        } else if ($dimensionsVal.length) {
-                            $dimensionsVal.parent().remove();
-                        }
-                        updatePreviewThumb();
-                        Craft.cp.runQueue();
-                    }
-                }
-            }
-        });
-        uploader.setParams({
-            assetId: assetId
-        });
-        $fileInput.click();
-    });
-
-    $('#edit-btn').on('click', function() {
-        new Craft.AssetImageEditor(assetId, {
-            onSave: function () {
-                updatePreviewThumb();
-            },
-            allowDegreeFractions: Craft.isImagick
-        });
-    });
-
-    var settings = {};
-
-    {% if dimensions %}
-        {% set previewDimensions = dimensions|split('×') %}
-        settings.startingWidth = {{ previewDimensions[0] }};
-        settings.startingHeight = {{ previewDimensions[1] }};
-    {% endif %}
-
-    $('#preview-btn').on('click', function() {
-        new Craft.PreviewFileModal(assetId, null, settings);
-    });
-
-    $('div.select select.site').on('change', function() {
-        var site = $(this).val();
-        var url = (window.location.href).split("?")[0];
-        window.location.href = url+"?site="+site;
-    });
-{% endjs %} #}
diff --git a/src/templates/assets/_editDraft.twig b/src/templates/assets/_editDraft.twig
new file mode 100644
index 00000000..f4d477f8
--- /dev/null
+++ b/src/templates/assets/_editDraft.twig
@@ -0,0 +1,113 @@
+{% extends "_layouts/cp" %}
+{% import "_includes/forms" as forms %}
+
+{% do view.setIsDeltaRegistrationActive(true) %}
+
+{% set crumbs = [
+    { label: 'Translations'|t, url: url('translations') },
+    { label: 'Orders'|t, url: url('translations/orders') },
+    { label: element.title, url: 'javascript:void(0)' },
+] %}
+
+{% block contextMenu %}
+    <div class="select">
+        <select class="site">
+            <option value="{{ selectedSite.handle }}" selected>{{ selectedSite.name }}</option>
+            <!-- NOTE: Remove if not needed, Commented as user can confuse draft with other sites. -->
+            {# {% for site in craft.app.sites.getAllSites() %}
+                <option value="{{ site.handle }}"{% if site.id == selectedSite.id %} selected {% endif %}>{{ site.name }}</option>
+            {% endfor %} #}
+        </select>
+    </div>
+{% endblock %}
+
+{% block actionButton %}
+    {% if assetUrl %}
+        <a class="btn" href="{{ assetUrl }}" target="_blank" data-icon="preview">{{ 'View'|t('app') }}</a>
+    {% endif %}
+
+    <div class="btngroup">
+        <input type="submit" class="btn submit" value="{{ 'Save'|t('app') }}">
+        <div class="btn submit menubtn"></div>
+        <div class="menu">
+            <ul>
+                <ul>
+                    <li><a class="formsubmit" data-action="{{ publishSourceAction }}">{{ 'Publish draft'|t }}</a></li>
+                </ul>
+                <hr>
+                <ul>
+                    <li><a class="formsubmit" data-action="{{ deleteSourceAction }}" data-confirm="{{ 'Are you sure you want to delete this draft?'|t }}">{{ 'Delete draft'|t }}</a></li>
+                </ul>
+            </ul>
+        </div>
+    </div>
+{% endblock %}
+
+{% set form = element.getFieldLayout().createForm(element, isRevision or not canEdit, {
+    registerDeltas: true,
+}) %}
+{% set fullPageForm = true %}
+
+{% block content %}
+    {{ form.render()|raw }}
+    {{ hiddenInput('assetId', asset.id) }}
+    {{ hiddenInput('draftId', element.id) }}
+    {{ hiddenInput('siteId', element.site) }}
+    {{ hiddenInput('fieldLayoutId', asset.getFieldLayout().id) }}
+    {{ actionInput(saveSourceAction) }}
+{% endblock %}
+
+{% block details %}
+    {{ previewHtml|raw }}
+    <div class="meta">
+        <div id="new-filename-field" class="field first" data-attribute="new-filename">
+            <div class="heading">
+                <label id="new-filename-label" for="new-filename">
+                    Filename
+                    <span class="visually-hidden">Required</span>
+                    <span class="required" aria-hidden="true"></span>
+                </label>
+            </div>
+            <div class="input ltr">
+                <input type="text" id="new-filename" class="text filename fullwidth" name="newFilename" value="{{ asset.filename }}" autocomplete="off" dir="ltr">
+            </div>
+        </div>
+    </div>
+
+    <dl class="meta read-only">
+        <div class="data">
+            <dt class="heading">Location</dt>
+            <dd class="value">{{ volume.name }}</dd>
+        </div>
+        <div class="data">
+            <dt class="heading">File Size</dt>
+            <dd class="value">{{ formattedSize }}</dd>
+        </div>
+        <div class="data">
+            <dt class="heading">Uploaded by</dt>
+            <dd class="value">
+                {% include '_elements/element' with {
+					element: author,
+				} %}
+            </dd>
+        </div>
+        <div class="data">
+            <dt class="heading">Dimensions</dt>
+            <dd class="value">{{ dimensions }}</dd>
+        </div>
+        <div class="data">
+            <dt class="heading">Created at</dt>
+            <dd class="value">
+                <label>{{ asset.dateCreated ? asset.dateCreated|date('n/j/Y') : 'N/A' }}</label>
+				<label class="pl-10">{{ asset.dateCreated ? asset.dateCreated|date('h:i A') : '' }}</label>
+            </dd>
+        </div>
+        <div class="data">
+            <dt class="heading">Updated at</dt>
+            <dd class="value">
+                <label>{{ asset.dateUpdated ? asset.dateUpdated|date('n/j/Y') : 'N/A' }}</label>
+				<label class="pl-10">{{ asset.dateUpdated ? asset.dateUpdated|date('h:i A') : '' }}</label>
+            </dd>
+        </div>
+    </dl>
+{% endblock %}
diff --git a/src/templates/categories/_editDraft.html b/src/templates/categories/_editDraft.html
deleted file mode 100644
index 205563ca..00000000
--- a/src/templates/categories/_editDraft.html
+++ /dev/null
@@ -1,79 +0,0 @@
-{% extends "_layouts/element" %}
-{% import "_includes/forms" as forms %}
-
-{% set saveShortcutRedirect = continueEditingUrl %}
-{% set saveSourceAction = 'translations/category/save-draft' %}
-{% do view.setIsDeltaRegistrationActive(true) %}
-
-{% set groupHandle = group.handle %}
-{% set isNewCategory = category.id ? false : true %}
-
-{% hook "cp.categories.edit" %}
-
-{% block header %}
-<div class="flex flex-nowrap">
-    {{ block('pageTitle') }}
-    {{ block('contextMenu') }}
-</div>
-<div class="flex">
-    {{ block('actionButton') }}
-</div>
-{% endblock %}
-
-{% block contextMenu %}
-
-<div class="select">
-    <select onchange="document.location.href='{{ url('categories/'~groupHandle ~'/'~slug~'?site={locale}') }}'.replace('{locale}', this.value);">
-        {% for site in craft.app.sites.getAllSites() %}
-        <option value="{{ site.handle }}"{% if site.id == element.site %} selected{% endif %}>{{ site.name }}</option>
-        {% endfor %}
-    </select>
-</div>
-
-{% endblock %}
-
-{% block actionButton %}
-<div class="btngroup">
-    <input type="submit" class="btn submit" value="{{ 'Save'|t('app') }}">
-    <div class="btn submit menubtn"></div>
-    <div class="menu">
-        <ul>
-            <ul>
-                <li><a class="formsubmit" data-action="translations/category/publish-draft">{{ 'Publish draft'|t }}</a></li>
-            </ul>
-            <hr>
-            <ul>
-                <li><a class="formsubmit" data-action="translations/category/delete-draft" data-confirm="{{ 'Are you sure you want to delete this draft?'|t }}">{{ 'Delete draft'|t }}</a></li>
-            </ul>
-        </ul>
-    </div>
-</div>
-{% endblock %}
-
-{% block content %}
-    {{ redirectInput('categories/'~groupHandle) }}
-    {{ hiddenInput('groupId', group.id) }}
-    {{ hiddenInput('categoryId', category.id) }}
-    {{ hiddenInput('draftId', element.draftId) }}
-    {{ hiddenInput('site', element.site) }}
-    {{ actionInput(saveSourceAction) }}
-    {{ csrfInput() }}
-    {{ parent() }}
-
-{% endblock %}
-
-{% block details %}
-
-{% if element.id %}
-<div class="meta read-only">
-    <div class="data">
-        <h5 class="heading">{{ "Date Created"|t('app') }}</h5>
-        <div class="value">{{ element.dateCreated|datetime('short') }}</div>
-    </div>
-    <div class="data">
-        <h5 class="heading">{{ "Date Updated"|t('app') }}</h5>
-        <div class="value">{{ element.dateUpdated|datetime('short') }}</div>
-    </div>
-</div>
-{% endif %}
-{% endblock %}
diff --git a/src/templates/globals/_editDraft.html b/src/templates/globals/_editDraft.html
deleted file mode 100644
index 4373b330..00000000
--- a/src/templates/globals/_editDraft.html
+++ /dev/null
@@ -1,74 +0,0 @@
-{% extends "_layouts/cp" %}
-{% set title = "Globals"|t %}
-
-{% block pageTitle %}
-    {{ parent() }}
-
-    <div class="select">
-        <select onchange="document.location.href='{{ url('globals/{locale}/'~globalSetHandle) }}'.replace('{locale}', this.value);">
-            {% for site in craft.app.sites.getAllSites() %}
-                <option value="{{ site.handle }}"{% if site.id == draft.site %} selected{% endif %}>{{ site.name }}</option>
-            {% endfor %}
-        </select>
-    </div>
-    <div class="select" style="margin-left:0.75em;">
-        <select onchange="document.location.href=this.options[this.selectedIndex].value;">
-            <option value="{{ url('globals/'~craft.app.sites.getSiteById(draft.site).handle~'/'~globalSetHandle) }}"{>{{ 'Current'|t }}</option>
-            {% for d in drafts %}
-            <option value="{{ d.cpEditUrl }}"{% if draftId == d.draftId %} selected{% endif %}>{{ d.name }}</option>
-            {% endfor %}
-        </select>
-    </div>
-{% endblock %}
-
-{% block actionButton %}
-<div class="buttons">
-    <div class="btngroup">
-        <input type="submit" form="globalSetDraft" class="btn submit" value="{{ 'Save'|t }}">
-        <div class="btn submit menubtn" data-form="globalSetDraft"></div>
-        <div class="menu">
-            <ul>
-                <li><a class="formsubmit" data-action="translations/global-set/publish-draft">{{ 'Publish draft'|t }}</a></li>
-            </ul>
-            <hr>
-            <ul>
-                <li><a class="formsubmit" data-action="translations/global-set/delete-draft" data-confirm="{{ 'Are you sure you want to delete this draft?'|t }}">{{ 'Delete draft'|t }}</a></li>
-            </ul>
-        </div>
-    </div>
-</div>
-{% endblock %}
-
-{% block sidebar %}
-    <nav>
-        <ul>
-            {% for globalSet in globalSets %}
-                <li><a{% if globalSet.handle == globalSetHandle %} class="sel"{% endif %} href="{{ globalSet.getCpEditUrl() }}">{{ globalSet.name|t }}</a></li>
-            {% endfor %}
-        </ul>
-    </nav>
-{% endblock %}
-
-
-{% block content %}
-    <form id="globalSetDraft" method="post" accept-charset="UTF-8" data-saveshortcut data-confirm-unload>
-        <input type="hidden" name="action" value="translations/global-set/save-draft">
-        <input type="hidden" name="draftId" value="{{ draft.draftId }}">
-        <input type="hidden" name="site" value="{{ draft.site }}">
-        <input type="hidden" name="globalSetId" value="{{ globalSetId }}">
-        {{ csrfInput() }}
-
-        {% if draft.getFieldLayout().getFields() | length %}
-        <div>
-            {% for tab in draft.getFieldLayout().getTabs() %}
-                <div id="{{ tab.getHtmlId() }}"{% if not loop.first %} class="hidden"{% endif %}>
-                    {% include "_includes/fields" with {
-                        fields:  tab.getFields(),
-                        element: draft
-                    } only %}
-                </div>
-            {% endfor %}
-        </div>
-        {% endif %}
-    </form>
-{% endblock %}
diff --git a/src/templates/globals/_editDraft.twig b/src/templates/globals/_editDraft.twig
new file mode 100644
index 00000000..0ed2de12
--- /dev/null
+++ b/src/templates/globals/_editDraft.twig
@@ -0,0 +1,80 @@
+{% extends "_layouts/cp" %}
+{% set title = "Globals"|t %}
+
+{% block pageTitle %}
+{{ parent() }}
+
+<div class="select">
+    <select onchange="document.location.href='{{ url('globals/'~globalSetHandle) }}';">
+        {% for site in craft.app.sites.getAllSites() %}
+        <option value="{{ site.handle }}" {% if site.id==draft.site %} selected {% endif %}>{{ site.name }}</option>
+        {% endfor %}
+    </select>
+</div>
+<div class="select" style="margin-left:0.75em;">
+    <select onchange="document.location.href=this.options[this.selectedIndex].value;">
+        <option value="{{ url('globals/'~globalSetHandle) }}">{{ 'Current'|t }}</option>
+        {% for d in drafts %}
+        <option value="{{ d.cpEditUrl }}" {% if draftId==d.draftId %} selected {% endif %}>{{ d.name }}</option>
+        {% endfor %}
+    </select>
+</div>
+{% endblock %}
+
+{% block actionButton %}
+<div class="buttons">
+    <div class="btngroup">
+        <input type="submit" form="globalSetDraft" class="btn submit" value="{{ 'Save'|t }}">
+        <div class="btn submit menubtn" data-form="globalSetDraft"></div>
+        <div class="menu">
+            <ul>
+                <li><a class="formsubmit" data-action="translations/global-set/publish-draft">{{ 'Publish draft'|t
+                        }}</a></li>
+            </ul>
+            <hr>
+            <ul>
+                <li><a class="formsubmit" data-action="translations/global-set/delete-draft"
+                        data-confirm="{{ 'Are you sure you want to delete this draft?'|t }}">{{ 'Delete draft'|t }}</a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</div>
+{% endblock %}
+
+{% block sidebar %}
+<nav>
+    <ul>
+        {% for globalSet in globalSets %}
+        <li>
+            <a{% if globalSet.handle==globalSetHandle %} class="sel" {% endif %} href="{{ globalSet.getCpEditUrl() }}">
+                {{ globalSet.name|t }}</a>
+        </li>
+        {% endfor %}
+    </ul>
+</nav>
+{% endblock %}
+
+
+{% block content %}
+<form id="globalSetDraft" method="post" accept-charset="UTF-8" data-saveshortcut data-confirm-unload>
+    <input type="hidden" name="action" value="translations/global-set/save-draft">
+    <input type="hidden" name="draftId" value="{{ draft.draftId }}">
+    <input type="hidden" name="site" value="{{ draft.site }}">
+    <input type="hidden" name="globalSetId" value="{{ globalSetId }}">
+    {{ csrfInput() }}
+
+    {% if draft.getFieldLayout().getCustomFields() | length %}
+    <div>
+        {% for tab in draft.getFieldLayout().getTabs() %}
+        <div id="{{ tab.getHtmlId() }}" {% if not loop.first %} class="hidden" {% endif %}>
+            {% include "_includes/fields" with {
+            fields: tab.getLayout().getCustomFields(),
+            element: draft
+            } only %}
+        </div>
+        {% endfor %}
+    </div>
+    {% endif %}
+</form>
+{% endblock %}
\ No newline at end of file
diff --git a/src/templates/orders/_detail.twig b/src/templates/orders/_detail.twig
index 980ecc23..ce064df1 100644
--- a/src/templates/orders/_detail.twig
+++ b/src/templates/orders/_detail.twig
@@ -27,6 +27,7 @@
                 <input type="hidden" id="order-attr" data-status="{{ orderRecentStatus|default('pending') }}" data-isUpdateable="{{ isUpdateable|default('') }}"
                 data-submitted="{{ isSubmitted }}" data-changed="{{ isChanged }}"
 				data-has-completed-file="{{ order.hasCompletedFiles }}"
+				data-is-tm-aligned = "{{ isTargetChanged is empty }}"
 				data-translator="{{ order.translator.service|default('export_import') }}"/>
 				<div id="new-order-button-group" class="btngroup submit"></div>
 			</div>
diff --git a/src/templates/orders/_index.twig b/src/templates/orders/_index.twig
index bc525c16..5d71a993 100644
--- a/src/templates/orders/_index.twig
+++ b/src/templates/orders/_index.twig
@@ -1,5 +1,6 @@
 {% extends "_layouts/cp" %}
-{% import 'translations/_macros' as macros %}
+{% import '_includes/forms' as forms %}
+{% import 'translations/_components/_forms/button' as button %}
 
 {% set elementType = 'acclaro\\translations\\elements\\Order' %}
 
@@ -13,24 +14,35 @@
 
 {% set disabled = '' %}
 {% if (orderCountAcclaro == 0) %}
-    {% set disabled = 'disabled' %}
+    {% set disabled = 'link-disabled' %}
 {% endif %}
 
 {% block actionButton %}
     <form id="sync-orders" class="utility orders" method="post" accept-charset="UTF-8">
-        <input type="hidden" name="action" value="translations/order/sync-orders">
+        {{ forms.hidden({
+            name: 'action',
+            value: 'translations/order/sync-orders'
+        }) }}
         {{ csrfInput() }}
-        <div class="btngroup" style="margin-right:5px;">
-            <button type="submit" class="btn big {{ disabled }} icon" data-icon="refresh" value="submit" {{ disabled }}>{{ "Sync orders"|t('app') }}</button>
-        </div>
-        <div class="sync-status"></div>
+
+        {{ button.syncOrderButton(disabled) }}
     </form>
-    <a class="btn big submit icon btn-create-new-order" data-icon="language" href="{{ url('translations/orders/create') }}">{{ 'New order'|t }}</a>
+
+    {{ button.anchorButton({
+        label: 'New order',
+        class: 'submit',
+        href: url('translations/orders/create'),
+        attributes: {
+            data: {
+                icon: 'language',
+            },
+        }
+    }) }}
 {% endblock %}
 
 {% do view.registerAssetBundle("acclaro\\translations\\assetbundles\\OrderAssets") %}
 
-{% set sources = craft.app.elementIndexes.getSources(elementType, 'index') %}
+{% set sources = craft.app.elementSources.getSources(elementType, 'index') %}
 {% set customizableSources = (sources is not empty and context == 'index' and currentUser.can('customizeSources')) %}
 
 {% set showSiteMenu = (craft.app.getIsMultiSite() ? (showSiteMenu ?? 'auto') : false) %}
diff --git a/src/templates/settings/settings-check.twig b/src/templates/settings/settings-check.twig
index b31335ec..54ec350f 100644
--- a/src/templates/settings/settings-check.twig
+++ b/src/templates/settings/settings-check.twig
@@ -26,17 +26,17 @@
                         <span class="success" title="{{ 'Passed'|t('app') }}" data-icon="check"></span>
                     {% endif %}
                 </td>
-                <td>Craft CMS {{constant('acclaro\\translations\\Constants::CRAFT_MIN_VERSION')}}+ <span class="info">{{ 'Craft '~ constant('acclaro\\translations\\Constants::CRAFT_MIN_VERSION') ~'+ or higher is required.' }}</span></td>
+                <td>Craft CMS {{constant('acclaro\\translations\\Constants::CRAFT_MIN_VERSION')}}+ <span class="info">{{ 'Craft '~ constant('acclaro\\translations\\Constants::CRAFT_MIN_VERSION') ~' or higher is required.' }}</span></td>
             </tr>
             <tr>
                 <td class="thin centeralign">
-                    {% if settings.phpVersion < '7.2.0' %}
+                    {% if settings.phpVersion < '8.0.2' %}
                         <span class="error" title="{{ 'Failed'|t('app') }}" data-icon="alert"></span>
                     {% else %}
                         <span class="success" title="{{ 'Passed'|t('app') }}" data-icon="check"></span>
                     {% endif %}
                 </td>
-                <td>PHP 7.2+ <span class="info">{{ 'PHP 7.2 or higher is required.' }}</span></td>
+                <td>PHP 8.0.2+ <span class="info">{{ 'PHP 8.0.2 or higher is required.' }}</span></td>
             </tr>
             <tr>
                 <td class="thin centeralign">
@@ -107,7 +107,7 @@
     </table>
 
     <h2>{{ "Field Type Support"|t('app') }}</h2>
-    
+
     {# Fields #}
     <table class="data fullwidth" dir="ltr" style="padding-bottom:60px;">
         <tbody>
diff --git a/src/templates/static-translations/index.twig b/src/templates/static-translations/index.twig
index 09689c27..a1850d1a 100644
--- a/src/templates/static-translations/index.twig
+++ b/src/templates/static-translations/index.twig
@@ -1,5 +1,4 @@
-{% extends "_layouts/elementindex" %}
-{% import 'translations/_macros' as macros %}
+{% extends "_layouts/cp" %}
 
 {% set title = "Static Translations"|t('app') %}
 {% set elementType = 'acclaro\\translations\\elements\\StaticTranslations' %}
@@ -21,7 +20,7 @@
 
 {% do view.registerAssetBundle("acclaro\\translations\\assetbundles\\StaticTranslationsAssets") %}
 
-{% set sources = craft.app.elementIndexes.getSources(elementType, 'index') %}
+{% set sources = craft.app.elementSources.getSources(elementType, 'index', true) %}
 {% set customizableSources = (sources is not empty and context == 'index' and currentUser.can('customizeSources')) %}
 
 {% block sidebar %}
@@ -39,6 +38,13 @@
     {% endif %}
 {% endblock %}
 
+{% block toolbar %}
+    {% include '_elements/toolbar' with {
+        showSiteMenu: true,
+    } %}
+{% endblock %}
+
+
 {% block content %}
     <form method="post" id="static-translation" accept-charset="utf-8">
         {{ csrfInput() }}
@@ -64,8 +70,19 @@
 
 {% endblock %}
 
-{% js %}
+{% block initJs %}
+    Craft.elementIndex = Craft.createElementIndex('{{ elementType|e("js") }}', $('#page-container'), {
+        elementTypeName: '{{ elementInstance.displayName()|e("js") }}',
+        elementTypePluralName: '{{ elementInstance.pluralDisplayName()|e("js") }}',
+        context: '{{ context }}',
+        storageKey: 'elementindex.{{ elementType|e("js") }}',
+        criteria: Craft.defaultIndexCriteria,
+        toolbarSelector: '#toolbar',
+    });
+
     $(document).ready(function() {
         Craft.Translations.StaticTranslations.init();
     });
-{% endjs %}
+{% endblock %}
+
+{% js block('initJs') %}
diff --git a/src/templates/translators/_detail.twig b/src/templates/translators/_detail.twig
index 5d0b5fdf..73f7fe99 100644
--- a/src/templates/translators/_detail.twig
+++ b/src/templates/translators/_detail.twig
@@ -1,5 +1,6 @@
 {% extends '_layouts/cp' %}
 {% import '_includes/forms' as forms %}
+{% import 'translations/_components/_forms/button' as button %}
 
 {% do view.registerAssetBundle("acclaro\\translations\\assetbundles\\TranslatorAssets") %}
 
@@ -14,10 +15,14 @@
 {% block actionButton %}
     {# ! NOTE: hidden button we don't support draft as of now #}
     <div class="btngroup hidden">
-        <button type="submit" name="submit" value=""
-            class="btn big disabled">
-            {{ 'Save as draft'|t }}
-        </button>
+        {{ button.button({
+            type: 'submit',
+            label: 'Save as draft',
+            class: 'link-disabled',
+            attributes: {
+                name: 'submit',
+            }
+        }) }}
     </div>
 {% endblock %}
 
diff --git a/src/templates/translators/_index.twig b/src/templates/translators/_index.twig
index 5c55ffb7..7ed7a151 100644
--- a/src/templates/translators/_index.twig
+++ b/src/templates/translators/_index.twig
@@ -1,5 +1,5 @@
 {% extends '_layouts/cp' %}
-{% import 'translations/_macros' as macros %}
+{% import 'translations/_components/_forms/button' as button %}
 
 {% set title = 'Translators'|t %}
 {% set elementType = 'acclaro\\translations\\elements\\\Translator' %}
@@ -22,8 +22,22 @@
             <li><a class="error delete-translator disabled" title="{{ 'Delete translator service'|t }}" data-confirm="{{ 'Are you sure you want to delete selected translators?'|t }}">Delete</a></li>
         </ul>
     </div>
-    <a class="btn big icon btn-create-new-order" href="{{ url('translations/orders/create') }}" data-icon="language" style="margin-left:5px;">{{ 'New order'|t }}</a>
-    <a class="btn big submit add icon" href="{{ url('translations/translators/new') }}">{{ 'New translator'|t }}</a>
+
+    {{ button.anchorButton({
+        label: 'New order'|t,
+        href: url('translations/orders/create'),
+        attributes: {
+            data: {
+                icon: 'language',
+            },
+        }
+    }) }}
+
+    {{ button.anchorButton({
+        label: 'New translator'|t,
+        class: 'submit icon add',
+        href: url('translations/translators/new')
+    }) }}
 {% endblock %}
 
 {% do view.registerAssetBundle("acclaro\\translations\\assetbundles\\TranslatorAssets") %}
@@ -32,8 +46,7 @@
     { label: 'Translations'|t, url: url('translations') },
 ] %}
 
-{% set sources = craft.app.elementIndexes.getSources(elementType, 'index') %}
-{% set customizableSources = (sources is not empty and context == 'index' and currentUser.can('customizeSources')) %}
+{% set sources = craft.app.elementSources.getSources(elementType, 'index') %}
 
 {% block sidebar %}
     {% if sources is not empty %}
@@ -49,10 +62,10 @@
         <table class="data">
             <thead>
                 <tr>
-                    <th class="checkbox-cell selectallcontainer orderable" role="checkbox">
+                    <td class="checkbox-cell selectallcontainer orderable" role="checkbox">
                         <input type="checkbox" class="thin" title="select all" id="translator-0"/>
                         <label for="translator-0"></label>
-                    </th>
+                    </td>
                     <th>{{ 'Name'|t }}</th>
                     <th>{{ 'Status'|t }}</th>
                     <th>{{ 'Service'|t }}</th>
diff --git a/src/widgets/LanguageCoverage.php b/src/widgets/LanguageCoverage.php
index 7dc5491b..af5c2012 100644
--- a/src/widgets/LanguageCoverage.php
+++ b/src/widgets/LanguageCoverage.php
@@ -34,7 +34,7 @@ public static function displayName(): string
     /**
      * @inheritdoc
      */
-    public static function iconPath()
+    public static function icon(): ?string
     {
         return Craft::getAlias('@app/icons/world.svg');
     }
@@ -44,12 +44,12 @@ public static function iconPath()
     /**
      * @inheritdoc
      */
-    public function rules()
+    public function rules(): array
     {
         $rules = parent::rules();
-        
+
         $rules[] = ['limit', 'number', 'integerOnly' => true];
-        
+
         return $rules;
     }
 
@@ -64,7 +64,7 @@ public function minColspan()
     /**
      * @inheritdoc
      */
-    public function getSettingsHtml()
+    public function getSettingsHtml(): ?string
     {
         return Craft::$app->getView()->renderTemplate('translations/_components/widgets/LanguageCoverage/settings',
             [
@@ -75,7 +75,7 @@ public function getSettingsHtml()
     /**
      * @inheritdoc
      */
-    public function getBodyHtml()
+    public function getBodyHtml(): ?string
     {
         $params = [];
 
@@ -89,7 +89,7 @@ public function getBodyHtml()
         return Craft::$app->getView()->renderTemplate('translations/_components/widgets/LanguageCoverage/body', [
             'limit' => $this->limit,
             // 'colspan' => $this->limit
-        ]);   
+        ]);
     }
 
     public static function doesUserHaveWidget(string $type): bool
diff --git a/src/widgets/NewAndModifiedEntries.php b/src/widgets/NewAndModifiedEntries.php
index 77b95a00..1835c5b0 100644
--- a/src/widgets/NewAndModifiedEntries.php
+++ b/src/widgets/NewAndModifiedEntries.php
@@ -34,7 +34,7 @@ public static function displayName(): string
     /**
      * @inheritdoc
      */
-    public static function iconPath()
+    public static function icon(): ?string
     {
         return Craft::getAlias('@app/icons/newspaper.svg');
     }
@@ -54,13 +54,13 @@ public function getTitle(): string
     /**
      * @inheritdoc
      */
-    public function rules()
+    public function rules(): array
     {
         $rules = parent::rules();
-        
+
         $rules[] = ['limit', 'number', 'integerOnly' => true];
         $rules[] = ['days', 'number', 'integerOnly' => true];
-        
+
         return $rules;
     }
 
@@ -75,7 +75,7 @@ public function minColspan()
     /**
      * @inheritdoc
      */
-    public function getSettingsHtml()
+    public function getSettingsHtml(): ?string
     {
         $options = [
             ['label' => 'Last 24 hours', 'value' => 1],
@@ -96,7 +96,7 @@ public function getSettingsHtml()
     /**
      * @inheritdoc
      */
-    public function getBodyHtml()
+    public function getBodyHtml(): ?string
     {
         $params = [];
 
@@ -143,27 +143,4 @@ protected static function allowMultipleInstances(): bool
     {
         return false;
     }
-
-    /**
-     * Returns the new entries
-     *
-     * @return array
-     */
-    private function _getEntries(): array
-    {
-        $elements = Entry::find()->limit($this->limit)->orderBy(['dateUpdated' => SORT_DESC])->all();
-
-        $i = 0;
-        $entries = [];
-        foreach ($elements as $element) {
-            $entries[$i]['entryName'] = Craft::$app->getEntries()->getEntryById($element->id)->title;
-            $entries[$i]['entryId'] = $element->id;
-            $entries[$i]['entryDate'] = $element->dateUpdated;
-            $entries[$i]['entryDateTimestamp'] = $element->dateUpdated;
-            $entries[$i]['id'] = $element->id;
-            $i++;
-        }
-
-        return $entries;
-    }
 }
diff --git a/src/widgets/News.php b/src/widgets/News.php
index 5c8c8c8a..7e1c6310 100644
--- a/src/widgets/News.php
+++ b/src/widgets/News.php
@@ -32,7 +32,7 @@ public static function displayName(): string
     /**
      * @inheritdoc
      */
-    public static function iconPath()
+    public static function icon(): ?string
     {
         return Craft::getAlias('@app/icons/feed.svg');
     }
@@ -42,12 +42,12 @@ public static function iconPath()
     /**
      * @inheritdoc
      */
-    public function rules()
+    public function rules(): array
     {
         $rules = parent::rules();
-        
+
         $rules[] = ['limit', 'number', 'integerOnly' => true];
-        
+
         return $rules;
     }
 
@@ -62,7 +62,7 @@ public function minColspan()
     /**
      * @inheritdoc
      */
-    public function getSettingsHtml()
+    public function getSettingsHtml(): ?string
     {
         return Craft::$app->getView()->renderTemplate('translations/_components/widgets/News/settings',
             [
@@ -73,12 +73,12 @@ public function getSettingsHtml()
     /**
      * @inheritdoc
      */
-    public function getBodyHtml()
+    public function getBodyHtml(): ?string
     {
         $view = Craft::$app->getView();
-        
+
         $articles = $this->_getArticles();
-        
+
         return $view->renderTemplate('translations/_components/widgets/News/body', ['articles' => $articles]);
     }
 
diff --git a/src/widgets/RecentOrders.php b/src/widgets/RecentOrders.php
index 79b3b89e..d69fef8d 100644
--- a/src/widgets/RecentOrders.php
+++ b/src/widgets/RecentOrders.php
@@ -34,7 +34,7 @@ public static function displayName(): string
     /**
      * @inheritdoc
      */
-    public static function iconPath()
+    public static function icon(): ?string
     {
         return Craft::getAlias('@app/icons/clock.svg');
     }
@@ -44,12 +44,12 @@ public static function iconPath()
     /**
      * @inheritdoc
      */
-    public function rules()
+    public function rules(): array
     {
         $rules = parent::rules();
-        
+
         $rules[] = ['limit', 'number', 'integerOnly' => true];
-        
+
         return $rules;
     }
 
@@ -64,7 +64,7 @@ public function minColspan()
     /**
      * @inheritdoc
      */
-    public function getSettingsHtml()
+    public function getSettingsHtml(): ?string
     {
         return Craft::$app->getView()->renderTemplate('translations/_components/widgets/RecentOrders/settings',
             [
@@ -75,14 +75,14 @@ public function getSettingsHtml()
     /**
      * @inheritdoc
      */
-    public function getBodyHtml()
+    public function getBodyHtml(): ?string
     {
         $view = Craft::$app->getView();
-        
+
         $orders = $this->_getOrders();
 
         $orderCountAcclaro = Translations::$plugin->orderRepository->getAcclaroOrdersCount();
-        
+
         return $view->renderTemplate('translations/_components/widgets/RecentOrders/body', ['orders' => $orders, 'orderCountAcclaro' => $orderCountAcclaro]);
     }
 
@@ -114,7 +114,7 @@ private function _getOrders(): array
         $query = Order::find()
             ->orderBy(['dateUpdated' => SORT_DESC])
             ->limit($this->limit);
-        
+
         return $query->all();
     }
 
diff --git a/src/widgets/Translators.php b/src/widgets/Translators.php
index cb5f326d..e9dc5b09 100644
--- a/src/widgets/Translators.php
+++ b/src/widgets/Translators.php
@@ -33,7 +33,7 @@ public static function displayName(): string
     /**
      * @inheritdoc
      */
-    public static function iconPath()
+    public static function icon(): ?string
     {
         return Craft::getAlias('@acclaro/translations/icon-mask.svg');
     }
@@ -41,10 +41,10 @@ public static function iconPath()
     /**
      * @inheritdoc
      */
-    public function rules()
+    public function rules(): array
     {
         $rules = parent::rules();
-        
+
         return $rules;
     }
 
@@ -59,12 +59,12 @@ public function minColspan()
     /**
      * @inheritdoc
      */
-    public function getBodyHtml()
+    public function getBodyHtml(): ?string
     {
         $view = Craft::$app->getView();
-        
+
         $translators = $this->_getTranslators();
-        
+
         return $view->renderTemplate('translations/_components/widgets/Translators/body', ['translators' => $translators]);
     }