diff --git a/views/templates/admin/form.tpl b/views/templates/admin/form.tpl
new file mode 100644
index 0000000..8cbb26e
--- /dev/null
+++ b/views/templates/admin/form.tpl
@@ -0,0 +1,24 @@
+<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>
+            <a href="#form" 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>
+                <select name="list">
+                    {foreach from=$mailchimp_list.data item=list}
+                    <option value="{$list.id}">{$list.name}</option>
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+        <div class="minic-bottom">
+            <input type="submit" name="submitImport" class="button-large green" value="{l s='Save' mod='minicmailchimp'}" />
+            <a href="#form" class="minic-close button-large lgrey">{l s='Close' mod='minicmailchimp'}</a>
+        </div>
+	</form>
+</div>
\ No newline at end of file
diff --git a/views/templates/admin/minicmailchimp.tpl b/views/templates/admin/minicmailchimp.tpl
index 95604f5..3253748 100644
--- a/views/templates/admin/minicmailchimp.tpl
+++ b/views/templates/admin/minicmailchimp.tpl
@@ -19,19 +19,22 @@
 		</div>
 		<div id="banner"></div>
 		<div id="navigation">
-			<a href="#settings" class="minic-open">{l s='Settings' mod='minicmailchimp'}</a>
-			{if $minic.settings.apikey}
+			<a href="#mailchimp" class="minic-open" style="float: right;">{l s='Mailchimp configuration' 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>
 			{/if}
 		</div>
 	</div>
 	<!-- Messages -->
 	{include file="{$minic.admin_tpl_path}messages.tpl" id="global" text=$minic.message.text class=$minic.message.type}
 	<!-- Settings -->
-	{include file="{$minic.admin_tpl_path}settings.tpl"}
-	{if $minic.settings.apikey}
+	{include file="{$minic.admin_tpl_path}mailchimp.tpl"}
+	{if $minic.mailchimp.apikey}
 		<!-- Import -->
 		{include file="{$minic.admin_tpl_path}import.tpl"}
+		<!-- Form -->
+		{include file="{$minic.admin_tpl_path}form.tpl"}
 	{/if}
 	<!-- feedback -->
 	{include file="{$minic.admin_tpl_path}feedback.tpl"}
diff --git a/views/templates/admin/settings.tpl b/views/templates/admin/settings.tpl
deleted file mode 100644
index dab7943..0000000
--- a/views/templates/admin/settings.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<div id="settings" class="minic-container" {if !$minic.settings.apikey}style="display:block;"{/if}>{debug}
-	<form id="form-feed" class="" method="post" action="{$minic.form_action}">
-        <div class="minic-top">
-            <h3>{l s='Settings' mod='minicmailchimp'}
-                <a href="#" target="_blank" class="help">{l s='help & tips' mod='minicmailchimp'}</a>
-            </h3>
-            <a href="#settings" class="minic-close">x</a>
-        </div>
-        <div class="minic-content">
-    		<div class="input-holder">
-    			<label>{l s='Mailchimp API Key' mod='minicmailchimp'}:</label>
-    			<input id="settings-key" class="apikey" type="text" name="apikey" value="{if $minic.settings.apikey}{$minic.settings.apikey}{/if}" />
-    		</div>
-            <div class="switch-holder inline">
-                <label>{l s='Use SSL'}: </label>
-                <div class="switch small {if isset($minic.settings.ssl) && $minic.settings.ssl}active{else}inactive{/if}">
-                    <input type="radio" class="" name="ssl"  value="{if isset($minic.settings.ssl) && $minic.settings.ssl}1{else}0{/if}" checked="true" />
-                </div>
-            </div>
-            <div class="switch-holder inline">
-                <label>{l s='Sync new registration'}: </label>
-                <div class="switch small {if isset($minic.settings.registration) && $minic.settings.registration}active{else}inactive{/if}">
-                    <input type="radio" class="" name="registration"  value="{if isset($minic.settings.registration) && $minic.settings.registration}1{else}0{/if}" checked="true" />
-                </div>
-            </div>
-            <div class="minic-comments"> 
-                <h3>{l s='How to get your API key' mod='minicmailchimp'}</h3>
-                <p>{l s='If you alredy have an API key click'} <a href="https://us6.admin.mailchimp.com/account/api-key-popup/" target="_blank">{l s='here' mod='minicmailchimp'}</a>, {l s='otherwise you can get a new one from'} <a href="https://us6.admin.mailchimp.com/account/api/" target="_blank">{l s='here' mod='minicmailchimp'}</a></p>
-                <h3>{l s='Tutorial to get an API key' mod='minicmailchimp'}</h3>
-                <p>{l s='You can find more info'} <a href="http://kb.mailchimp.com/article/where-can-i-find-my-api-key" target="_blank">{l s='here' mod='minicmailchimp'}</a></p>
-            </div>
-        </div>
-        <div class="minic-bottom">
-            <input type="submit" name="submitSettings" class="button-large green" value="{l s='Save' mod='minicmailchimp'}" />
-            <a href="#settings" class="minic-close button-large lgrey">{l s='Close' mod='minicmailchimp'}</a>
-        </div>
-	</form>
-</div>
\ No newline at end of file