diff --git a/ResponsiveThemeForDevelopers.csproj b/ResponsiveThemeForDevelopers.csproj
index be9a26e..46440c3 100644
--- a/ResponsiveThemeForDevelopers.csproj
+++ b/ResponsiveThemeForDevelopers.csproj
@@ -114,6 +114,8 @@
     <Content Include="Theme.png" />
     <Content Include="Theme.txt" />
     <Content Include="ThemeZonePreview.png" />
+    <Content Include="Views\Elements\AuthenticatedUserSnippet.txt" />
+    <Content Include="Views\Elements\iFrameSnippet.txt" />
     <Content Include="Web.config" />
     <Content Include="js\Web.config" />
     <Content Include="img\Web.config" />
@@ -137,7 +139,6 @@
     <Content Include="Views\BlogPost.Title.Summary.cshtml" />
     <Content Include="Views\Document.cshtml" />
     <Content Include="Views\Dropdown.cshtml" />
-    <Content Include="Views\Elements\AuthenticatedUserSnippet.cshtml" />
     <Content Include="Views\Elements\Checkbox.cshtml" />
     <Content Include="Views\Elements\Column.cshtml" />
     <Content Include="Views\Elements\Enumeration-CheckList.cshtml" />
@@ -145,7 +146,6 @@
     <Content Include="Views\Elements\Form.cshtml" />
     <Content Include="Views\Elements\Grid.cshtml" />
     <Content Include="Views\Elements\Image.cshtml" />
-    <Content Include="Views\Elements\ResponsiveIframeSnippet.cshtml" />
     <Content Include="Views\Elements\ShareButtonSnippet.cshtml" />
     <Content Include="Views\ErrorPage.cshtml" />
     <Content Include="Views\Layout.cshtml" />
@@ -235,6 +235,12 @@
   <ItemGroup>
     <Content Include="scss\components\_tags.scss" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\iFrameSnippet.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Elements\AuthenticatedUserSnippet.cshtml" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/Theme.txt b/Theme.txt
index bf07c71..38486b5 100644
--- a/Theme.txt
+++ b/Theme.txt
@@ -2,6 +2,6 @@ Name: ResponsiveThemeForDevelopers
 Author: George Roubie
 Website: https://gr.linkedin.com/in/georgeroubie
 Description: Responsive Theme optimized for Orchard 1.10.2
-Version: 1.3.1
+Version: 1.4.0
 Tags: Theme, Responsive, Bootstrap, jQuery, JS, JavaScript, Sass, Orchard, Toastr, FontAwesome, Developer, CSS, Gulp, npm
 Zones: Header, Navigation, BeforeMain, Featured, AsideFirst, Messages, BeforeContent, Content, AfterContent, AsideSecond, AfterMain, TripelFirst, TripelSecond, TripelThird, FooterQuadFirst, FooterQuadSecond, FooterQuadThird, FooterQuadFourth, Footer
diff --git a/Views/Elements/AuthenticatedUserSnippet.cshtml b/Views/Elements/AuthenticatedUserSnippet.cshtml
index 3bd5367..a9e6b3c 100644
--- a/Views/Elements/AuthenticatedUserSnippet.cshtml
+++ b/Views/Elements/AuthenticatedUserSnippet.cshtml
@@ -1,6 +1,11 @@
 @{
+    string redirectUrl = Model.URL;
     if (WorkContext.CurrentUser == null)
     {
-        Response.Redirect("~/Users/Account/LogOn");
+        if(String.IsNullOrEmpty(redirectUrl)) {
+            Response.Redirect("~/Users/Account/LogOn");
+        } else {
+            Response.Redirect("~/" + redirectUrl);
+        }
     }
 }
\ No newline at end of file
diff --git a/Views/Elements/AuthenticatedUserSnippet.txt b/Views/Elements/AuthenticatedUserSnippet.txt
new file mode 100644
index 0000000..988b5b6
--- /dev/null
+++ b/Views/Elements/AuthenticatedUserSnippet.txt
@@ -0,0 +1,9 @@
+DisplayName: Authenticated User 
+ToolboxIcon: \uf007
+Description: Authenticated User Snippet
+Category: Snippets
+Fields:
+  - Name: URL
+    DisplayName: URL
+    Description: If the user is not authenticated will be redirected to this url. Leave empty for default.
+    Type: Text
\ No newline at end of file
diff --git a/Views/Elements/ResponsiveIframeSnippet.cshtml b/Views/Elements/ResponsiveIframeSnippet.cshtml
deleted file mode 100644
index 0c01908..0000000
--- a/Views/Elements/ResponsiveIframeSnippet.cshtml
+++ /dev/null
@@ -1,7 +0,0 @@
-@using Orchard.Layouts.Helpers
-<div class="embed-responsive embed-responsive-@Html.SnippetField("Ratio").DisplayedAs(T("Ratio")).WithDescription(T("16by9 or 4by3"))">
-    <iframe class="embed-responsive-item"
-            src="@Html.SnippetField("URL").DisplayedAs(T("Iframe URL")).WithDescription(T("Enter here the Iframe url of your provider"))" 
-            frameborder="0" allowfullscreen>
-    </iframe>
-</div>
\ No newline at end of file
diff --git a/Views/Elements/iFrameSnippet.cshtml b/Views/Elements/iFrameSnippet.cshtml
new file mode 100644
index 0000000..2a6321e
--- /dev/null
+++ b/Views/Elements/iFrameSnippet.cshtml
@@ -0,0 +1,12 @@
+@{ 
+    string url = Model.URL;
+    string ratio = Model.Ratio;
+    if(ratio != "16by9" && ratio != "4by3") {
+        ratio = "4by3";
+    }
+}
+@if (!String.IsNullOrEmpty(url)) {
+    <div class="embed-responsive embed-responsive-@ratio">
+        <iframe class="embed-responsive-item" src="@url" allowfullscreen></iframe>
+    </div>
+}
\ No newline at end of file
diff --git a/Views/Elements/iFrameSnippet.txt b/Views/Elements/iFrameSnippet.txt
new file mode 100644
index 0000000..5505bdf
--- /dev/null
+++ b/Views/Elements/iFrameSnippet.txt
@@ -0,0 +1,13 @@
+DisplayName: iFrame 
+ToolboxIcon: \uf1c9
+Description: iFrame Snippet
+Category: Snippets
+Fields:
+  - Name: URL
+    DisplayName: URL
+    Description: Enter here the iFrame URL of your provider.
+    Type: Text
+  - Name: Ratio
+    DisplayName: Ratio
+    Description: Enter the ratio of iFrame 16by9 or 4by3. Leave empty for default.
+    Type: Text
diff --git a/package.json b/package.json
index 784231c..a29e81f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "responsive-theme-for-developers",
-  "version": "1.3.1",
+  "name": "responsive-theme-for-developers-orchard-cms",
+  "version": "1.4.0",
   "description": "Responsive Orchard CMS theme for developers",
   "main": "Document.cshtml",
   "scripts": {