diff --git a/views/templates/admin/form.tpl b/views/templates/admin/form.tpl
index 6b27181..dfac801 100644
--- a/views/templates/admin/form.tpl
+++ b/views/templates/admin/form.tpl
@@ -1,31 +1,52 @@
 <div id="form" class="minic-container">
 	<form id="form-feed" class="" method="post" action="{$minic.form_action}">
         <div class="minic-top">
-            <h3>{l s='Subscription form settings' mod='minicmailchimp'}
-                <a href="#" target="_blank" class="help">{l s='help & tips' mod='minicmailchimp'}</a>
+            <h3>{l s='Signup form settings' mod='minicmailchimp'}
+                <!-- <a href="#" target="_blank" class="help">{l s='help & tips' mod='minicmailchimp'}</a> -->
             </h3>
             <a href="#form" class="minic-close">x</a>
         </div>
         <div class="minic-content">
+            <div class="input-holder">
+                <label for="">{l s='Block title' mod='minicmailchimp'}:</label>
+                {foreach from=$minic.languages item=language}
+                    <div id="title_{$language.id_lang}" style="display: {if $language.id_lang == $minic.default_lang}block{else}none{/if};">
+                        <input type="text" name="title_{$language.id_lang}" value="{if $minic.form.data.{$language.id_lang}.title}{$minic.form.data.{$language.id_lang}.title}{/if}">
+                    </div>
+                {/foreach}
+                {$minic.flags.title}
+                <p style="float: left; clear: both;">{l s='Leave it empty if you do not want to appear on the front of the site.' mod='minicmailchimp'}</p>
+            </div>
             <div class="input-holder">
                 <label>{l s='Choose where to show the form' mod='minicmailchimp'}:</label>
                 <select multiple name="hooks[]" id="">
                     {foreach from=$minic.hooks item=hook}
-                    <option value="display{$hook}">{$hook}</option>
+                    <option value="{$hook}" {if $minic.form.hooks && in_array($hook, $minic.form.hooks)}selected{/if}>{$hook}</option>
                     {/foreach}
                 </select>
                 <p>{l s='Hold down the CTRL to select multiple.' mod='minicmailchimp'}</p>
             </div>
             <div class="input-holder">
                 <label>{l s='Insert the form code here' mod='minicmailchimp'}:</label>
-                <textarea name="form"></textarea>
+                {foreach from=$minic.languages item=language}
+                    <div id="form_{$language.id_lang}" style="display: {if $language.id_lang == $minic.default_lang}block{else}none{/if};">
+                        <textarea name="form_{$language.id_lang}">{if $minic.form.data.{$language.id_lang}.form}{$minic.form.data.{$language.id_lang}.form}{/if}</textarea>
+                    </div>
+                {/foreach}
+                {$minic.flags.form}
             </div>
             <div class="minic-comments"> 
                 <h3>{l s='How to get the form code' mod='minicmailchimp'}</h3>
                 <ol style="list-style: decimal;">
-                    <li>{l s='Log in into' mod='minicmailchimp'} <a href="https://login.mailchimp.com/" target="_blank">Mailchimp</a></li>
-                    <li>step 2.</li>
+                    <li>{l s='Log in into' mod='minicmailchimp'} <a href="https://login.mailchimp.com/" target="_blank">Mailchimp</a>.</li>
+                    <li>{l s='Go to the lists, and select a list where you want the subscribers to subscribe.' mod='minicmailchimp'}</li>
+                    <li>{l s='Search the "For Your Website" dropwdown menu and select the "Signup Form Embed Code".' mod='minicmailchimp'}</li>
+                    <li>{l s='Configure your form to serve your needs.' mod='minicmailchimp'}</li>
+                    <li>{l s='Click the "Create Embed Code" button, and copy the HTML code below.' mod='minicmailchimp'}</li>
+                    <li>{l s='Paste the code into the textfield.' mod='minicmailchimp'}</li>
                 </ol>
+                <h3>{l s='Important' mod='minicmailchimp'}</h3>
+                <p>{l s='If you wish to use the module properly and you have multiple languages enabled, then do not forget to change the titles and other texts in the form code (if you do not understand the HTML code you can do it when you configure the form on the Mailchimp website, just repeat the steps above and change the titles).' mod='minicmailchimp'}</p>
             </div>
         </div>
         <div class="minic-bottom">
diff --git a/views/templates/admin/import.tpl b/views/templates/admin/import.tpl
index 6f68468..d422110 100644
--- a/views/templates/admin/import.tpl
+++ b/views/templates/admin/import.tpl
@@ -1,26 +1,27 @@
 <div id="import" class="minic-container">
 	<form id="form-feed" class="" method="post" action="{$minic.form_action}">
         <div class="minic-top">
-            <h3>{l s='Import users' mod='minicmailchimp'}
-                <a href="#" target="_blank" class="help">{l s='help & tips' mod='minicmailchimp'}</a>
+            <h3>{l s='Import customers' mod='minicmailchimp'}
+                <!-- <a href="#" target="_blank" class="help">{l s='help & tips' mod='minicmailchimp'}</a> -->
             </h3>
             <a href="#import" class="minic-close">x</a>
         </div>
         <div class="minic-content">
 	        <div class="input-holder">
-                <label>{l s='Choose the list to import' mod='minicmailchimp'}:</label>
+                <label>{l s='Choose where you want to import' mod='minicmailchimp'}:</label>
                 <select id="list-selector-import" data-list="import" name="list" class="list-selector">
                     <option value="0"> - </option>
                     {foreach from=$mailchimp_list item=list}
                     <option value="{$list.id}">{$list.name}</option>
                     {/foreach}
                 </select>
+                <p>{l s='These are your Mailchimp lists, choose where do you want to import the subscribers.' mod='minicmailchimp'}</p>
             </div>
             <div class="input-holder">
-                <label>{l s='Attach fields' mod='minicmailchimp'}:</label>
                 {foreach from=$mailchimp_list key=k item=list}
                 {if isset($list.fields)}
                     <div id="import-{$list.id}" class="fields-holder">
+                        <label>{l s='Attach fields' mod='minicmailchimp'}:</label>
                         {foreach from=$list.fields item=field}
                             {if $field.tag != 'EMAIL'}
                             <div style="clear:both;">
@@ -44,21 +45,21 @@
                 <div class="switch small inactive">
                     <input type="radio" class="" name="optin"  value="0" checked="true" />
                 </div>
-                <p style="clear:both;">{l s='Turn on if you wish to send confirmation email for customers after import is done.' mod='minicmailchimp'}</p>
+                <p style="clear:both;">{l s='Mailchimp can send a confirmation email after import to the customers, turn on if you wish to inform your customers about the subscription.' mod='minicmailchimp'}</p>
             </div>
             <div class="switch-holder inline">
                 <label for="">{l s='Update if exists'}:</label>
                 <div class="switch small inactive">
                     <input type="radio" class="" name="update_users"  value="0" checked="true" />
                 </div>
-                <p style="clear:both;">{l s='Turn on if you wish to update the record if alredy exists. If you dont you\'ll receive a warning for those customers.' mod='minicmailchimp'}</p>
+                <p style="clear:both;">{l s='Do you wish to update the subscribers details if they alredy exists?' mod='minicmailchimp'}</p>
             </div>
             <div class="switch-holder inline">
                 <label for="">{l s='Import all Customers'}:</label>
                 <div class="switch small inactive">
                     <input type="radio" class="" name="all-user"  value="0" checked="true" />
                 </div>
-                <p style="clear:both;">{l s='Turn on if you wish to import all of the users, not just the subscribers.' mod='minicmailchimp'}</p>
+                <p style="clear:both;">{l s='Turn this on if you wish to import all of the users. This means that the module ignores the customers newsletter option.' mod='minicmailchimp'}</p>
             </div>
         </div>
         <div class="minic-bottom">
diff --git a/views/templates/admin/mailchimp.tpl b/views/templates/admin/mailchimp.tpl
index 0b522f3..cb79593 100644
--- a/views/templates/admin/mailchimp.tpl
+++ b/views/templates/admin/mailchimp.tpl
@@ -1,8 +1,8 @@
-<div id="mailchimp" class="minic-container" {if !$minic.mailchimp.apikey}style="display:block;"{/if}>{debug}
+<div id="mailchimp" class="minic-container" {if !$minic.mailchimp.apikey}style="display:block;"{/if}>
 	<form id="form-feed" class="" method="post" action="{$minic.form_action}">
         <div class="minic-top">
-            <h3>{l s='Mailchimp configuration' mod='minicmailchimp'}
-                <a href="#" target="_blank" class="help">{l s='help & tips' mod='minicmailchimp'}</a>
+            <h3>{l s='Mailchimp API configuration' mod='minicmailchimp'}
+                <!-- <a href="#" target="_blank" class="help">{l s='help & tips' mod='minicmailchimp'}</a> -->
             </h3>
             <a href="#mailchimp" class="minic-close">x</a>
         </div>
diff --git a/views/templates/admin/minicmailchimp.tpl b/views/templates/admin/minicmailchimp.tpl
index 3253748..ab0a27d 100644
--- a/views/templates/admin/minicmailchimp.tpl
+++ b/views/templates/admin/minicmailchimp.tpl
@@ -19,10 +19,10 @@
 		</div>
 		<div id="banner"></div>
 		<div id="navigation">
-			<a href="#mailchimp" class="minic-open" style="float: right;">{l s='Mailchimp configuration' mod='minicmailchimp'}</a>
+			<a href="#mailchimp" class="minic-open mailchimp" style="float: right;"><i class="icon-cog"></i>{l s='Mailchimp API' mod='minicmailchimp'}</a>
 			{if $minic.mailchimp.apikey}
-				<a href="#import" class="minic-open">{l s='Import' mod='minicmailchimp'}</a>
-				<a href="#form" class="minic-open">{l s='Newsletter subscription' mod='minicmailchimp'}</a>
+				<a href="#import" class="minic-open import"><i class="icon-arrow-up"></i>{l s='Import' mod='minicmailchimp'}</a>
+				<a href="#form" class="minic-open form"><i class="icon-user"></i>{l s='Signup form' mod='minicmailchimp'}</a>
 			{/if}
 		</div>
 	</div>
diff --git a/views/templates/hooks/home.tpl b/views/templates/hooks/home.tpl
index 4df7336..47630e0 100644
--- a/views/templates/hooks/home.tpl
+++ b/views/templates/hooks/home.tpl
@@ -1,3 +1,8 @@
 <!-- minicmailchimp -->
-	{l s='Hello World' mod='minicmailchimp'}
+<div id="minic_mailchimp" class="block {$mailchimp_form.class}">
+	{if $mailchimp_form.title}
+		<p class="title_block" style="margin-bottom: 10px;">{$mailchimp_form.title}</p>
+	{/if}
+	{$mailchimp_form.form|unescape:"html"}
+</div>
 <!-- end minicmailchimp -->
\ No newline at end of file