diff --git a/Resources.zip.manifest b/Resources.zip.manifest
index c023521..39c54c7 100644
--- a/Resources.zip.manifest
+++ b/Resources.zip.manifest
@@ -1,101 +1,5 @@
 <dotnetnuke type="ResourceFile" version="5.0">
   <files>
-    <file>
-      <path>ViewModels/</path>
-      <name>ArticleViewModel.cs</name>
-    </file>
-    <file>
-      <path>ViewModels/</path>
-      <name>ArticleViewModels.cs</name>
-    </file>
-    <file>
-      <path>services/</path>
-      <name>DnnSimpleArticleController.cs</name>
-    </file>
-    <file>
-      <path>services/</path>
-      <name>DnnSimpleArticleRouteMapper.cs</name>
-    </file>
-    <file>
-      <path>scripts/</path>
-      <name>DnnSimpleArticle.js</name>
-    </file>
-    <file>
-      <path>Providers/Sitemap/</path>
-      <name>Sitemap.cs</name>
-    </file>
-    <file>
-      <path>Providers/DataProviders/SqlDataProvider/</path>
-      <name>SqlDataProvider.cs</name>
-    </file>
-    <file>
-      <path>Properties/</path>
-      <name>AssemblyInfo.cs</name>
-    </file>
-    <file>
-      <path>packages/MSBuildTasks.1.4.0.128/tools/</path>
-      <name>Build.proj</name>
-    </file>
-    <file>
-      <path>packages/MSBuildTasks.1.4.0.128/tools/</path>
-      <name>Install.ps1</name>
-    </file>
-    <file>
-      <path>packages/MSBuildTasks.1.4.0.128/tools/</path>
-      <name>MSBuild.Community.Tasks.dll</name>
-    </file>
-    <file>
-      <path>packages/MSBuildTasks.1.4.0.128/tools/</path>
-      <name>MSBuild.Community.Tasks.Targets</name>
-    </file>
-    <file>
-      <path>packages/MSBuildTasks.1.4.0.128/tools/</path>
-      <name>MSBuild.Community.Tasks.xml</name>
-    </file>
-    <file>
-      <path>packages/MSBuildTasks.1.4.0.128/tools/</path>
-      <name>MSBuild.Community.Tasks.xsd</name>
-    </file>
-    <file>
-      <path>packages/MSBuildTasks.1.4.0.128/tools/</path>
-      <name>MSBuild.psm1</name>
-    </file>
-    <file>
-      <path>packages/MSBuildTasks.1.4.0.128/content/</path>
-      <name>MSBuild.Community.Tasks.ReadMe.md</name>
-    </file>
-    <file>
-      <path>packages/MSBuildTasks.1.4.0.128/</path>
-      <name>MSBuildTasks.1.4.0.128.nupkg</name>
-    </file>
-    <file>
-      <path>obj/Release/</path>
-      <name>TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs</name>
-    </file>
-    <file>
-      <path>obj/Release/</path>
-      <name>TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs</name>
-    </file>
-    <file>
-      <path>obj/Release/</path>
-      <name>TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs</name>
-    </file>
-    <file>
-      <path>obj/Debug/</path>
-      <name>TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs</name>
-    </file>
-    <file>
-      <path>obj/Debug/</path>
-      <name>TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs</name>
-    </file>
-    <file>
-      <path>obj/Debug/</path>
-      <name>TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs</name>
-    </file>
-    <file>
-      <path>Data/</path>
-      <name>DataProvider.cs</name>
-    </file>
     <file>
       <path>Controls/App_LocalResources/</path>
       <name>ArticleList.ascx.resx</name>
@@ -105,16 +9,16 @@
       <name>ArticleView.ascx.resx</name>
     </file>
     <file>
-      <path>Controls/</path>
-      <name>ArticleList.ascx</name>
+      <path>Controls/App_LocalResources/</path>
+      <name>FlexibleList.ascx.resx</name>
     </file>
     <file>
-      <path>Controls/</path>
-      <name>ArticleList.ascx.cs</name>
+      <path>scripts/</path>
+      <name>DnnSimpleArticle.js</name>
     </file>
     <file>
       <path>Controls/</path>
-      <name>ArticleList.ascx.designer.cs</name>
+      <name>ArticleList.ascx</name>
     </file>
     <file>
       <path>Controls/</path>
@@ -122,39 +26,7 @@
     </file>
     <file>
       <path>Controls/</path>
-      <name>ArticleView.ascx.cs</name>
-    </file>
-    <file>
-      <path>Controls/</path>
-      <name>ArticleView.ascx.designer.cs</name>
-    </file>
-    <file>
-      <path>Components/Taxonomy/</path>
-      <name>Content.cs</name>
-    </file>
-    <file>
-      <path>Components/Taxonomy/</path>
-      <name>Terms.cs</name>
-    </file>
-    <file>
-      <path>Components/</path>
-      <name>Article.cs</name>
-    </file>
-    <file>
-      <path>Components/</path>
-      <name>ArticleController.cs</name>
-    </file>
-    <file>
-      <path>Components/</path>
-      <name>FeatureController.cs</name>
-    </file>
-    <file>
-      <path>BuildScripts/</path>
-      <name>ModulePackage.targets</name>
-    </file>
-    <file>
-      <path>BuildScripts/</path>
-      <name>MSBuild.Community.Tasks.Targets</name>
+      <name>FlexibleList.ascx</name>
     </file>
     <file>
       <path>App_LocalResources/</path>
@@ -166,48 +38,16 @@
     </file>
     <file>
       <path>App_LocalResources/</path>
-      <name>View.ascx.resx</name>
-    </file>
-    <file>
-      <path>.nuget/</path>
-      <name>NuGet.targets</name>
-    </file>
-    <file>
-      <path>.build/</path>
-      <name>MSBuild.Community.Tasks.targets</name>
-    </file>
-    <file>
-      <path />
-      <name>dnnsimplearticle.csproj</name>
+      <name>UrlSettings.ascx.resx</name>
     </file>
     <file>
-      <path />
-      <name>dnnsimplearticle.sln</name>
-    </file>
-    <file>
-      <path />
-      <name>dnnsimplearticle.xml</name>
-    </file>
-    <file>
-      <path />
-      <name>dnnsimplearticleModuleBase.cs</name>
-    </file>
-    <file>
-      <path />
-      <name>dnnsimplearticleSettingsBase.cs</name>
+      <path>App_LocalResources/</path>
+      <name>View.ascx.resx</name>
     </file>
     <file>
       <path />
       <name>Edit.ascx</name>
     </file>
-    <file>
-      <path />
-      <name>Edit.ascx.cs</name>
-    </file>
-    <file>
-      <path />
-      <name>Edit.ascx.designer.cs</name>
-    </file>
     <file>
       <path />
       <name>License.txt</name>
@@ -224,37 +64,17 @@
       <path />
       <name>sarss.aspx</name>
     </file>
-    <file>
-      <path />
-      <name>sarss.aspx.cs</name>
-    </file>
-    <file>
-      <path />
-      <name>sarss.aspx.designer.cs</name>
-    </file>
     <file>
       <path />
       <name>Settings.ascx</name>
     </file>
     <file>
       <path />
-      <name>Settings.ascx.cs</name>
-    </file>
-    <file>
-      <path />
-      <name>Settings.ascx.designer.cs</name>
+      <name>UrlSettings.ascx</name>
     </file>
     <file>
       <path />
       <name>View.ascx</name>
     </file>
-    <file>
-      <path />
-      <name>View.ascx.cs</name>
-    </file>
-    <file>
-      <path />
-      <name>View.ascx.designer.cs</name>
-    </file>
   </files>
 </dotnetnuke>
\ No newline at end of file
diff --git a/dnnsimplearticle.csproj b/dnnsimplearticle.csproj
index adb1d4b..14e1761 100644
--- a/dnnsimplearticle.csproj
+++ b/dnnsimplearticle.csproj
@@ -7,6 +7,13 @@
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <UseIISExpress>false</UseIISExpress>
+    <Use64BitIISExpress />
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -23,7 +30,7 @@
     <OldToolsVersion>4.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
@@ -270,7 +277,18 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <SaveServerSettingsInUserFile>True</SaveServerSettingsInUserFile>
+          <UseIIS>True</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>50978</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://dnndev.me/desktopmodules/dnnsimplearticle</IISUrl>
+          <OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
+          <IISAppRootUrl>http://dnndev.me</IISAppRootUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>
diff --git a/dnnsimplearticle.csproj.user b/dnnsimplearticle.csproj.user
index 3f45de1..3cd9ccf 100644
--- a/dnnsimplearticle.csproj.user
+++ b/dnnsimplearticle.csproj.user
@@ -8,7 +8,7 @@
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
     <ProjectView>ShowAllFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
   </PropertyGroup>
   <ProjectExtensions>
@@ -31,17 +31,6 @@
           </StartWorkingDirectory>
           <EnableENC>True</EnableENC>
           <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
-          <UseIIS>True</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>50978</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://dnndev.me/desktopmodules/dnnsimplearticle</IISUrl>
-          <OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
-          <IISAppRootUrl>http://dnndev.me</IISAppRootUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>
diff --git a/install/DNNSimpleArticle_00.02.07_Install.zip b/install/DNNSimpleArticle_00.02.07_Install.zip
index b37d06a..7362ea7 100644
Binary files a/install/DNNSimpleArticle_00.02.07_Install.zip and b/install/DNNSimpleArticle_00.02.07_Install.zip differ
diff --git a/install/DNNSimpleArticle_00.02.07_Source.zip b/install/DNNSimpleArticle_00.02.07_Source.zip
index 72f6338..1df844f 100644
Binary files a/install/DNNSimpleArticle_00.02.07_Source.zip and b/install/DNNSimpleArticle_00.02.07_Source.zip differ
diff --git a/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index 11b819e..240dadd 100644
Binary files a/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/obj/Release/dnnsimplearticle.csproj.FileListAbsolute.txt b/obj/Release/dnnsimplearticle.csproj.FileListAbsolute.txt
index cd55b97..817a70e 100644
--- a/obj/Release/dnnsimplearticle.csproj.FileListAbsolute.txt
+++ b/obj/Release/dnnsimplearticle.csproj.FileListAbsolute.txt
@@ -9,7 +9,6 @@ C:\websites\dnndev.me\bin\dnnsimplearticle.pdb
 C:\websites\dnndev.me\bin\dnnsimplearticle.xml
 C:\websites\dnndev.me\DesktopModules\dnnsimplearticle\obj\Release\dnnsimplearticle.dll
 C:\websites\dnndev.me\DesktopModules\dnnsimplearticle\obj\Release\dnnsimplearticle.pdb
-C:\Websites\dnndev.me\DesktopModules\dnnsimplearticle\obj\Release\dnnsimplearticle.csproj.CoreCompileInputs.cache
 C:\Websites\dnndev.me\DesktopModules\dnnsimplearticle\obj\Release\dnnsimplearticle.csproj.CopyComplete
 C:\Websites\dnndev.me\DesktopModules\dnnsimplearticle\obj\Release\dnnsimplearticle.csprojAssemblyReference.cache
 C:\websites\932.dnndev.me\bin\dnnsimplearticle.dll
diff --git a/obj/Release/dnnsimplearticle.dll b/obj/Release/dnnsimplearticle.dll
index 8a89506..0e4f6fc 100644
Binary files a/obj/Release/dnnsimplearticle.dll and b/obj/Release/dnnsimplearticle.dll differ
diff --git a/obj/Release/dnnsimplearticle.pdb b/obj/Release/dnnsimplearticle.pdb
index 3537cd7..bb06d1b 100644
Binary files a/obj/Release/dnnsimplearticle.pdb and b/obj/Release/dnnsimplearticle.pdb differ