diff --git a/modules/ContactForm/Providers/ContactFormServiceProvider.php b/modules/ContactForm/Providers/ContactFormServiceProvider.php
index 6bb4e7c4..d6c77bc0 100644
--- a/modules/ContactForm/Providers/ContactFormServiceProvider.php
+++ b/modules/ContactForm/Providers/ContactFormServiceProvider.php
@@ -1,12 +1,9 @@
 <?php namespace Modules\ContactForm\Providers;
 
-use App\Handlers\Registrators\TemplateRegistrator;
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\ServiceProvider;
-use InvalidArgumentException;
 use Modules\ContactForm\Handlers\ContactForm;
 use Modules\ContactForm\Widgets\Address\Address;
-use Modules\ContactForm\Widgets\Address\Form;
+use Modules\ContactForm\Widgets\Form\Form;
 
 class ContactFormServiceProvider extends ServiceProvider
 {
@@ -94,5 +91,6 @@ class ContactFormServiceProvider extends ServiceProvider
         $registrator = $this->app->make('registerWidget');
 
         $registrator->register(Address::class, null, ContactForm::getModuleId());
+        $registrator->register(Form::class, null, ContactForm::getModuleId());
     }
 }
diff --git a/modules/ContactForm/Resources/lang/en/admin/widgets.php b/modules/ContactForm/Resources/lang/en/admin/widgets.php
index 3e09aa89..3d387a0d 100644
--- a/modules/ContactForm/Resources/lang/en/admin/widgets.php
+++ b/modules/ContactForm/Resources/lang/en/admin/widgets.php
@@ -9,7 +9,7 @@ return [
     'form'              => [
         'name'        => 'Contact form',
         'description' => 'Display small contact form anywhere on website.',
-        'new'         => 'New contact block widget'
+        'new'         => 'New contact form widget'
     ],
     'noContactForms'    => 'You have not created any contact form. Try to create one before creating this widget.',
     'selectContactForm' => 'Select contact form'
diff --git a/modules/ContactForm/Resources/views/admin/widgets/form/edit.blade.php b/modules/ContactForm/Resources/views/admin/widgets/form/edit.blade.php
new file mode 100644
index 00000000..b3b0b98c
--- /dev/null
+++ b/modules/ContactForm/Resources/views/admin/widgets/form/edit.blade.php
@@ -0,0 +1,19 @@
+@extends('admin.layoutWithNavigation')
+
+@section('pageHeading', @trans('contactform::admin/widgets.address.edit'))
+@section('pageDescription', $widget->description)
+
+@section('content')
+
+    @if(!count($forms))
+        <div class="alert alert-warning">@lang('contactform::admin/widgets.noContactForms')</div>
+    @else
+        <div class="col-md-8">
+            @include('contactform::admin.widgets.form.form', ['action' => route('widgets.postEdit', ['id' => $widget->id])])
+        </div>
+        <div class="col-md-4">
+            @widgetPreview($widget)
+        </div>
+    @endif
+@endsection
+
diff --git a/modules/ContactForm/Resources/views/admin/widgets/form/form.blade.php b/modules/ContactForm/Resources/views/admin/widgets/form/form.blade.php
new file mode 100644
index 00000000..19dfcd3e
--- /dev/null
+++ b/modules/ContactForm/Resources/views/admin/widgets/form/form.blade.php
@@ -0,0 +1,17 @@
+<form action="{{$action}}" method="POST">
+    @include('admin.widgets.snippets.commonForm')
+
+    <label class="label-control">
+        @lang('contactform::admin/widgets.selectContactForm')
+    </label>
+
+    <select class="form-control" name="contactFormId">
+        @foreach($forms as $form)
+            <option @if(old('contactFormId', isset($widget->settings->contactFormId) ? $widget->settings->contactFormId : '') == $form->id) selected @endif value="{{$form->id}}">{{$form->title}}</option>
+        @endforeach
+    </select>
+
+    <button type="submit" class="btn btn-primary">
+        @lang('widgets/htmlCode.save')
+    </button>
+</form>
\ No newline at end of file
diff --git a/modules/ContactForm/Resources/views/admin/widgets/form/new.blade.php b/modules/ContactForm/Resources/views/admin/widgets/form/new.blade.php
new file mode 100644
index 00000000..fc3ff7cb
--- /dev/null
+++ b/modules/ContactForm/Resources/views/admin/widgets/form/new.blade.php
@@ -0,0 +1,14 @@
+@extends('admin.layoutWithNavigation')
+
+@section('pageHeading', @trans('contactform::admin/widgets.form.new'))
+@section('pageDescription', @trans($type->description))
+
+@section('content')
+
+    @if(!count($forms))
+        <div class="alert alert-warning">@lang('contactform::admin/widgets.noContactForms')</div>
+    @else
+        @include('contactform::admin.widgets.form.form', ['action' => route('widgets.postNew', ['type' => $type])])
+    @endif
+@endsection
+
diff --git a/modules/ContactForm/Widgets/Address/Presenter.php b/modules/ContactForm/Widgets/Address/Presenter.php
index 1901cfff..144f4df7 100644
--- a/modules/ContactForm/Widgets/Address/Presenter.php
+++ b/modules/ContactForm/Widgets/Address/Presenter.php
@@ -26,9 +26,9 @@ class Presenter implements WidgetRenderer
 
         $formData = json_decode($form->module_settings);
 
-        $code = '<div class="address ' . e($widget->containerClass) . '"';
-        if ($widget->containerId) {
-            $code .= ' id="' . e($widget->containerId);
+        $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>';
diff --git a/modules/ContactForm/Widgets/Form/Form.php b/modules/ContactForm/Widgets/Form/Form.php
new file mode 100644
index 00000000..b6a4e7d7
--- /dev/null
+++ b/modules/ContactForm/Widgets/Form/Form.php
@@ -0,0 +1,52 @@
+<?php
+namespace Modules\ContactForm\Widgets\Form;
+
+use App\Models\Widget;
+use App\Widgets\Contracts\WidgetRenderer;
+use App\Widgets\NonInstallableWidget;
+
+class Form extends NonInstallableWidget
+{
+    /**
+     * Name getter
+     *
+     * @return string
+     */
+    public static function getName()
+    {
+        return 'contactform::admin/widgets.form.name';
+    }
+
+    /**
+     * Getter for description
+     *
+     * @return string
+     */
+    public static function getDescription()
+    {
+        return 'contactform::admin/widgets.form.description';
+    }
+
+    /**
+     * Getter for presenter/renderer of this widget
+     *
+     * @return WidgetRenderer
+     */
+    public static function getPresenter()
+    {
+        return Presenter::class;
+    }
+
+    /**
+     * @param Widget    $widget
+     * @param \stdClass $data
+     *
+     * @return mixed
+     */
+    public static function save(Widget $widget, \stdClass $data)
+    {
+        $widget->settings = json_encode(['contactFormId' => $data->contactFormId,]);
+
+        return $widget;
+    }
+}
\ No newline at end of file
diff --git a/modules/ContactForm/Widgets/Form/Presenter.php b/modules/ContactForm/Widgets/Form/Presenter.php
new file mode 100644
index 00000000..29435ec7
--- /dev/null
+++ b/modules/ContactForm/Widgets/Form/Presenter.php
@@ -0,0 +1,75 @@
+<?php
+namespace Modules\ContactForm\Widgets\Form;
+
+use App\Models\Content;
+use App\Models\Widget;
+use App\Models\WidgetType;
+use App\Widgets\Contracts\WidgetRenderer;
+
+class Presenter implements WidgetRenderer
+{
+    public static $template = null;
+
+    /**
+     * Method used for displaying widget.
+     *
+     * This method renders some HTML code for displaying.
+     *
+     * @param Widget $widget
+     *
+     * @return mixed
+     * @throws \ErrorException
+     */
+    public static function render(Widget $widget)
+    {
+        if (!self::$template) {
+            throw new \ErrorException('Cannot render contact form without template! Please, set Presenter::$template variable before rendering.');
+        }
+
+        $form = Content::find($widget->settings->contactFormId);
+
+        if (!$form) {
+            return null;
+        }
+
+        $form->module_settings = json_decode($form->module_settings);
+
+        return view(self::$template, ['widget' => $widget, 'form' => $form]);
+    }
+
+    /**
+     * Display form for creating new instance of widget
+     *
+     * @param WidgetType $type
+     *
+     * @return mixed
+     */
+    public static function renderAddForm(WidgetType $type)
+    {
+        $contactForms = Content::where('module_handler', config('contactform.handler'))
+                               ->get();
+
+        return view('contactform::admin.widgets.form.new', [
+            'type'   => $type,
+            'widget' => new Widget(),
+            'forms'  => $contactForms
+        ]);
+    }
+
+    /**
+     * Display form for editing already existing widget
+     *
+     * @param Widget $widget
+     *
+     * @return mixed
+     */
+    public static function renderEditForm(Widget $widget)
+    {
+        $contactForms = Content::where('module_handler', config('contactform.handler'))
+                               ->get();
+        return view('contactform::admin.widgets.address.edit', [
+            'widget' => $widget,
+            'forms'  => $contactForms
+        ]);
+    }
+}
\ No newline at end of file