diff --git a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
index a0006850f9d9ef586ac2defa6b4338ca774241ed..3f0164f5260575b2943da3cfbb6d004890d41679 100644
--- a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
+++ b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
@@ -83,7 +83,7 @@ class ViewModuleController
     {
         $this->view->getRequest()->setControllerExtensionName('Viewpage');
         $this->view->setTemplate($templateName);
-        $this->view->setTemplateRootPaths(['EXT:viewpage/Resources/Private/Templates/ViewModule']);
+        $this->view->setTemplateRootPaths(['EXT:viewpage/Resources/Private/Templates']);
         $this->view->setPartialRootPaths(['EXT:viewpage/Resources/Private/Partials']);
         $this->view->setLayoutRootPaths(['EXT:viewpage/Resources/Private/Layouts']);
     }
diff --git a/typo3/sysext/viewpage/Resources/Private/Templates/ViewModule/Show.html b/typo3/sysext/viewpage/Resources/Private/Templates/Show.html
similarity index 90%
rename from typo3/sysext/viewpage/Resources/Private/Templates/ViewModule/Show.html
rename to typo3/sysext/viewpage/Resources/Private/Templates/Show.html
index 50e537f53269ba9f2e40e61edd433ece738cd375..be1efab3f31f2a1e7548fc9a8bc48727b83cbda2 100644
--- a/typo3/sysext/viewpage/Resources/Private/Templates/ViewModule/Show.html
+++ b/typo3/sysext/viewpage/Resources/Private/Templates/Show.html
@@ -1,6 +1,5 @@
 <f:layout name="DocHeader" />
 <f:section name="Content">
-    <f:flashMessages />
     <f:if condition="{url}">
         <div class="viewpage-item">
             <div class="viewpage-topbar t3js-viewpage-topbar">
@@ -18,11 +17,11 @@
                     </button>
                     <ul class="dropdown-menu" aria-labelledby="viewpage-topbar-preset-button">
                         <li>
-                            <a href="#" class="dropdown-item t3js-preset-maximized t3js-change-preset" data-key="maximized" data-label="{f:translate(key: 'maximized')}" data-width data-height>
+                            <a href="#" class="dropdown-item t3js-preset-maximized t3js-change-preset" data-key="maximized" data-label="{f:translate(key: 'LLL:EXT:viewpage/Resources/Private/Language/locallang.xlf:maximized')}" data-width data-height>
                                 <span class="viewpage-preset-item">
                                     <span class="viewpage-preset-item-icon">{icons.fullscreen -> f:format.raw()}</span>
                                     <span class="viewpage-preset-item-label">
-                                        {f:translate(key: 'maximized')}
+                                        {f:translate(key: 'LLL:EXT:viewpage/Resources/Private/Language/locallang.xlf:maximized')}
                                     </span>
                                     <span class="viewpage-preset-item-size">
                                         100%/100%
@@ -31,11 +30,11 @@
                             </a>
                         </li>
                         <li>
-                            <a href="#" class="dropdown-item t3js-preset-custom t3js-change-preset" data-key="custom" data-label="{f:translate(key: 'custom')}" data-width="{custom.width}" data-height="{custom.height}">
+                            <a href="#" class="dropdown-item t3js-preset-custom t3js-change-preset" data-key="custom" data-label="{f:translate(key: 'LLL:EXT:viewpage/Resources/Private/Language/locallang.xlf:custom')}" data-width="{custom.width}" data-height="{custom.height}">
                                 <span class="viewpage-preset-item">
                                     <span class="viewpage-preset-item-icon">{icons.expand -> f:format.raw()}</span>
                                     <span class="viewpage-preset-item-label t3js-preset-custom-label">
-                                        {f:translate(key: 'custom')}
+                                        {f:translate(key: 'LLL:EXT:viewpage/Resources/Private/Language/locallang.xlf:custom')}
                                     </span>
                                     <span class="viewpage-preset-item-size">
                                         <span class="t3js-preset-custom-width">{custom.width}</span>px/<span class="t3js-preset-custom-height">{custom.height}</span>px