diff --git a/app/CMS/Repositories/Widgets/Widget.php b/app/CMS/Repositories/Widgets/Widget.php
index 25156d9f..bb924ce4 100644
--- a/app/CMS/Repositories/Widgets/Widget.php
+++ b/app/CMS/Repositories/Widgets/Widget.php
@@ -19,7 +19,7 @@ class Widget
         $widget->name = $data['name'];
         $widget->description = $data['description'];
         $widget->container_class = $data['containerClass'];
-        $widget->container_id = $data['containerId'];
+        $widget->container_id = empty($data['containerId']) ? null : $data['containerId'];
         $widget->settings = json_encode(call_user_func([$widgetType->handler, 'save'], $request));
 
         // save into database
diff --git a/app/Events/DeleteWidgetArea.php b/app/Events/DeleteWidgetArea.php
index 8e667d6d..d01d7951 100644
--- a/app/Events/DeleteWidgetArea.php
+++ b/app/Events/DeleteWidgetArea.php
@@ -2,7 +2,7 @@
 
 namespace App\Events;
 
-use App\Models\WidgetArea;
+use App\Models\Widgets\WidgetArea;
 use Illuminate\Queue\SerializesModels;
 
 class DeleteWidgetArea extends Event
@@ -20,7 +20,6 @@ class DeleteWidgetArea extends Event
      */
     public function __construct(WidgetArea $widgetArea)
     {
-        //
         $this->widgetArea = $widgetArea;
     }
 }
diff --git a/modules/ContactForm/Widgets/Address/Presenter.php b/modules/ContactForm/Widgets/Address/Presenter.php
index 568cf176..d828752d 100644
--- a/modules/ContactForm/Widgets/Address/Presenter.php
+++ b/modules/ContactForm/Widgets/Address/Presenter.php
@@ -24,15 +24,15 @@ class Presenter implements WidgetRenderer
         if (!$form)
             return null;
 
-        $formData = json_decode($form->moduleSettings);
+        $formData = $form->moduleSettings;
 
         $code = '<div class="address-widget ' . e($widget->container_class) . '"';
         if ($widget->container_id) {
             $code .= ' id="' . e($widget->container_id).'"';
         }
         $code .= '>';
-        $code .= "<p class='name'>".e($formData->companyName).'</p>';
-        $code .= nl2br($formData->address);
+        $code .= "<p class='name'>".e($formData['companyName']).'</p>';
+        $code .= nl2br($formData['address']);
         $code .= "</div>";
 
         return $code;