diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl
index 6373f9deb1e..0e6f7371a0f 100644
--- a/com.woltlab.wcf/templates/article.tpl
+++ b/com.woltlab.wcf/templates/article.tpl
@@ -4,73 +4,12 @@
 
 {capture assign='contentHeader'}
 	<header class="contentHeader articleContentHeader">
-		<div class="contentHeaderTitle">
-			<h1 class="contentTitle" itemprop="name headline">{$articleContent->title}</h1>
-			<ul class="inlineList contentHeaderMetaData articleMetaData">
-				{if $article->hasLabels()}
-					<li>
-						{icon name='tags'}
-						<ul class="labelList">
-							{foreach from=$article->getLabels() item=label}
-								<li>{@$label->render()}</li>
-							{/foreach}
-						</ul>
-					</li>
-				{/if}
-				
-				<li itemprop="author" itemscope itemtype="http://schema.org/Person">
-					{icon name='user'}
-					{if $article->userID}
-						<a href="{$article->getUserProfile()->getLink()}" class="userLink" data-object-id="{@$article->userID}" itemprop="url">
-							<span itemprop="name">{@$article->getUserProfile()->getFormattedUsername()}</span>
-						</a>
-					{else}
-						<span itemprop="name">{$article->username}</span>
-					{/if}
-				</li>
-				
-				<li>
-					{icon name='clock'}
-					<a href="{$article->getLink()}">{@$article->time|time}</a>
-					<meta itemprop="datePublished" content="{@$article->time|date:'c'}">
-				</li>
-
-				<li>
-					{icon name='eye'}
-					{lang}wcf.article.articleViews{/lang}
-				</li>
-				
-				{if $article->getDiscussionProvider()->getDiscussionCountPhrase()}
-					<li itemprop="interactionStatistic" itemscope itemtype="http://schema.org/InteractionCounter">
-						{icon name='comments'}
-						{if $article->getDiscussionProvider()->getDiscussionLink()}<a href="{$article->getDiscussionProvider()->getDiscussionLink()}">{else}<span>{/if}
-						{$article->getDiscussionProvider()->getDiscussionCountPhrase()}
-						{if $article->getDiscussionProvider()->getDiscussionLink()}</a>{else}</span>{/if}
-						<meta itemprop="interactionType" content="http://schema.org/CommentAction">
-						<meta itemprop="userInteractionCount" content="{@$article->getDiscussionProvider()->getDiscussionCount()}">
-					</li>
-				{/if}
-				
-				{if $article->isNew()}<li><span class="badge label newMessageBadge">{lang}wcf.message.new{/lang}</span></li>{/if}
-				
-				{if $article->isDeleted}<li><span class="badge label red">{lang}wcf.message.status.deleted{/lang}</span></li>{/if}
-				
-				{event name='contentHeaderMetaData'}
-			</ul>
-			
-			<div itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
-				<meta itemprop="name" content="{PAGE_TITLE|phrase}">
-				<div itemprop="logo" itemscope itemtype="http://schema.org/ImageObject">
-					<meta itemprop="url" content="{$__wcf->getStyleHandler()->getStyle()->getPageLogo()}">
-				</div>
-			</div>
-		</div>
+		{include file='articleContentHeaderTitle'}
 		
 		{hascontent}
 			<nav class="contentHeaderNavigation">
 				<ul>
 					{content}
-						{if $article->canEdit()}<li><a href="{link controller='ArticleEdit' id=$article->articleID}{/link}" class="button buttonPrimary">{icon name='pencil'} <span>{lang}wcf.acp.article.edit{/lang}</span></a></li>{/if}
 						{event name='contentHeaderNavigation'}
 					{/content}
 				</ul>
@@ -90,6 +29,8 @@
 {/capture}
 
 {capture assign='contentInteractionButtons'}
+	{unsafe:$interactionContextMenu->render()}
+	
 	{if $article->isMultilingual && $__wcf->user->userID}
 		<div class="contentInteractionButton dropdown jsOnly">
 			<button type="button" class="dropdownToggle boxFlag box24 button small">
@@ -121,26 +62,27 @@
 {include file='header'}
 
 {if !$article->isPublished()}
-	<woltlab-core-notice type="info">{lang publicationDate=$article->publicationDate}wcf.article.publicationStatus.{@$article->publicationStatus}{/lang}</woltlab-core-notice>
+	<woltlab-core-notice type="info">{lang publicationDate=$article->publicationDate}wcf.article.publicationStatus.{$article->publicationStatus}{/lang}</woltlab-core-notice>
 {/if}
 
-<div class="section articleContainer">
+<div
+	class="section entry article"
+	{unsafe:$__wcf->getReactionHandler()->getDataAttributes('com.woltlab.wcf.likeableArticle', $article->articleID)}
+>
 	{if $articleContent->teaser}
-		<div class="section articleTeaserContainer">
-			<div class="htmlContent">
-				<p class="articleTeaser">{@$articleContent->getFormattedTeaser()}</p>
-			</div>
+		<div class="entry__teaser htmlContent">
+			{unsafe:$articleContent->getFormattedTeaser()}
 		</div>
 	{/if}
 	
 	{if $articleContent->getImage() && $articleContent->getImage()->hasThumbnail('large')}
-		<div class="section articleImageContainer" itemprop="image" itemscope itemtype="http://schema.org/ImageObject">
-			<figure class="articleImage">
-				<div class="articleImageWrapper">{@$articleContent->getImage()->getThumbnailTag('large')}</div>
+		<div class="entry__coverPhoto__wrapper" itemprop="image" itemscope itemtype="http://schema.org/ImageObject">
+			<figure class="entry__coverPhoto">
+				{unsafe:$articleContent->getImage()->getThumbnailTag('large')}
 				{if $articleContent->getImage()->caption}
 					<figcaption itemprop="description">
 						{if $articleContent->getImage()->captionEnableHtml}
-							{@$articleContent->getImage()->caption}
+							{unsafe:$articleContent->getImage()->caption}
 						{else}
 							{$articleContent->getImage()->caption}
 						{/if}
@@ -148,102 +90,104 @@
 				{/if}
 			</figure>
 			<meta itemprop="url" content="{$articleContent->getImage()->getThumbnailLink('large')}">
-			<meta itemprop="width" content="{@$articleContent->getImage()->getThumbnailWidth('large')}">
-			<meta itemprop="height" content="{@$articleContent->getImage()->getThumbnailHeight('large')}">
+			<meta itemprop="width" content="{$articleContent->getImage()->getThumbnailWidth('large')}">
+			<meta itemprop="height" content="{$articleContent->getImage()->getThumbnailHeight('large')}">
 		</div>
 	{/if}
 	
 	{event name='beforeArticleContent'}
-	
-	<div class="section articleContent" {@$__wcf->getReactionHandler()->getDataAttributes('com.woltlab.wcf.likeableArticle', $article->articleID)}>
-		<div class="section htmlContent" itemprop="description articleBody">
-			{if MODULE_WCF_AD}
-				{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.inArticle')}
-			{/if}
-			
-			{@$articleContent->getFormattedContent()}
-			
-			{event name='htmlArticleContent'}
-		</div>
 
-		{include file='attachments' objectID=$article->articleID}
+	<div class="entry__content htmlContent" itemprop="description articleBody">
+		{if MODULE_WCF_AD}
+			{unsafe:$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.inArticle')}
+		{/if}
 		
-		{if !$tags|empty}
-			<ul class="tagList articleTagList">
-				{foreach from=$tags item=tag}
-					<li><a href="{link controller='Tagged' object=$tag}objectType=com.woltlab.wcf.article{/link}" class="tag">{$tag->name}</a></li>
-				{/foreach}
-			</ul>
+		{unsafe:$articleContent->getFormattedContent()}
+		
+		{event name='htmlArticleContent'}
+	</div>
+
+	{event name='afterArticleContent'}
+
+	{include file='entryTags' objectType='com.woltlab.wcf.article'}
+
+	{include file='entryAttachments' objectID=$article->articleID}
+
+	<footer class="entry__footer">
+		{if MODULE_LIKE && ARTICLE_ENABLE_LIKE && $__wcf->session->getPermission('user.like.canViewLike')}
+			<div class="articleLikesSummery">
+				{include file="reactionSummaryList" reactionData=$articleLikeData objectType="com.woltlab.wcf.likeableArticle" objectID=$article->articleID}
+			</div>
 		{/if}
 		
-		<div class="row articleLikeSection">
-			{if MODULE_LIKE && ARTICLE_ENABLE_LIKE && $__wcf->session->getPermission('user.like.canViewLike')}
-				<div class="col-xs-12 col-md-6">
-					<div class="articleLikesSummery">
-						{include file="reactionSummaryList" reactionData=$articleLikeData objectType="com.woltlab.wcf.likeableArticle" objectID=$article->articleID}
-					</div>
-				</div>
-			{/if}
-			
-			<div class="col-xs-12 col-md-6 col-md{if !(MODULE_LIKE && ARTICLE_ENABLE_LIKE && $__wcf->session->getPermission('user.like.canViewLike'))} col-md-offset-6{/if}">
-				<ul class="articleButtons buttonGroup buttonList smallButtons">
+		{hascontent}
+			<div class="entry__footerButtons">
+				{content}
 					{if $__wcf->session->getPermission('user.profile.canReportContent')}
-						<li>
-							<button
-								type="button"
-								title="{lang}wcf.moderation.report.reportContent{/lang}"
-								class="button jsTooltip"
-								data-report-content="com.woltlab.wcf.article"
-								data-object-id="{$articleContent->articleID}"
-							>
-								{icon name='triangle-exclamation'}
-								<span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span>
-							</button>
-						</li>
+						<button
+							type="button"
+							class="button jsTooltip"
+							title="{lang}wcf.moderation.report.reportContent{/lang}"
+							data-report-content="com.woltlab.wcf.article"
+							data-object-id="{$articleContent->articleID}"
+						>
+							{icon name='triangle-exclamation'}
+						</button>
 					{/if}
 					{if MODULE_LIKE && ARTICLE_ENABLE_LIKE && $__wcf->session->getPermission('user.like.canLike') && $article->userID != $__wcf->user->userID}
-						<li class="jsOnly"><span class="button jsTooltip reactButton{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID} active{/if}" title="{lang}wcf.reactions.react{/lang}" data-reaction-type-id="{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID}{$articleLikeData[$article->articleID]->reactionTypeID}{else}0{/if}">{icon name='face-smile'} <span class="invisible">{lang}wcf.reactions.react{/lang}</span></span></li>
+						<button
+							type="button"
+							class="button jsTooltip reactButton{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID} active{/if}"
+							title="{lang}wcf.reactions.react{/lang}"
+							data-reaction-type-id="{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID}{$articleLikeData[$article->articleID]->reactionTypeID}{else}0{/if}"
+						>
+							{icon name='face-smile'}
+						</button>
 					{/if}
-					{event name='articleLikeButtons'}{* deprecated: use articleButtons instead *}
-					{event name='articleButtons'}
-				</ul>
+					
+					{event name='articleLikeButtons'}{* deprecated: use footerButtons instead *}
+					{event name='articleButtons'}{* deprecated: use footerButtons instead *}
+					{event name='footerButtons'}
+				{/content}
+			</div>
+		{/hascontent}
+	</footer>
+</div>
+
+{if ARTICLE_SHOW_ABOUT_AUTHOR && $article->getUserProfile()->aboutMe}
+	<section class="section entry__aboutAuthor__container">
+		<h2 class="sectionTitle">{lang}wcf.article.aboutAuthor{/lang}</h2>
+		
+		<div class="entry__aboutAuthor">
+			<div class="entry__aboutAuthor__avatar">
+				{unsafe:$article->getUserProfile()->getAvatar()->getImageTag(128)}
 			</div>
-		</div>
-	</div>
-	
-	{event name='afterArticleContent'}
-	
-	{if ARTICLE_SHOW_ABOUT_AUTHOR && $article->getUserProfile()->aboutMe}
-		<div class="section articleAboutAuthor">
-			<h2 class="sectionTitle">{lang}wcf.article.aboutAuthor{/lang}</h2>
 			
-			<div class="box128">
-				<span class="articleAboutAuthorAvatar">{@$article->getUserProfile()->getAvatar()->getImageTag(128)}</span>
+			<div class="entry__aboutAuthor__content">
+				{event name='beforeAboutAuthorText'}
 				
-				<div>
-					{event name='beforeAboutAuthorText'}
-					
-					<div class="articleAboutAuthorText">{@$article->getUserProfile()->getFormattedUserOption('aboutMe')}</div>
-					
-					{event name='afterAboutAuthorText'}
+				<div class="entry__aboutAuthor__text">
+					{unsafe:$article->getUserProfile()->getFormattedUserOption('aboutMe')}
+				</div>
+				
+				{event name='afterAboutAuthorText'}
+				
+				<div class="entry__aboutAuthor__username">
+					{user object=$article->getUserProfile() class='username'}
 					
-					<div class="articleAboutAuthorUsername">
-						{user object=$article->getUserProfile() class='username'}
-						
-						{if MODULE_USER_RANK}
-							{if $article->getUserProfile()->getUserTitle()}
-								<span class="badge userTitleBadge{if $article->getUserProfile()->getRank() && $article->getUserProfile()->getRank()->cssClassName} {@$article->getUserProfile()->getRank()->cssClassName}{/if}">{$article->getUserProfile()->getUserTitle()}</span>
-							{/if}
-							{if $article->getUserProfile()->getRank() && $article->getUserProfile()->getRank()->rankImage}
-								<span class="userRank">{@$article->getUserProfile()->getRank()->getImage()}</span>
-							{/if}
+					{if MODULE_USER_RANK}
+						{if $article->getUserProfile()->getUserTitle()}
+							<span class="badge userTitleBadge{if $article->getUserProfile()->getRank() && $article->getUserProfile()->getRank()->cssClassName} {$article->getUserProfile()->getRank()->cssClassName}{/if}">{$article->getUserProfile()->getUserTitle()}</span>
 						{/if}
-					</div>
+						{if $article->getUserProfile()->getRank() && $article->getUserProfile()->getRank()->rankImage}
+							<span class="userRank">{unsafe:$article->getUserProfile()->getRank()->getImage()}</span>
+						{/if}
+					{/if}
 				</div>
 			</div>
 		</div>
-	{/if}
-</div>
+	</section>
+{/if}
 
 <footer class="contentFooter">
 	{hascontent}
@@ -258,62 +202,57 @@
 {event name='afterFooter'}
 
 {if $previousArticle || $nextArticle}
-	<div class="section">
-		<nav>
-			<ul class="articleNavigation">
-				{if $previousArticle}
-					<li class="previousArticleButton articleNavigationArticle{if $previousArticle->getTeaserImage()} articleNavigationArticleWithImage{/if}">
-						<span class="articleNavigationArticleIcon">
-							{icon size=48 name='chevron-left'}
-						</span>
-						{if $previousArticle->getTeaserImage()}
-							<span class="articleNavigationArticleImage">{@$previousArticle->getTeaserImage()->getElementTag(96)}</span>
-						{/if}
-						<span class="articleNavigationArticleContent">
-							<span class="articleNavigationEntityName">{lang}wcf.article.previousArticle{/lang}</span>
-							<span class="articleNavigationArticleTitle">
-								<a href="{$previousArticle->getLink()}" rel="prev" class="articleNavigationArticleLink articleLink" data-object-id="{$previousArticle->getObjectID()}">
-									{$previousArticle->getTitle()}
-								</a>
-							</span>
-						</span>
-					</li>
+	<div class="section entry__navigation">
+		{if $previousArticle}
+			<div class="entry__navigation__item entry__navigation__item--previous{if $previousArticle->getTeaserImage()} entry__navigation__item--withImage{/if}">
+				<div class="entry__navigation__item__icon">
+					{icon size=48 name='chevron-left'}
+				</div>
+				{if $previousArticle->getTeaserImage()}
+					<div class="entry__navigation__item__image">{unsafe:$previousArticle->getTeaserImage()->getElementTag(96)}</div>
 				{/if}
-				
-				{if $nextArticle}
-					<li class="nextArticleButton articleNavigationArticle{if $nextArticle->getTeaserImage()} articleNavigationArticleWithImage{/if}">
-						<span class="articleNavigationArticleIcon">
-							{icon size=48 name='chevron-right'}
-						</span>
-						{if $nextArticle->getTeaserImage()}
-							<span class="articleNavigationArticleImage">{@$nextArticle->getTeaserImage()->getElementTag(96)}</span>
-						{/if}
-						<span class="articleNavigationArticleContent">
-							<span class="articleNavigationEntityName">{lang}wcf.article.nextArticle{/lang}</span>
-							<span class="articleNavigationArticleTitle">
-								<a href="{$nextArticle->getLink()}" rel="next" class="articleNavigationArticleLink articleLink" data-object-id="{$nextArticle->getObjectID()}">
-									{$nextArticle->getTitle()}
-								</a>
-							</span>
-						</span>
-					</li>
+				<div class="entry__navigation__item__content">
+					<div class="entry__navigation__item__entityName">{lang}wcf.article.previousArticle{/lang}</div>
+					<div class="entry__navigation__item__title">
+						<a href="{$previousArticle->getLink()}" rel="prev" class="entry__navigation__item__link articleLink" data-object-id="{$previousArticle->getObjectID()}">
+							{$previousArticle->getTitle()}
+						</a>
+					</div>
+				</div>
+			</div>
+		{/if}
+		{if $nextArticle}
+			<div class="entry__navigation__item entry__navigation__item--next{if $nextArticle->getTeaserImage()} entry__navigation__item--withImage{/if}">
+				<div class="entry__navigation__item__icon">
+					{icon size=48 name='chevron-right'}
+				</div>
+				{if $nextArticle->getTeaserImage()}
+					<div class="entry__navigation__item__image">{unsafe:$nextArticle->getTeaserImage()->getElementTag(96)}</div>
 				{/if}
-			</ul>
-		</nav>
+				<div class="entry__navigation__item__content">
+					<div class="entry__navigation__item__entityName">{lang}wcf.article.nextArticle{/lang}</div>
+					<div class="entry__navigation__item__title">
+						<a href="{$nextArticle->getLink()}" rel="prev" class="entry__navigation__item__link articleLink" data-object-id="{$previousArticle->getObjectID()}">
+							{$nextArticle->getTitle()}
+						</a>
+					</div>
+				</div>
+			</div>
+		{/if}
 	</div>
 {/if}
 
-{if $relatedArticles !== null && $relatedArticles|count}
+{if $relatedArticleListView && $relatedArticleListView->countItems()}
 	<section class="section relatedArticles">
 		<h2 class="sectionTitle">{lang}wcf.article.relatedArticles{/lang}</h2>
 		
-		{include file='articleListItems' objects=$relatedArticles}
+		{unsafe:$relatedArticleListView->render()}
 	</section>
 {/if}
 
 {event name='beforeComments'}
 
-{@$article->getDiscussionProvider()->renderDiscussions()}
+{unsafe:$article->getDiscussionProvider()->renderDiscussions()}
 
 {if MODULE_LIKE && ARTICLE_ENABLE_LIKE}
 	<script data-relocate="true">
@@ -325,7 +264,7 @@
 				canViewReactions: {if LIKE_SHOW_SUMMARY}true{else}false{/if},
 				
 				// selectors
-				containerSelector: '.articleContent',
+				containerSelector: '.article',
 				summarySelector: '.articleLikesSummery'
 			});
 		});
diff --git a/com.woltlab.wcf/templates/articleContentHeaderTitle.tpl b/com.woltlab.wcf/templates/articleContentHeaderTitle.tpl
new file mode 100644
index 00000000000..46610fb4064
--- /dev/null
+++ b/com.woltlab.wcf/templates/articleContentHeaderTitle.tpl
@@ -0,0 +1,72 @@
+<div class="contentHeaderTitle">
+	<h1 class="contentTitle" itemprop="name headline">{$articleContent->title}</h1>
+	<ul class="inlineList contentHeaderMetaData articleMetaData">
+		<li itemprop="author" itemscope itemtype="http://schema.org/Person">
+			{icon name='user'}
+			{if $article->userID}
+				<a href="{$article->getUserProfile()->getLink()}" class="userLink" data-object-id="{$article->userID}" itemprop="url">
+					<span itemprop="name">{unsafe:$article->getUserProfile()->getFormattedUsername()}</span>
+				</a>
+			{else}
+				<span itemprop="name">{$article->username}</span>
+			{/if}
+		</li>
+		
+		<li>
+			{icon name='clock'}
+			<a href="{$article->getLink()}">{time time=$article->time}</a>
+			<meta itemprop="datePublished" content="{$article->time|date:'c'}">
+		</li>
+
+		{if $article->hasLabels()}
+			<li>
+				{icon name='tags'}
+				<ul class="labelList">
+					{foreach from=$article->getLabels() item=label}
+						<li>{unsafe:$label->render()}</li>
+					{/foreach}
+				</ul>
+			</li>
+		{/if}
+		
+		<li>
+			{icon name='eye'}
+			{lang}wcf.article.articleViews{/lang}
+		</li>
+		
+		{if $article->getDiscussionProvider()->getDiscussionCountPhrase()}
+			<li itemprop="interactionStatistic" itemscope itemtype="http://schema.org/InteractionCounter">
+				{icon name='comments'}
+				{if $article->getDiscussionProvider()->getDiscussionLink()}<a href="{$article->getDiscussionProvider()->getDiscussionLink()}">{else}<span>{/if}
+				{$article->getDiscussionProvider()->getDiscussionCountPhrase()}
+				{if $article->getDiscussionProvider()->getDiscussionLink()}</a>{else}</span>{/if}
+				<meta itemprop="interactionType" content="http://schema.org/CommentAction">
+				<meta itemprop="userInteractionCount" content="{$article->getDiscussionProvider()->getDiscussionCount()}">
+			</li>
+		{/if}
+		
+		{hascontent}
+			<li>
+				{icon name='flag'}
+				{content}
+					{if $article->isDeleted}
+						<span class="badge red">{lang}wcf.message.status.deleted{/lang}</span>
+					{/if}
+					{if !$article->isPublished()}
+						<span class="badge green">{lang}wcf.message.status.disabled{/lang}</span>
+					{/if}
+					{event name='contentHeaderMetaDataFlag'}
+				{/content}
+			</li>
+		{/hascontent}
+		
+		{event name='contentHeaderMetaData'}
+	</ul>
+	
+	<div itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
+		<meta itemprop="name" content="{PAGE_TITLE|phrase}">
+		<div itemprop="logo" itemscope itemtype="http://schema.org/ImageObject">
+			<meta itemprop="url" content="{$__wcf->getStyleHandler()->getStyle()->getPageLogo()}">
+		</div>
+	</div>
+</div>
diff --git a/com.woltlab.wcf/templates/boxArticleList.tpl b/com.woltlab.wcf/templates/boxArticleList.tpl
index b733ea7804b..f3dc78b8a98 100644
--- a/com.woltlab.wcf/templates/boxArticleList.tpl
+++ b/com.woltlab.wcf/templates/boxArticleList.tpl
@@ -39,7 +39,7 @@
 			</li>
 		{/foreach}
 	</ul>
-{elseif $boxPosition == 'footerBoxes'}
+{else}
 	<ul class="articleList">
 		{foreach from=$boxArticleList item=boxArticle}
 			<li>
@@ -69,6 +69,4 @@
 			</li>
 		{/foreach}
 	</ul>
-{else}
-	{include file='articleListItems' objects=$boxArticleList disableAds=true}
-{/if}
+{if}
diff --git a/com.woltlab.wcf/templates/entryAttachments.tpl b/com.woltlab.wcf/templates/entryAttachments.tpl
new file mode 100644
index 00000000000..026bb85a1fc
--- /dev/null
+++ b/com.woltlab.wcf/templates/entryAttachments.tpl
@@ -0,0 +1,89 @@
+{if $attachmentList && $attachmentList->getGroupedObjects($objectID)|count}
+	{hascontent}
+		<section class="entry__attachments__thumbnails">
+			<h2 class="entry__attachments__title">{lang}wcf.attachment.images{/lang}</h2>
+			
+			<ul class="inlineList">
+				{content}
+					{foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment}
+						{if $attachment->showAsImage() && !$attachment->isEmbedded()}
+							<li class="attachmentThumbnail" data-attachment-id="{$attachment->attachmentID}">
+								<a href="{$attachment->getLink()}"{if $attachment->canDownload()} data-fancybox="message-{$attachmentList->getObjectTypeName()}-{$objectID}" data-caption="{$attachment->filename}" aria-title="{lang}wcf.attachment.image.title{/lang}"{/if}>
+									<div class="attachmentThumbnailContainer">
+										<span class="attachmentThumbnailImage">
+											{if $attachment->hasThumbnail()}
+												<img
+													src="{$attachment->getThumbnailLink('thumbnail')}"
+													alt=""
+													{if $attachment->thumbnailWidth >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->thumbnailHeight >= ATTACHMENT_THUMBNAIL_HEIGHT}
+														class="attachmentThumbnailImageScalable"
+													{/if}
+													width="{$attachment->thumbnailWidth}"
+													height="{$attachment->thumbnailHeight}"
+													loading="lazy"
+												>
+											{else}
+												<img
+													src="{$attachment->getLink()}"
+													alt=""
+													{if $attachment->width >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->height >= ATTACHMENT_THUMBNAIL_HEIGHT}
+														class="attachmentThumbnailImageScalable"
+													{/if}
+													width="{$attachment->width}"
+													height="{$attachment->height}"
+													loading="lazy"
+												>
+											{/if}
+										</span>
+									
+										<span class="attachmentThumbnailData">
+											<span class="attachmentFilename">{$attachment->filename}</span>
+										</span>
+									</div>
+									
+									<ul class="attachmentMetaData inlineList">
+										<li>
+											{icon name='file-lines'}
+											{$attachment->filesize|filesize}
+										</li>
+										<li>
+											{icon name='up-right-and-down-left-from-center'}
+											{#$attachment->width} × {#$attachment->height}
+										</li>
+									</ul>
+								</a>
+							</li>
+						{/if}
+					{/foreach}
+				{/content}
+			</ul>
+		</section>
+	{/hascontent}
+	
+	{hascontent}
+		<section class="entry__attachments__files">
+			<h2 class="entry__attachments__title">{lang}wcf.attachment.files{/lang}</h2>
+
+			<div class="messageAttachmentList">
+				{content}
+					{foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment}
+						{if $attachment->showAsFile() && !$attachment->isEmbedded()}
+							<a href="{$attachment->getLink()}" class="messageAttachment jsTooltip" title="{lang}wcf.attachment.file.title{/lang}">
+								<span class="messageAttachmentIcon">
+									<span class="messageAttachmentIconDefault">
+										{icon size=32 name=$attachment->getIconName()}
+									</span>
+									<span class="messageAttachmentIconDownload">
+										{icon size=32 name='download'}
+									</span>
+								</span>
+								<span class="messageAttachmentFilename">{$attachment->filename}</span>
+								<span class="messageAttachmentMeta">{lang}wcf.attachment.file.info{/lang}</span>
+							</a>
+						{/if}
+					{/foreach}
+				{/content}
+			</div>
+		</section>
+	{/hascontent}
+{/if}
diff --git a/com.woltlab.wcf/templates/entryTags.tpl b/com.woltlab.wcf/templates/entryTags.tpl
new file mode 100644
index 00000000000..f0e9bd3cc49
--- /dev/null
+++ b/com.woltlab.wcf/templates/entryTags.tpl
@@ -0,0 +1,14 @@
+{if !$tags|empty}
+	<section class="entry_tags" aria-label="{lang}wcf.tagging.tags{/lang}">
+		<ul class="tagList">
+			{foreach from=$tags item=tag}
+				<li>
+					<a href="{link controller='Tagged' object=$tag objectType=$objectType}{/link}" class="tag">
+						{icon name='tag'}
+						{$tag->name}
+					</a>
+				</li>
+			{/foreach}
+		</ul>
+	</section>
+{/if}
diff --git a/com.woltlab.wcf/templates/shared_listView.tpl b/com.woltlab.wcf/templates/shared_listView.tpl
index 25673c3cbe3..0c24dd5e1fb 100644
--- a/com.woltlab.wcf/templates/shared_listView.tpl
+++ b/com.woltlab.wcf/templates/shared_listView.tpl
@@ -1,5 +1,5 @@
 <div class="listView">
-	{if $view->isSortable() || $view->isFilterable()}
+	{if $view->isSortable() || $view->isFilterable() || $view->hasBulkInteractions()}
 		<div class="listView__header">
 			{if $view->isFilterable()}
 				<div class="listView__filters" id="{$view->getID()}_filters">
diff --git a/com.woltlab.wcf/templates/shared_standaloneInteractionButton.tpl b/com.woltlab.wcf/templates/shared_standaloneInteractionButton.tpl
index 1a30aa16253..611c44d0b08 100644
--- a/com.woltlab.wcf/templates/shared_standaloneInteractionButton.tpl
+++ b/com.woltlab.wcf/templates/shared_standaloneInteractionButton.tpl
@@ -21,7 +21,8 @@
 			document.getElementById('{unsafe:$containerID|encodeJS}'),
 			'{unsafe:$providerClassName|encodeJS}',
 			'{unsafe:$objectID|encodeJS}',
-			'{unsafe:$redirectUrl|encodeJS}'
+			'{unsafe:$redirectUrl|encodeJS}',
+			'{unsafe:$reloadHeaderEndpoint|encodeJS}'
 		);
 	});
 </script>
diff --git a/com.woltlab.wcf/templates/taggedArticleList.tpl b/com.woltlab.wcf/templates/taggedArticleList.tpl
deleted file mode 100644
index 619a092443c..00000000000
--- a/com.woltlab.wcf/templates/taggedArticleList.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="section">
-	{include file='articleListItems'}
-</div>
diff --git a/ts/WoltLabSuite/Core/Bootstrap.ts b/ts/WoltLabSuite/Core/Bootstrap.ts
index 7deabe311bf..28b06b1e53c 100644
--- a/ts/WoltLabSuite/Core/Bootstrap.ts
+++ b/ts/WoltLabSuite/Core/Bootstrap.ts
@@ -65,7 +65,9 @@ function initA11y() {
   document
     .querySelectorAll("article:not([aria-label]):not([aria-labelledby]):not([role])")
     .forEach((element: HTMLElement) => {
-      element.setAttribute("role", "presentation");
+      if (!element.querySelector("h1, h2, h3")) {
+        element.setAttribute("role", "presentation");
+      }
     });
 }
 
diff --git a/ts/WoltLabSuite/Core/Component/Interaction/StandaloneButton.ts b/ts/WoltLabSuite/Core/Component/Interaction/StandaloneButton.ts
index cdbea233a82..cb31669f76c 100644
--- a/ts/WoltLabSuite/Core/Component/Interaction/StandaloneButton.ts
+++ b/ts/WoltLabSuite/Core/Component/Interaction/StandaloneButton.ts
@@ -7,20 +7,33 @@
  * @since 6.2
  */
 
+import { getObject } from "WoltLabSuite/Core/Api/GetObject";
 import { getContextMenuOptions } from "WoltLabSuite/Core/Api/Interactions/GetContextMenuOptions";
 import UiDropdownSimple from "WoltLabSuite/Core/Ui/Dropdown/Simple";
 
+interface HeaderContent {
+  template: string;
+}
+
 export class StandaloneButton {
   #container: HTMLElement;
   #providerClassName: string;
   #objectId: string | number;
   #redirectUrl: string;
+  #reloadHeaderEndpoint: string;
 
-  constructor(container: HTMLElement, providerClassName: string, objectId: string | number, redirectUrl: string) {
+  constructor(
+    container: HTMLElement,
+    providerClassName: string,
+    objectId: string | number,
+    redirectUrl: string,
+    reloadHeaderEndpoint: string,
+  ) {
     this.#container = container;
     this.#providerClassName = providerClassName;
     this.#objectId = objectId;
     this.#redirectUrl = redirectUrl;
+    this.#reloadHeaderEndpoint = reloadHeaderEndpoint;
 
     this.#initInteractions();
     this.#initEventListeners();
@@ -39,6 +52,24 @@ export class StandaloneButton {
     this.#initInteractions();
   }
 
+  async #refreshHeader(): Promise<void> {
+    if (!this.#reloadHeaderEndpoint) {
+      return;
+    }
+
+    const header = document.querySelector(".contentHeaderTitle");
+    if (!header) {
+      return;
+    }
+
+    const result = await getObject<HeaderContent>(`${window.WSC_RPC_API_URL}${this.#reloadHeaderEndpoint}`);
+    if (!result.ok) {
+      return;
+    }
+
+    header.outerHTML = result.value.template;
+  }
+
   #getDropdownMenu(): HTMLElement | undefined {
     const button = this.#container.querySelector<HTMLButtonElement>(".dropdownToggle");
     if (!button) {
@@ -71,10 +102,12 @@ export class StandaloneButton {
   #initEventListeners(): void {
     this.#container.addEventListener("interaction:invalidate", () => {
       void this.#refreshContextMenu();
+      void this.#refreshHeader();
     });
 
     this.#container.addEventListener("interaction:invalidate-all", () => {
       void this.#refreshContextMenu();
+      void this.#refreshHeader();
     });
 
     this.#container.addEventListener("interaction:remove", () => {
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js
index a9e6465e2b0..ec921b852b1 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js
@@ -52,7 +52,9 @@ define(["require", "exports", "tslib", "./Core", "./Date/Picker", "./Devtools",
         document
             .querySelectorAll("article:not([aria-label]):not([aria-labelledby]):not([role])")
             .forEach((element) => {
-            element.setAttribute("role", "presentation");
+            if (!element.querySelector("h1, h2, h3")) {
+                element.setAttribute("role", "presentation");
+            }
         });
     }
     /**
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Interaction/StandaloneButton.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Interaction/StandaloneButton.js
index 1c4649d96ac..8eba4d0e310 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Interaction/StandaloneButton.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Interaction/StandaloneButton.js
@@ -6,7 +6,7 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.2
  */
-define(["require", "exports", "tslib", "WoltLabSuite/Core/Api/Interactions/GetContextMenuOptions", "WoltLabSuite/Core/Ui/Dropdown/Simple"], function (require, exports, tslib_1, GetContextMenuOptions_1, Simple_1) {
+define(["require", "exports", "tslib", "WoltLabSuite/Core/Api/GetObject", "WoltLabSuite/Core/Api/Interactions/GetContextMenuOptions", "WoltLabSuite/Core/Ui/Dropdown/Simple"], function (require, exports, tslib_1, GetObject_1, GetContextMenuOptions_1, Simple_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.StandaloneButton = void 0;
@@ -16,11 +16,13 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Api/Interactions/GetCo
         #providerClassName;
         #objectId;
         #redirectUrl;
-        constructor(container, providerClassName, objectId, redirectUrl) {
+        #reloadHeaderEndpoint;
+        constructor(container, providerClassName, objectId, redirectUrl, reloadHeaderEndpoint) {
             this.#container = container;
             this.#providerClassName = providerClassName;
             this.#objectId = objectId;
             this.#redirectUrl = redirectUrl;
+            this.#reloadHeaderEndpoint = reloadHeaderEndpoint;
             this.#initInteractions();
             this.#initEventListeners();
         }
@@ -33,6 +35,20 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Api/Interactions/GetCo
             dropdown.innerHTML = response.template;
             this.#initInteractions();
         }
+        async #refreshHeader() {
+            if (!this.#reloadHeaderEndpoint) {
+                return;
+            }
+            const header = document.querySelector(".contentHeaderTitle");
+            if (!header) {
+                return;
+            }
+            const result = await (0, GetObject_1.getObject)(`${window.WSC_RPC_API_URL}${this.#reloadHeaderEndpoint}`);
+            if (!result.ok) {
+                return;
+            }
+            header.outerHTML = result.value.template;
+        }
         #getDropdownMenu() {
             const button = this.#container.querySelector(".dropdownToggle");
             if (!button) {
@@ -59,9 +75,11 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Api/Interactions/GetCo
         #initEventListeners() {
             this.#container.addEventListener("interaction:invalidate", () => {
                 void this.#refreshContextMenu();
+                void this.#refreshHeader();
             });
             this.#container.addEventListener("interaction:invalidate-all", () => {
                 void this.#refreshContextMenu();
+                void this.#refreshHeader();
             });
             this.#container.addEventListener("interaction:remove", () => {
                 window.location.href = this.#redirectUrl;
diff --git a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
index ddc85cf07e0..1c1d0f30dc8 100644
--- a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
+++ b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
@@ -176,6 +176,7 @@ static function (\wcf\event\endpoint\ControllerCollecting $event) {
             $event->register(new \wcf\system\endpoint\controller\core\articles\RestoreArticle());
             $event->register(new \wcf\system\endpoint\controller\core\articles\PublishArticle());
             $event->register(new \wcf\system\endpoint\controller\core\articles\UnpublishArticle());
+            $event->register(new \wcf\system\endpoint\controller\core\articles\contents\GetArticleContentHeaderTitle());
             $event->register(new \wcf\system\endpoint\controller\core\attachments\DeleteAttachment());
             $event->register(new \wcf\system\endpoint\controller\core\cronjobs\EnableCronjob());
             $event->register(new \wcf\system\endpoint\controller\core\cronjobs\DisableCronjob());
diff --git a/wcfsetup/install/files/lib/page/AbstractArticlePage.class.php b/wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
index a772591b323..ba4deb43876 100644
--- a/wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
+++ b/wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
@@ -2,7 +2,6 @@
 
 namespace wcf\page;
 
-use wcf\data\article\AccessibleArticleList;
 use wcf\data\article\ArticleAction;
 use wcf\data\article\ArticleEditor;
 use wcf\data\article\category\ArticleCategory;
@@ -12,10 +11,10 @@
 use wcf\data\object\type\ObjectTypeCache;
 use wcf\data\tag\Tag;
 use wcf\system\cache\runtime\ViewableArticleRuntimeCache;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\language\LanguageFactory;
+use wcf\system\listView\user\RelatedArticleListView;
 use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
 use wcf\system\page\PageLocationManager;
 use wcf\system\tagging\TagEngine;
@@ -66,17 +65,13 @@ abstract class AbstractArticlePage extends AbstractPage
      */
     public $category;
 
-    /**
-     * list of related articles
-     * @var AccessibleArticleList
-     */
-    public $relatedArticles;
-
     /**
      * @var GroupedAttachmentList
      */
     public $attachmentList;
 
+    public RelatedArticleListView $relatedArticleListView;
+
     /**
      * @inheritDoc
      */
@@ -149,41 +144,8 @@ public function readData()
         }
 
         // get related articles
-        if (MODULE_TAGGING && ARTICLE_RELATED_ARTICLES) {
-            if (!empty($this->tags)) {
-                $conditionBuilder = new PreparedStatementConditionBuilder();
-                $conditionBuilder->add(
-                    'tag_to_object.objectTypeID = ?',
-                    [TagEngine::getInstance()->getObjectTypeID('com.woltlab.wcf.article')]
-                );
-                $conditionBuilder->add('tag_to_object.tagID IN (?)', [\array_keys($this->tags)]);
-                $conditionBuilder->add('tag_to_object.objectID <> ?', [$this->articleContentID]);
-                $sql = "SELECT      MAX(article.articleID), COUNT(*) AS count
-                        FROM        wcf1_tag_to_object tag_to_object
-                        INNER JOIN  wcf1_article_content article_content
-                        ON          tag_to_object.objectID = article_content.articleContentID
-                        INNER JOIN  wcf1_article article
-                        ON          article_content.articleID = article.articleID
-                        " . $conditionBuilder . "
-                        GROUP BY    tag_to_object.objectID
-                        HAVING      COUNT(*) >= " . \round(\count($this->tags) * ARTICLE_RELATED_ARTICLES_MATCH_THRESHOLD / 100) . "
-                        ORDER BY    count DESC, MAX(article.time) DESC";
-                $statement = WCF::getDB()->prepare($sql, ARTICLE_RELATED_ARTICLES * 4);
-                $statement->execute($conditionBuilder->getParameters());
-                $articleIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
-
-                if (!empty($articleIDs)) {
-                    if (\count($articleIDs) > ARTICLE_RELATED_ARTICLES) {
-                        \shuffle($articleIDs);
-                        $articleIDs = \array_slice($articleIDs, 0, ARTICLE_RELATED_ARTICLES);
-                    }
-
-                    $this->relatedArticles = new AccessibleArticleList();
-                    $this->relatedArticles->getConditionBuilder()->add('article.articleID IN (?)', [$articleIDs]);
-                    $this->relatedArticles->sqlOrderBy = 'article.time';
-                    $this->relatedArticles->readObjects();
-                }
-            }
+        if (MODULE_TAGGING && ARTICLE_RELATED_ARTICLES && $this->tags !== []) {
+            $this->relatedArticleListView = new RelatedArticleListView($this->articleContent->articleContentID);
         }
 
         // set location
@@ -252,7 +214,7 @@ public function assignVariables()
             'articleContent' => $this->articleContent,
             'article' => $this->article,
             'category' => $this->category,
-            'relatedArticles' => $this->relatedArticles,
+            'relatedArticleListView' => $this->relatedArticleListView ?? null,
             'tags' => $this->tags,
             'attachmentList' => $this->attachmentList,
         ]);
diff --git a/wcfsetup/install/files/lib/page/ArticlePage.class.php b/wcfsetup/install/files/lib/page/ArticlePage.class.php
index 0ad55323bcc..c5ec1a985de 100644
--- a/wcfsetup/install/files/lib/page/ArticlePage.class.php
+++ b/wcfsetup/install/files/lib/page/ArticlePage.class.php
@@ -8,8 +8,11 @@
 use wcf\data\like\object\LikeObject;
 use wcf\system\comment\CommentHandler;
 use wcf\system\comment\manager\ICommentManager;
+use wcf\system\interaction\StandaloneInteractionContextMenuComponent;
+use wcf\system\interaction\user\ArticleInteractions;
 use wcf\system\MetaTagHandler;
 use wcf\system\reaction\ReactionHandler;
+use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 use wcf\util\StringUtil;
 
@@ -203,6 +206,13 @@ public function assignVariables()
             'previousArticle' => $this->previousArticle,
             'nextArticle' => $this->nextArticle,
             'articleLikeData' => $this->articleLikeData,
+            'interactionContextMenu' => StandaloneInteractionContextMenuComponent::forContentInteractionButton(
+                new ArticleInteractions(),
+                $this->article,
+                LinkHandler::getInstance()->getControllerLink(ArticleListPage::class),
+                WCF::getLanguage()->getDynamicVariable('wcf.acp.article.edit'),
+                "core/articles/contents/{$this->articleContentID}/content-header-title"
+            ),
 
             // nullified values for backwards-compatibility
             'commentCanAdd' => 0,
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/articles/contents/GetArticleContentHeaderTitle.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/articles/contents/GetArticleContentHeaderTitle.class.php
new file mode 100644
index 00000000000..3eadc5da0bd
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/endpoint/controller/core/articles/contents/GetArticleContentHeaderTitle.class.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace wcf\system\endpoint\controller\core\articles\contents;
+
+use Laminas\Diactoros\Response\JsonResponse;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use wcf\data\article\Article;
+use wcf\data\article\content\ViewableArticleContent;
+use wcf\system\endpoint\GetRequest;
+use wcf\system\endpoint\IController;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\WCF;
+
+/**
+ * API endpoint for the rendering of the article content header title.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2025 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.2
+ */
+#[GetRequest('/core/articles/contents/{id:\d+}/content-header-title')]
+final class GetArticleContentHeaderTitle implements IController
+{
+    #[\Override]
+    public function __invoke(ServerRequestInterface $request, array $variables): ResponseInterface
+    {
+        $articleContent = ViewableArticleContent::getArticleContent($variables['id']);
+        if ($articleContent === null) {
+            throw new IllegalLinkException();
+        }
+
+        $this->assertArticleIsAccessible($articleContent->getArticle()->getDecoratedObject());
+
+        $articleContent->getArticle()->getDiscussionProvider()->setArticleContent($articleContent->getDecoratedObject());
+
+        return new JsonResponse([
+            'template' => WCF::getTPL()->render('wcf', 'articleContentHeaderTitle', [
+                'articleContent' => $articleContent,
+                'article' => $articleContent->getArticle(),
+            ]),
+        ]);
+    }
+
+    private function assertArticleIsAccessible(Article $article): void
+    {
+        if (!$article->canRead()) {
+            throw new PermissionDeniedException();
+        }
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/interaction/StandaloneInteractionContextMenuComponent.class.php b/wcfsetup/install/files/lib/system/interaction/StandaloneInteractionContextMenuComponent.class.php
index 6198b529256..375223e8965 100644
--- a/wcfsetup/install/files/lib/system/interaction/StandaloneInteractionContextMenuComponent.class.php
+++ b/wcfsetup/install/files/lib/system/interaction/StandaloneInteractionContextMenuComponent.class.php
@@ -22,7 +22,8 @@ public function __construct(
         protected readonly string $label = '',
         protected readonly string $icon = 'ellipsis-vertical',
         protected readonly string $cssClassName = '',
-        protected readonly string $buttonCssClassName = ''
+        protected readonly string $buttonCssClassName = '',
+        protected readonly string $reloadHeaderEndpoint = '',
     ) {
         parent::__construct($provider);
     }
@@ -48,6 +49,7 @@ public function render(): string
                 'icon' => $this->icon,
                 'cssClassName' => $this->cssClassName,
                 'buttonCssClassName' => $this->buttonCssClassName,
+                'reloadHeaderEndpoint' => $this->reloadHeaderEndpoint,
             ],
         );
     }
@@ -72,7 +74,17 @@ public static function forContentInteractionButton(
         DatabaseObject $object,
         string $redirectUrl,
         string $label,
+        string $reloadHeaderEndpoint = ''
     ): self {
-        return new self($provider, $object, $redirectUrl, $label, 'pencil', 'contentInteractionButton', 'small');
+        return new self(
+            $provider,
+            $object,
+            $redirectUrl,
+            $label,
+            'pencil',
+            'contentInteractionButton',
+            'small',
+            $reloadHeaderEndpoint
+        );
     }
 }
diff --git a/wcfsetup/install/files/lib/system/interaction/user/ArticleInteractions.class.php b/wcfsetup/install/files/lib/system/interaction/user/ArticleInteractions.class.php
index cd9dda6d49c..ba98f2ae7e5 100644
--- a/wcfsetup/install/files/lib/system/interaction/user/ArticleInteractions.class.php
+++ b/wcfsetup/install/files/lib/system/interaction/user/ArticleInteractions.class.php
@@ -13,7 +13,7 @@
 use wcf\system\interaction\EditInteraction;
 use wcf\system\interaction\RestoreInteraction;
 use wcf\system\interaction\RpcInteraction;
-use wcf\system\interaction\TrashInteraction;
+use wcf\system\interaction\SoftDeleteInteraction;
 
 /**
  * Interaction provider for articles.
@@ -28,21 +28,21 @@ final class ArticleInteractions extends AbstractInteractionProvider
     public function __construct()
     {
         $this->addInteractions([
-            new TrashInteraction('core/articles/%s/trash', function (ViewableArticle $article): bool {
+            new SoftDeleteInteraction('core/articles/%s/soft-delete', function (ViewableArticle|Article $article): bool {
                 if (!$article->canDelete()) {
                     return false;
                 }
 
                 return $article->isDeleted !== 1;
             }),
-            new RestoreInteraction('core/articles/%s/restore', function (ViewableArticle $article): bool {
+            new RestoreInteraction('core/articles/%s/restore', function (ViewableArticle|Article $article): bool {
                 if (!$article->canDelete()) {
                     return false;
                 }
 
                 return $article->isDeleted === 1;
             }),
-            new DeleteInteraction('core/articles/%s', function (ViewableArticle $article): bool {
+            new DeleteInteraction('core/articles/%s', function (ViewableArticle|Article $article): bool {
                 if (!$article->canDelete()) {
                     return false;
                 }
@@ -53,7 +53,7 @@ public function __construct()
                 'publish',
                 'core/articles/%s/publish',
                 'wcf.article.button.publish',
-                isAvailableCallback: static function (ViewableArticle $article): bool {
+                isAvailableCallback: static function (ViewableArticle|Article $article): bool {
                     if (!$article->canPublish()) {
                         return false;
                     }
@@ -65,7 +65,7 @@ public function __construct()
                 'unpublish',
                 'core/articles/%s/unpublish',
                 'wcf.article.button.unpublish',
-                isAvailableCallback: static function (ViewableArticle $article): bool {
+                isAvailableCallback: static function (ViewableArticle|Article $article): bool {
                     if (!$article->canPublish()) {
                         return false;
                     }
@@ -74,7 +74,7 @@ public function __construct()
                 }
             ),
             new Divider(),
-            new EditInteraction(ArticleEditForm::class, function (ViewableArticle $article): bool {
+            new EditInteraction(ArticleEditForm::class, function (ViewableArticle|Article $article): bool {
                 return $article->canEdit();
             })
         ]);
diff --git a/wcfsetup/install/files/lib/system/listView/AbstractListView.class.php b/wcfsetup/install/files/lib/system/listView/AbstractListView.class.php
index c0a96a4004a..a3b949a6a5e 100644
--- a/wcfsetup/install/files/lib/system/listView/AbstractListView.class.php
+++ b/wcfsetup/install/files/lib/system/listView/AbstractListView.class.php
@@ -39,6 +39,10 @@ abstract class AbstractListView
     private ?IInteractionProvider $interactionProvider = null;
     private ?IBulkInteractionProvider $bulkInteractionProvider = null;
     private InteractionContextMenuComponent $interactionContextMenuComponent;
+    private bool $allowFiltering = true;
+    private bool $allowSorting = true;
+    private bool $allowInteractions = true;
+    private int $fixedNumberOfItems = 0;
 
     /**
      * @var array<string, string>
@@ -81,6 +85,22 @@ public function setItemsPerPage(int $itemsPerPage): void
         $this->itemsPerPage = $itemsPerPage;
     }
 
+    /**
+     * Gets the fixed number of items shown.
+     */
+    public function getFixedNumberOfItems(): int
+    {
+        return $this->fixedNumberOfItems;
+    }
+
+    /**
+     * Sets the maximum number of items shown.
+     */
+    public function setFixedNumberOfItems(int $fixedNumberOfItems): void
+    {
+        $this->fixedNumberOfItems = $fixedNumberOfItems;
+    }
+
     /**
      * Sets the sort field of the list view.
      */
@@ -179,8 +199,10 @@ public function getBaseUrl(): string
     protected function initObjectList(): void
     {
         $this->objectList = $this->createObjectList();
-        $this->objectList->sqlLimit = $this->getItemsPerPage();
-        $this->objectList->sqlOffset = ($this->getPageNo() - 1) * $this->getItemsPerPage();
+        $this->objectList->sqlLimit = $this->getFixedNumberOfItems() ?: $this->getItemsPerPage();
+        if (!$this->getFixedNumberOfItems()) {
+            $this->objectList->sqlOffset = ($this->getPageNo() - 1) * $this->getItemsPerPage();
+        }
         if ($this->getSortField()) {
             $sortFieldObject = $this->availableSortFields[$this->getSortField()];
 
@@ -240,6 +262,9 @@ public function countItems(): int
     {
         if (!isset($this->objectCount)) {
             $this->objectCount = $this->getObjectList()->countObjects();
+            if ($this->getFixedNumberOfItems() && $this->getFixedNumberOfItems() < $this->objectCount) {
+                $this->objectCount = $this->getFixedNumberOfItems();
+            }
         }
 
         return $this->objectCount;
@@ -298,7 +323,8 @@ public function getID(): string
      */
     public function isFilterable(): bool
     {
-        return $this->availableFilters !== [];
+        return $this->allowFiltering
+            && $this->availableFilters !== [];
     }
 
     /**
@@ -317,7 +343,8 @@ public function getFilterActionEndpoint(): string
      */
     public function isSortable(): bool
     {
-        return $this->availableSortFields !== [];
+        return $this->allowSorting
+            && $this->availableSortFields !== [];
     }
 
     public function addAvailableSortField(ListViewSortField $sortField): void
@@ -335,6 +362,11 @@ public function addAvailableSortFields(array $sortFields): void
         }
     }
 
+    public function setAllowSorting(bool $allowSorting): void
+    {
+        $this->allowSorting = $allowSorting;
+    }
+
     /**
      * @return ListViewSortField[]
      */
@@ -358,6 +390,11 @@ public function addAvailableFilters(array $filters): void
         }
     }
 
+    public function setAllowFiltering(bool $allowFiltering): void
+    {
+        $this->allowFiltering = $allowFiltering;
+    }
+
     /**
      * @return array<string, IListViewFilter>
      */
@@ -431,7 +468,8 @@ public function getBulkInteractionProvider(): ?IBulkInteractionProvider
      */
     public function hasBulkInteractions(): bool
     {
-        return $this->getBulkInteractionProvider() !== null
+        return $this->allowInteractions
+            && $this->getBulkInteractionProvider() !== null
             && $this->getBulkInteractionProvider()->getInteractions() !== [];
     }
 
@@ -444,12 +482,18 @@ public function getBulkInteractionProviderClassName(): string
         return \get_class($this->getBulkInteractionProvider());
     }
 
+    public function setAllowInteractions(bool $allowInteractions): void
+    {
+        $this->allowInteractions = $allowInteractions;
+    }
+
     /**
      * Returns true, if this list view has interactions.
      */
     public function hasInteractions(): bool
     {
-        return $this->interactionProvider !== null;
+        return $this->allowInteractions
+            && $this->interactionProvider !== null;
     }
 
     /**
@@ -502,7 +546,7 @@ public function getInteractionContextMenuComponent(): InteractionContextMenuComp
      */
     public function renderInteractionContextMenuButton(DatabaseObject $item): string
     {
-        if ($this->interactionProvider === null) {
+        if (!$this->hasInteractions()) {
             return '';
         }
 
diff --git a/wcfsetup/install/files/lib/system/listView/user/RelatedArticleListView.class.php b/wcfsetup/install/files/lib/system/listView/user/RelatedArticleListView.class.php
new file mode 100644
index 00000000000..31692747e41
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/listView/user/RelatedArticleListView.class.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace wcf\system\listView\user;
+
+use wcf\data\article\AccessibleArticleList;
+use wcf\system\cache\runtime\ViewableArticleContentRuntimeCache;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\language\LanguageFactory;
+use wcf\system\tagging\TagEngine;
+use wcf\system\WCF;
+
+/**
+ * List view for the list of related articles.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2025 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.2
+ *
+ * @extends AbstractListView<ViewableArticle, AccessibleArticleList>
+ */
+class RelatedArticleListView extends ArticleListView
+{
+    public function __construct(public readonly int $articleContentID)
+    {
+        parent::__construct();
+
+        $this->setAllowFiltering(false);
+        $this->setAllowSorting(false);
+        $this->setAllowInteractions(false);
+    }
+
+    #[\Override]
+    protected function createObjectList(): AccessibleArticleList
+    {
+        $articleIDs = $this->getRelatedArticleIDs($this->articleContentID);
+        $list = parent::createObjectList();
+
+        if ($articleIDs !== []) {
+            if (\count($articleIDs) > ARTICLE_RELATED_ARTICLES) {
+                \shuffle($articleIDs);
+                $articleIDs = \array_slice($articleIDs, 0, ARTICLE_RELATED_ARTICLES);
+            }
+
+            $list->getConditionBuilder()->add('article.articleID IN (?)', [$articleIDs]);
+        } else {
+            $list->getConditionBuilder()->add('1 = 0');
+        }
+
+        return $list;
+    }
+
+    #[\Override]
+    public function getParameters(): array
+    {
+        return ['articleContentID' => $this->articleContentID];
+    }
+
+    #[\Override]
+    public function isAccessible(): bool
+    {
+        return parent::isAccessible()
+            && \MODULE_TAGGING
+            && \ARTICLE_RELATED_ARTICLES
+            && WCF::getSession()->getPermission('user.tag.canViewTag');
+    }
+
+    /**
+     * @return array<int>
+     */
+    private function getRelatedArticleIDs(int $articleContentID): array
+    {
+        $articleContent = ViewableArticleContentRuntimeCache::getInstance()->getObject($articleContentID);
+
+        $tags = TagEngine::getInstance()->getObjectTags(
+            'com.woltlab.wcf.article',
+            $articleContentID,
+            [$articleContent->languageID ?: LanguageFactory::getInstance()->getDefaultLanguageID()]
+        );
+
+        $conditionBuilder = new PreparedStatementConditionBuilder();
+        $conditionBuilder->add(
+            'tag_to_object.objectTypeID = ?',
+            [TagEngine::getInstance()->getObjectTypeID('com.woltlab.wcf.article')]
+        );
+        $conditionBuilder->add('tag_to_object.tagID IN (?)', [\array_keys($tags)]);
+        $conditionBuilder->add('tag_to_object.objectID <> ?', [$articleContentID]);
+        $sql = "SELECT      MAX(article.articleID), COUNT(*) AS count
+                FROM        wcf1_tag_to_object tag_to_object
+                INNER JOIN  wcf1_article_content article_content
+                ON          tag_to_object.objectID = article_content.articleContentID
+                INNER JOIN  wcf1_article article
+                ON          article_content.articleID = article.articleID
+                " . $conditionBuilder . "
+                GROUP BY    tag_to_object.objectID
+                HAVING      COUNT(*) >= " . \round(\count($tags) * ARTICLE_RELATED_ARTICLES_MATCH_THRESHOLD / 100) . "
+                ORDER BY    count DESC, MAX(article.time) DESC";
+        $statement = WCF::getDB()->prepare($sql, ARTICLE_RELATED_ARTICLES * 4);
+        $statement->execute($conditionBuilder->getParameters());
+
+        return $statement->fetchAll(\PDO::FETCH_COLUMN);
+    }
+}
diff --git a/wcfsetup/install/files/style/element/list.scss b/wcfsetup/install/files/style/element/list.scss
index baf9acb1ba5..50557fb3ff1 100644
--- a/wcfsetup/install/files/style/element/list.scss
+++ b/wcfsetup/install/files/style/element/list.scss
@@ -23,27 +23,19 @@ ol.nativeList {
 	@include inlineList;
 
 	align-items: baseline;
-	margin-bottom: -4px;
-	margin-right: -8px;
-
-	> li {
-		margin-bottom: 4px;
-		margin-right: 8px;
-	}
+	gap: 5px;
 
 	.tag {
+		align-items: center;
 		background-color: var(--wcfButtonBackground);
-		clip-path: polygon(0 50%, 1em 0%, 100% 0%, 100% 100%, 1em 100%);
+		border-radius: 999px;
 		color: var(--wcfButtonText);
-		display: inline-block;
-		margin-left: 11px;
-		padding: 3px 6px 2px 2px;
-		padding-left: calc(1em + 2px);
-		position: relative;
+		display: flex;
+		gap: 3px;
+		padding: 2px 10px;
 		text-decoration: none;
 
 		@include wcfFontSmall;
-		@include wcfFontBold;
 
 		&:hover {
 			background-color: var(--wcfButtonPrimaryBackgroundActive);
diff --git a/wcfsetup/install/files/style/ui/article.scss b/wcfsetup/install/files/style/ui/article.scss
index 74afd049e59..b9d9ff0fc41 100644
--- a/wcfsetup/install/files/style/ui/article.scss
+++ b/wcfsetup/install/files/style/ui/article.scss
@@ -1,3 +1,4 @@
+/* deprecated 6.2 no longer in use */
 .articleTeaser {
 	@include wcfFontBold;
 }
@@ -77,7 +78,7 @@
 	}
 
 	.articleAboutAuthorUsername {
-		margin-top: 5px;
+		margin-top: 10px;
 
 		.username {
 			@include wcfFontHeadline;
@@ -188,6 +189,7 @@ body:not(.touch) .articleNavigationArticle:hover .articleNavigationArticleIcon {
 		top: 0;
 	}
 }
+/* /deprecated */
 
 .articleList {
 	.articleListMetaData {
@@ -305,10 +307,3 @@ body:not(.touch) .articleNavigationArticle:hover .articleNavigationArticleIcon {
 		}
 	}
 }
-
-.discussionProviderCtaContainer {
-	align-items: center;
-	display: flex;
-	flex-direction: column;
-	row-gap: 10px;
-}
diff --git a/wcfsetup/install/files/style/ui/entry.scss b/wcfsetup/install/files/style/ui/entry.scss
new file mode 100644
index 00000000000..179ec7558d6
--- /dev/null
+++ b/wcfsetup/install/files/style/ui/entry.scss
@@ -0,0 +1,214 @@
+.entry {
+	display: flex;
+	flex-direction: column;
+	gap: 20px;
+}
+
+.entry__teaser {
+	@include wcfFontBold;
+}
+
+.entry__coverPhoto img {
+	height: auto;
+	width: 100%;
+	object-fit: cover;
+	object-position: center center;
+	max-height: 400px;
+	border-radius: var(--wcfBorderRadius);
+}
+
+.entry__coverPhoto figcaption {
+	color: var(--wcfContentDimmedText);
+	flex: 1 0 100%;
+	margin-top: 5px;
+	text-align: center;
+
+	@include wcfFontSmall;
+}
+
+.entry__content:not(:last-child) {
+	border-bottom: 1px solid var(--wcfContentBorderInner);
+	padding-bottom: 20px;
+}
+
+.entry__attachments__title {
+	margin-bottom: 10px;
+
+	@include wcfFontHeadline;
+	@include wcfFontBold;
+}
+
+.entry__footer {
+	display: flex;
+}
+
+.entry__footerButtons {
+	display: flex;
+	gap: 1px;
+	flex-wrap: wrap;
+	margin-inline-start: auto;
+}
+
+.entry__footerButtons .button {
+	padding: 6px 8px;
+
+	@include wcfFontSmall;
+}
+
+.entry__footerButtons .button:not(:first-child) {
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
+}
+
+.entry__footerButtons .button:not(:last-child) {
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+}
+
+.entry__aboutAuthor {
+	display: flex;
+	gap: 20px;
+}
+
+.entry__aboutAuthor__avatar {
+	flex: 0 0 auto;
+}
+
+.entry__aboutAuthor__content {
+	display: flex;
+	flex-direction: column;
+	flex: 1 1 100%;
+	gap: 10px;
+}
+
+.entry__aboutAuthor__text {
+	font-style: italic;
+}
+
+.entry__aboutAuthor__username {
+	.username {
+		@include wcfFontHeadline;
+	}
+
+	.userTitleBadge {
+		top: -2px;
+	}
+}
+
+@include screen-sm-down {
+	.entry__aboutAuthor {
+		gap: 10px;
+	}
+
+	.entry__aboutAuthor__avatar img {
+		width: 64px;
+		height: 64px;
+	}
+}
+
+.entry__navigation {
+	column-gap: 20px;
+	display: grid;
+	grid-template-areas: "previous next";
+	grid-template-columns: 1fr 1fr;
+
+	@include screen-sm-down {
+		column-gap: 0;
+		grid-template-areas:
+			"previous"
+			"next";
+		grid-template-columns: 1fr;
+		row-gap: 20px;
+	}
+}
+
+.entry__navigation__item {
+	color: var(--wcfContentText);
+	display: grid;
+	grid-template-rows: repeat(2, minmax(0, max-content));
+	position: relative;
+
+	&.entry__navigation__item--previous {
+		grid-area: previous;
+		grid-template-areas: "icon content";
+		grid-template-columns: 60px auto;
+	}
+
+	&.entry__navigation__item--next {
+		grid-area: next;
+		grid-template-areas: "content icon";
+		text-align: right;
+	}
+
+	&.entry__navigation__item--withImage {
+		&.entry__navigation__item--previous {
+			grid-template-areas: "icon image content";
+			grid-template-columns: 60px 96px auto;
+		}
+
+		&.entry__navigation__item--next {
+			grid-template-areas: "content image icon";
+			grid-template-columns: auto 96px 60px;
+			text-align: right;
+		}
+	}
+}
+
+.entry__navigation__item__icon {
+	align-self: center;
+	grid-area: icon;
+}
+
+body:not(.touch) .entry__navigation__item:hover .entry__navigation__item__icon {
+	color: var(--wcfContentLinkActive);
+}
+
+.entry__navigation__item__image {
+	border-radius: 3px;
+	grid-area: image;
+	overflow: hidden;
+}
+
+.entry__navigation__item--previous.entry__navigation__item--withImage .entry__navigation__item__content {
+	margin-left: 20px;
+}
+
+.entry__navigation__item--next.entry__navigation__item--withImage .entry__navigation__item__content {
+	margin-right: 20px;
+}
+
+.entry__navigation__item__content {
+	grid-area: content;
+}
+
+.entry__navigation__item__entityName {
+	color: var(--wcfContentDimmedText);
+	display: block;
+}
+
+.entry__navigation__item__title {
+	display: block;
+	margin-top: 5px;
+
+	@include wcfFontHeadline;
+}
+
+.entry__navigation__item__link {
+	color: var(--wcfContentText);
+
+	&::before {
+		bottom: 0;
+		content: "";
+		left: 0;
+		position: absolute;
+		right: 0;
+		top: 0;
+	}
+}
+
+.discussionProviderCtaContainer {
+	align-items: center;
+	display: flex;
+	flex-direction: column;
+	row-gap: 10px;
+}
diff --git a/wcfsetup/install/files/style/ui/toc.scss b/wcfsetup/install/files/style/ui/toc.scss
index 933f7a2635d..c1cced31cc4 100644
--- a/wcfsetup/install/files/style/ui/toc.scss
+++ b/wcfsetup/install/files/style/ui/toc.scss
@@ -21,6 +21,10 @@
 		margin: 0 0 10px 10px;
 		max-width: 50%;
 	}
+
+	.htmlContent > .tableOfContentsWrapper + * {
+		margin-top: 0 !important;
+	}
 }
 
 @include screen-sm-down {