diff --git a/web/modules/custom/frontify_assets/js/frontify_file.js b/web/modules/custom/frontify_assets/js/frontify_file.js
index 5a0eef0..1a6b5ae 100644
--- a/web/modules/custom/frontify_assets/js/frontify_file.js
+++ b/web/modules/custom/frontify_assets/js/frontify_file.js
@@ -53,7 +53,8 @@
             domain: drupalSettings.FrontifyAssets.api_url,
             container: selector,
             options: {
-              allowMultiSelectfcc: true,
+              allowMultiSelect: true,
+              permanentDownloadUrls: true,
               filters: [
                 {
                   key: 'ext',
diff --git a/web/modules/custom/frontify_assets/js/frontify_image.js b/web/modules/custom/frontify_assets/js/frontify_image.js
index 2371cae..00bcd3f 100644
--- a/web/modules/custom/frontify_assets/js/frontify_image.js
+++ b/web/modules/custom/frontify_assets/js/frontify_image.js
@@ -11,13 +11,19 @@
    */
   Drupal.behaviors.FrontifyImage = {
     attach: function () {
+
+      jQuery('.cta_wrapper .form-item--disabled').hide();
+      jQuery('input.frontify-wrapper-extensions').parent().hide();
+
       $('input.frontify-image-delete-button').on('click', function (event) {
         event.preventDefault();
         var $field = $(this).parents('.fieldset.fieldset.js-form-item');
         $field.find('.frontify-wrapper-finder-overlay').removeClass('frontify-wrapper-finder-overlay-shown');
+        $field.find('.frontify-image-insert-button').show();
         $field.find('img.frontify-image-preview').attr("src", '');
         $field.find('input.frontify-assets-image-url').val('');
         $field.find('input.frontify-assets-image-download').val('');
+        $field.find('input.frontify-assets-alt-text').attr("disabled", "disabled");
         $field.find('input.frontify-assets-alt-text').val('');
         $field.find('input.frontify-assets-filesize').val('');
         $field.find('input.frontify-assets-mimetype').val('');
@@ -51,7 +57,8 @@
             domain: drupalSettings.FrontifyAssets.api_url,
             container: selector,
             options: {
-              allowMultiSelectfcc: true,
+              allowMultiSelect: true,
+              permanentDownloadUrls: true,
               filters: [
                 {
                   key: 'ext',
@@ -78,12 +85,16 @@
               $field.find('img.frontify-image-preview').attr("src", assets[0].previewUrl + '?width=100');
               $field.find('input.frontify-assets-image-url').val(assets[0].previewUrl);
               $field.find('input.frontify-assets-image-download').val(assets[0].downloadUrl);
+              $field.find('.cta_wrapper .form-item--disabled').show();
               $field.find('input.frontify-assets-alt-text').val(assets[0].title);
+              $field.find('input.frontify-assets-alt-text').removeAttr("disabled");
+              $field.find('.form-item__description').hide();
               $field.find('input.frontify-assets-filesize').val(assets[0].size);
               $field.find('input.frontify-assets-mimetype').val(assets[0].extension);
               $field.find('input.frontify-assets-filename').val(assets[0].filename);
               $field.find('input.frontify-assets-created-at').val(assets[0].createdAt);
               $field.find('input.frontify-image-delete-button').show();
+              $field.find('.frontify-image-insert-button').hide();
             })
             finder.onCancel(() => {
               event.currentTarget.disabled = false;
diff --git a/web/modules/custom/frontify_assets/js/frontify_video.js b/web/modules/custom/frontify_assets/js/frontify_video.js
index 050b0bd..4e51e61 100644
--- a/web/modules/custom/frontify_assets/js/frontify_video.js
+++ b/web/modules/custom/frontify_assets/js/frontify_video.js
@@ -53,7 +53,7 @@
             domain: drupalSettings.FrontifyAssets.api_url,
             container: selector,
             options: {
-              allowMultiSelectfcc: true,
+              allowMultiSelect: true,
               permanentDownloadUrls: true,
               filters: [
                 {
diff --git a/web/modules/custom/frontify_assets/src/Plugin/Field/FieldWidget/FrontifyImageFieldWidget.php b/web/modules/custom/frontify_assets/src/Plugin/Field/FieldWidget/FrontifyImageFieldWidget.php
index bf2ccb5..b309455 100644
--- a/web/modules/custom/frontify_assets/src/Plugin/Field/FieldWidget/FrontifyImageFieldWidget.php
+++ b/web/modules/custom/frontify_assets/src/Plugin/Field/FieldWidget/FrontifyImageFieldWidget.php
@@ -125,6 +125,14 @@ class FrontifyImageFieldWidget extends LinkWidget {
     // Render image in dimension of 100x100.
     if (!empty($previewImageUrl)) {
       $previewImageUrl = $this->frontifyService->attachImageWidth($previewImageUrl, 100, 100, TRUE);
+      $display = '';
+      $selectButtonDisplay = 'none';
+      $disabledFlag = FALSE;
+    }
+    else {
+      $selectButtonDisplay = '';
+      $display = 'none';
+      $disabledFlag = TRUE;
     }
     $element['frontify_wrapper_image'] = [
       '#type' => 'container',
@@ -132,7 +140,6 @@ class FrontifyImageFieldWidget extends LinkWidget {
         'class' => ['frontify-wrapper-image'],
       ],
     ];
-    $display = 'none';
     $element['frontify_wrapper_image']['cta-dl']['delete'] = [
       '#type' => 'button',
       '#value' => $this->t('Remove'),
@@ -171,14 +178,15 @@ class FrontifyImageFieldWidget extends LinkWidget {

     $element['frontify_wrapper_image']['cta']['open'] = [
       '#type' => 'button',
-      '#value' => $this->t('Select Frontify Image'),
-      '#suffix' => '</div>',
+      '#value' => $this->t('Select Image'),
+      '#suffix' => '<div class="form-item__description"> Allowed types: ' . $extensions . ' </div></div>',
       '#attributes' => [
         'class' => [
           'frontify-image-insert-button',
           'button--extrasmall',
           'btn-primary',
         ],
+        'style' => ['display:' . $selectButtonDisplay],
       ],
       '#attached' => [
         'library' => [
@@ -196,10 +204,6 @@ class FrontifyImageFieldWidget extends LinkWidget {
       '#limit_validation_errors' => [],
     ];

-    if (!empty($item->uri)) {
-      $display = '';
-    }
-
     $element['frontify_wrapper_image']['cta']['alt'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Alt text'),
@@ -207,6 +211,17 @@ class FrontifyImageFieldWidget extends LinkWidget {
       '#default_value' => isset($item->alt) ? $item->alt : NULL,
       '#maxlength' => 255,
       '#description' => $this->t('Short description of the image used by screen readers and displayed when the image is not loaded. This is important for accessibility.'),
+      '#attributes' => [
+        'class' => ['frontify-assets-alt-text'],
+        'disabled' => $disabledFlag,
+      ],
+    ];
+
+    $element['alt'] = [
+      '#type' => 'hidden',
+      '#title' => $this->t('Alt text'),
+      '#default_value' => isset($item->alt) ? $item->alt : NULL,
+      '#maxlength' => 255,
       '#attributes' => [
         'class' => ['frontify-assets-alt-text'],
       ],