diff --git a/src/template-parts/single-items-metadata_new.php b/src/template-parts/single-items-metadata_new.php
index e57e6a7..a3a20ff 100644
--- a/src/template-parts/single-items-metadata_new.php
+++ b/src/template-parts/single-items-metadata_new.php
@@ -1,96 +1,106 @@
 <?php 
+    /** 
+     * The new metadata sections function makes it a bit more complicated to add
+     * the thumbnail and share buttons in the middle of the metadata.
+     * So we have some logic that is only needed if they are set.
+     * The following uses a filter to add them right above the first metadatum in the first section.
+     **/
+    if (
+        ( has_post_thumbnail() && get_theme_mod( 'tainacan_single_item_display_thumbnail', true ) ) ||
+        ( !get_theme_mod('tainacan_single_item_collection_header', false) && get_theme_mod( 'tainacan_single_item_display_share_buttons', true ) )
+    ) {
+        // Gets collection so we can obtain firtst metadata
+        $collection = tainacan_get_collection();
 
-    // Gets collection so we can obtain firtst metadata
-    $collection = tainacan_get_collection();
+        if ( !is_null($collection) ) {
 
-    if ( !is_null($collection) ) {
-    
-        // Gets array of metadata order
-        $metadata_order = $collection->get_metadata_order();
+            // Gets array of metadata order
+            $metadata_order = $collection->get_metadata_order();
 
-        if ( is_array($metadata_order) ) {
+            if ( is_array($metadata_order) ) {
 
-            $first_metadatum_id = -1;
+                $first_metadatum_id = -1;
 
-            foreach( $metadata_order as $metadatum ) {
+                foreach( $metadata_order as $metadatum ) {
 
-                // Checks if the metadata is enabled
-                if ( isset($metadatum['enabled']) && $metadatum['enabled'] && isset($metadatum['id']) ) {
-                    $first_metadatum_id = $metadatum['id'];
+                    // Checks if the metadata is enabled
+                    if ( isset($metadatum['enabled']) && $metadatum['enabled'] && isset($metadatum['id']) ) {
+                        $first_metadatum_id = $metadatum['id'];
 
-                    // IF we are not displaying the title here, we must look for the second metadata
-                    if ( get_theme_mod('tainacan_single_item_hide_core_title_metadata', false) ) {
+                        // IF we are not displaying the title here, we must look for the second metadata
+                        if ( get_theme_mod('tainacan_single_item_hide_core_title_metadata', false) ) {
 
-                        $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
-                        $metadatum_object = $Tainacan_Metadata->fetch($first_metadatum_id);
-                        $metadata_type_object = $metadatum_object->get_metadata_type_object();
-                        
-                        if ( $metadata_type_object->get_related_mapped_prop() == 'title' ) {
-                            continue;
+                            $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
+                            $metadatum_object = $Tainacan_Metadata->fetch($first_metadatum_id);
+                            $metadata_type_object = $metadatum_object->get_metadata_type_object();
+                            
+                            if ( $metadata_type_object->get_related_mapped_prop() == 'title' ) {
+                                continue;
+                            }
                         }
+
+                        break;
                     }
-
-                    break;
                 }
-            }
 
-            if ( is_numeric($first_metadatum_id) && $first_metadatum_id >= 0 ) {
+                if ( is_numeric($first_metadatum_id) && $first_metadatum_id >= 0 ) {
 
-                add_filter('tainacan-get-item-metadatum-as-html-before--id-' . $first_metadatum_id, function($before, $item_metadatum) {
+                    add_filter('tainacan-get-item-metadatum-as-html-before--id-' . $first_metadatum_id, function($before, $item_metadatum) {
 
-                    ob_start();
-            
-                    if (has_post_thumbnail() && get_theme_mod( 'tainacan_single_item_display_thumbnail', true )): ?>
-                        <div class="tainacan-item-thumbnail-container card border-0 mb-3">
-                            <div class="card-body border-0 pl-0 pt-0 pb-1">
-                                <h3><?php _e( 'Thumbnail', 'tainacan-interface' ); ?></h3>
-                                <?php the_post_thumbnail('tainacan-medium-full', array('class' => 'item-card--thumbnail mt-2')); ?>
-                            </div>
-                        </div>
-                    <?php endif; ?>
-                    <?php if (!get_theme_mod('tainacan_single_item_collection_header', false) && get_theme_mod( 'tainacan_single_item_display_share_buttons', true )): ?>
-                        <div class="card border-0 mb-3">
-                            <div class="tainacan-item-share-container card-body border-0 pl-0 pt-0 pb-1">
-                                <h3><?php _e( 'Share', 'tainacan-interface' ); ?></h3>
-                                <div class="btn-group" role="group">
-                                    <?php if ( true == get_theme_mod( 'tainacan_facebook_share', true ) ) : ?> 
-                                        <a href="http://www.facebook.com/sharer.php?u=<?php the_permalink(); ?>" class="item-card-link--sharing" target="_blank" title="<?php esc_attr_e('Share this on facebook', 'tainacan-interface') ?>">
-                                            <img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/facebook-circle.png'; ?>" alt="<?php esc_attr_e('Share this on facebook', 'tainacan-interface') ?>">
-                                        </a>
-                                    <?php endif; ?>
-                                    <?php if ( true == get_theme_mod( 'tainacan_twitter_share', true ) ) : ?> 
-                                        <?php
-                                        $twitter_option = get_theme_mod( 'tainacan_twitter_user' );
-                                        $via = ! empty( $twitter_option ) ? '&amp;via=' . esc_attr( get_theme_mod( 'tainacan_twitter_user' ) ) : '';
-                                        ?>
-                                        <a href="http://twitter.com/share?url=<?php the_permalink(); ?>&amp;text=<?php the_title_attribute(); ?><?php echo $via; ?>" target="_blank" class="item-card-link--sharing" title="<?php esc_attr_e('Share this on twitter', 'tainacan-interface') ?>">
-                                            <img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/twitter-circle.png'; ?>" alt="<?php esc_attr_e('Share this on twitter', 'tainacan-interface') ?>">
-                                        </a>
-                                    <?php endif; ?>
-                                    <?php if ( true == get_theme_mod( 'tainacan_whatsapp_share', false ) ) : ?>
-                                        <a href="https://api.whatsapp.com/send?1=pt_BR&text=<?php the_permalink(); ?>" target="_blank" class="item-card-link--sharing" title="<?php esc_attr_e('Share this on WhatsApp', 'tainacan-interface') ?>">
-                                            <img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/whatsapp-circle.png'; ?>" alt="<?php esc_attr_e('Share this on WhatsApp', 'tainacan-interface') ?>">
-                                        </a>
-                                    <?php endif; ?>
-                                    <?php if ( true == get_theme_mod( 'tainacan_telegram_share', false ) ) : ?>
-                                        <a href="https://t.me/share/url?url=<?php the_permalink(); ?>" target="_blank" class="item-card-link--sharing" title="<?php esc_attr_e('Share this on Telegram', 'tainacan-interface') ?>">
-                                            <img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/telegram-circle.png'; ?>" alt="<?php esc_attr_e('Share this on Telegram', 'tainacan-interface') ?>">
-                                        </a>
-                                    <?php endif; ?>
-                                    <button onclick="copyTextToClipboard('<?php the_permalink(); ?>')" title="<?php esc_attr_e('Copy link', 'tainacan-interface') ?>" class="item-card-link--sharing tainacan-copy-link-button">
-                                        <img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/url-circle.png'; ?>" alt="<?php esc_attr_e('Copy link', 'tainacan-interface') ?>">
-                                    </button>
+                        ob_start();
+                
+                        if (has_post_thumbnail() && get_theme_mod( 'tainacan_single_item_display_thumbnail', true )): ?>
+                            <div class="tainacan-item-thumbnail-container card border-0 mb-3">
+                                <div class="card-body border-0 pl-0 pt-0 pb-1">
+                                    <h3><?php _e( 'Thumbnail', 'tainacan-interface' ); ?></h3>
+                                    <?php the_post_thumbnail('tainacan-medium-full', array('class' => 'item-card--thumbnail mt-2')); ?>
                                 </div>
                             </div>
-                        </div>
-                    <?php endif;
-            
-                    $extra_content = ob_get_contents();
-                    ob_end_clean();
-            
-                    return $extra_content . $before;
-            
-                }, 10, 2);
+                        <?php endif; ?>
+                        <?php if (!get_theme_mod('tainacan_single_item_collection_header', false) && get_theme_mod( 'tainacan_single_item_display_share_buttons', true )): ?>
+                            <div class="card border-0 mb-3">
+                                <div class="tainacan-item-share-container card-body border-0 pl-0 pt-0 pb-1">
+                                    <h3><?php _e( 'Share', 'tainacan-interface' ); ?></h3>
+                                    <div class="btn-group" role="group">
+                                        <?php if ( true == get_theme_mod( 'tainacan_facebook_share', true ) ) : ?> 
+                                            <a href="http://www.facebook.com/sharer.php?u=<?php the_permalink(); ?>" class="item-card-link--sharing" target="_blank" title="<?php esc_attr_e('Share this on facebook', 'tainacan-interface') ?>">
+                                                <img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/facebook-circle.png'; ?>" alt="<?php esc_attr_e('Share this on facebook', 'tainacan-interface') ?>">
+                                            </a>
+                                        <?php endif; ?>
+                                        <?php if ( true == get_theme_mod( 'tainacan_twitter_share', true ) ) : ?> 
+                                            <?php
+                                            $twitter_option = get_theme_mod( 'tainacan_twitter_user' );
+                                            $via = ! empty( $twitter_option ) ? '&amp;via=' . esc_attr( get_theme_mod( 'tainacan_twitter_user' ) ) : '';
+                                            ?>
+                                            <a href="http://twitter.com/share?url=<?php the_permalink(); ?>&amp;text=<?php the_title_attribute(); ?><?php echo $via; ?>" target="_blank" class="item-card-link--sharing" title="<?php esc_attr_e('Share this on twitter', 'tainacan-interface') ?>">
+                                                <img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/twitter-circle.png'; ?>" alt="<?php esc_attr_e('Share this on twitter', 'tainacan-interface') ?>">
+                                            </a>
+                                        <?php endif; ?>
+                                        <?php if ( true == get_theme_mod( 'tainacan_whatsapp_share', false ) ) : ?>
+                                            <a href="https://api.whatsapp.com/send?1=pt_BR&text=<?php the_permalink(); ?>" target="_blank" class="item-card-link--sharing" title="<?php esc_attr_e('Share this on WhatsApp', 'tainacan-interface') ?>">
+                                                <img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/whatsapp-circle.png'; ?>" alt="<?php esc_attr_e('Share this on WhatsApp', 'tainacan-interface') ?>">
+                                            </a>
+                                        <?php endif; ?>
+                                        <?php if ( true == get_theme_mod( 'tainacan_telegram_share', false ) ) : ?>
+                                            <a href="https://t.me/share/url?url=<?php the_permalink(); ?>" target="_blank" class="item-card-link--sharing" title="<?php esc_attr_e('Share this on Telegram', 'tainacan-interface') ?>">
+                                                <img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/telegram-circle.png'; ?>" alt="<?php esc_attr_e('Share this on Telegram', 'tainacan-interface') ?>">
+                                            </a>
+                                        <?php endif; ?>
+                                        <button onclick="copyTextToClipboard('<?php the_permalink(); ?>')" title="<?php esc_attr_e('Copy link', 'tainacan-interface') ?>" class="item-card-link--sharing tainacan-copy-link-button">
+                                            <img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/url-circle.png'; ?>" alt="<?php esc_attr_e('Copy link', 'tainacan-interface') ?>">
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                        <?php endif;
+                
+                        $extra_content = ob_get_contents();
+                        ob_end_clean();
+                
+                        return $extra_content . $before;
+                
+                    }, 10, 2);
+                }
             }
         }
     }