diff --git a/Classes/View/FluidView.php b/Classes/View/FluidView.php
index 7b7579e53f64880949d7a5e28567d16ab7da93ed..d2c68013c8d583c968821286270b8e1fdf2607da 100644
--- a/Classes/View/FluidView.php
+++ b/Classes/View/FluidView.php
@@ -25,89 +25,13 @@ namespace SGalinski\DfTabs\View;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-use SGalinski\DfTabs\Domain\Model\Tab;
-use TYPO3\CMS\Core\Context\Context;
-use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
-use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 
 /**
  * Renders the content
  */
 class FluidView implements SingletonInterface {
-	/**
-	 * @var array
-	 */
-	protected $pluginConfiguration = [];
-
-	/**
-	 * Page Renderer Instance
-	 *
-	 * @var PageRenderer
-	 */
-	protected $pageRenderer;
-
-	/**
-	 * @var ContentObjectRenderer
-	 */
-	protected $contentObject;
-
-	/**
-	 * Internal plugin counter
-	 *
-	 * @var int
-	 */
-	protected $counter = 1;
-
-	/**
-	 * Internal container that holds the used hashes
-	 *
-	 * @var array
-	 */
-	protected $usedHashes = [];
-
-	/**
-	 * Injects the plugin configuration
-	 *
-	 * @param array $configuration
-	 * @param string $tabId
-	 * @return void
-	 */
-	public function injectPluginConfiguration(array $configuration, $tabId) {
-		$this->pluginConfiguration[$tabId] = $configuration;
-
-		$this->pluginConfiguration[$tabId]['counter'] = $this->counter;
-		if (\in_array($this->pluginConfiguration[$tabId]['hashName'], $this->usedHashes)) {
-			$this->pluginConfiguration[$tabId]['hashName'] = 'tab' . $this->counter . '-';
-		}
-		$this->usedHashes[] = $this->pluginConfiguration[$tabId]['hashName'];
-
-		++$this->counter;
-	}
-
-	/**
-	 * Injects the page renderer
-	 *
-	 * @param PageRenderer $pageRenderer
-	 * @return void
-	 */
-	public function injectPageRenderer($pageRenderer) {
-		$this->pageRenderer = $pageRenderer;
-	}
-
-	/**
-	 * Injects the content object
-	 *
-	 * @param ContentObjectRenderer $contentObject
-	 * @return void
-	 */
-	public function injectContentObject($contentObject) {
-		$this->contentObject = $contentObject;
-	}
-
 
 	/**
 	 * Renders the tabs
diff --git a/Resources/Private/Templates/Standard/Tabs.html b/Resources/Private/Templates/Standard/Tabs.html
index fee3536f5c253ccaab7848fe476dcebcfaa78dc6..211db7f402b1e8718bd5e2bea12eaf98168f602e 100644
--- a/Resources/Private/Templates/Standard/Tabs.html
+++ b/Resources/Private/Templates/Standard/Tabs.html
@@ -1,4 +1,4 @@
-<div class="default-content-element m-tabs" data-more-label="{f:translate(key: 'frontend.buttonLabelMore', extensionName: 'df_tabs')}">
+<div class="m-tabs" data-more-label="{f:translate(key: 'frontend.buttonLabelMore', extensionName: 'df_tabs')}">
 	<div class="m-tabs__tablist" role="tablist">
 		<f:for each="{tabElements}" as="tab" iteration="iterator">
 			<button class="m-tabs__tab" role="tab" aria-controls="panel-{tab.record}-{iterator.index}" id="tab-{tab.record}-{iterator.index}" aria-selected="{f:if(condition: iterator.isFirst, then: 'true', else: 'false')}">