diff --git a/templates/A2nt/CMSNiceties/Widgets/LinksWidget.ss b/templates/A2nt/CMSNiceties/Widgets/LinksWidget.ss
new file mode 100755
index 0000000..ecbae02
--- /dev/null
+++ b/templates/A2nt/CMSNiceties/Widgets/LinksWidget.ss
@@ -0,0 +1,9 @@
+<% with $Widget %>
+    <% if $Links %>
+        <% loop $Links %>
+            <a href="$LinkURL"<% if $OpenInNewWindow %> target="_blank"<% end_if %> class="btn btn-default">
+                $Title
+            </a>
+        <% end_loop %>
+    <% end_if %>
+<% end_with %>
diff --git a/templates/Includes/Content.ss b/templates/Includes/Content.ss
index ff366ba..9725414 100755
--- a/templates/Includes/Content.ss
+++ b/templates/Includes/Content.ss
@@ -41,7 +41,7 @@
     <div class="element">
         <div class="element_container">
             <div class="$DefaultContainer">
-                $ExtraCode
+                $ExtraCode.RAW
             </div>
         </div>
     </div>
diff --git a/templates/Includes/MainContent.ss b/templates/Includes/MainContent.ss
index dad3319..e014d4a 100755
--- a/templates/Includes/MainContent.ss
+++ b/templates/Includes/MainContent.ss
@@ -2,7 +2,7 @@
     <% if $HeroImageRecursive %>
         <div class="element element__hero-image">
             <div class="element-container">
-                <% include SlideItem Image=$HeroImageRecursive, SlideWidth='2140', SlideHeight='450' %>
+                $HeroImageRecursive.Fill(2140,450)
             </div>
         </div>
     <% end_if %>