diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index bd1014a..fc55d23 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -4,6 +4,7 @@ Changelog
 1.4.3 - (Unreleased)
 ---------------------------
 - Enh #164: Convert swagger docs to OpenAPI 3.0
+- Fix #167: Various visual issues since BS5
 
 1.4.2 (November 11, 2025)
 -------------------------
diff --git a/views/poll/edit.php b/views/poll/edit.php
index e1ba411..6c4943e 100644
--- a/views/poll/edit.php
+++ b/views/poll/edit.php
@@ -1,12 +1,12 @@
 <?php
 
-use humhub\modules\content\widgets\richtext\RichTextField;
-use humhub\widgets\form\ActiveForm;
 use humhub\helpers\Html;
+use humhub\modules\content\widgets\richtext\RichTextField;
 use humhub\modules\polls\widgets\AddAnswerInput;
-use humhub\widgets\bootstrap\Button;
-use humhub\widgets\bootstrap\Alert;
 use humhub\modules\ui\icon\widgets\Icon;
+use humhub\widgets\bootstrap\Alert;
+use humhub\widgets\bootstrap\Button;
+use humhub\widgets\form\ActiveForm;
 
 /** @var  $poll \humhub\modules\polls\models\Poll */
 
@@ -15,7 +15,9 @@
 
 <div data-poll="<?= $poll->id ?>" data-content-component="polls.Poll" data-content-key="<?= $poll->content->id ?>"
     class="content_edit" id="poll_edit_<?= $poll->id; ?>">
-    <?= Alert::danger('<span class="errorMessage"></span>')->cssClass(['d-none']) ?>
+    <?= Alert::danger('<span class="errorMessage"></span>')
+        ->cssClass(['d-none'])
+        ->closeButton(false) ?>
 
     <?php $form = ActiveForm::begin(); ?>
 
diff --git a/widgets/views/_answer.php b/widgets/views/_answer.php
index 4615dbe..88e82ca 100644
--- a/widgets/views/_answer.php
+++ b/widgets/views/_answer.php
@@ -56,10 +56,11 @@
         <?php if ($poll->isShowResult()) : ?>
             <div class="col-2 text-nowrap mt-3 p-0">
                 <?= !$poll->anonymous && $voteCount
-                    ? Link::asLink($voteText, $contentContainer->createUrl('/polls/poll/user-list-results', [
+                    ? Link::to($voteText, $contentContainer->createUrl('/polls/poll/user-list-results', [
                             'pollId' => $poll->id,
                             'answerId' => $answer->id,
                         ]))
+                        ->cssClass('link-accent')
                         ->options(['data-bs-target' => '#globalModal'])
                         ->tooltip($userlist)
                     : $voteText ?>
diff --git a/widgets/views/entry.php b/widgets/views/entry.php
index 85fa815..ce01bd9 100644
--- a/widgets/views/entry.php
+++ b/widgets/views/entry.php
@@ -1,11 +1,11 @@
 <?php
 
+use humhub\helpers\Html;
 use humhub\modules\content\widgets\richtext\RichText;
 use humhub\modules\polls\models\Poll;
-use humhub\helpers\Html;
+use humhub\widgets\bootstrap\Alert;
 use humhub\widgets\bootstrap\Badge;
 use humhub\widgets\bootstrap\Button;
-use humhub\widgets\bootstrap\Alert;
 
 humhub\modules\polls\assets\PollsAsset::register($this);
 
@@ -36,7 +36,9 @@
 
     <?php if(!$poll->isShowResult()) : ?>
         <br>
-        <?= Alert::light(Yii::t('PollsModule.base', '<strong>Note:</strong> The result is hidden until the poll is closed by a moderator.'))->cssClass('m-0') ?>
+        <?= Alert::light(Yii::t('PollsModule.base', '<strong>Note:</strong> The result is hidden until the poll is closed by a moderator.'))
+            ->cssClass('m-0')
+            ->closeButton(false) ?>
     <?php endif; ?>
 
     <?php if (!$poll->hasUserVoted() && !Yii::$app->user->isGuest && !$poll->closed) : ?>
diff --git a/widgets/views/form.php b/widgets/views/form.php
index 7e5dd4d..7982c18 100644
--- a/widgets/views/form.php
+++ b/widgets/views/form.php
@@ -1,12 +1,12 @@
 <?php
 
+use humhub\helpers\Html;
 use humhub\modules\content\widgets\richtext\RichTextField;
 use humhub\modules\content\widgets\WallCreateContentFormFooter;
 use humhub\modules\polls\assets\PollsAsset;
 use humhub\modules\polls\models\Poll;
 use humhub\modules\polls\widgets\AddAnswerInput;
 use humhub\widgets\form\ActiveForm;
-use humhub\helpers\Html;
 
 /* @var $model Poll */
 /* @var $form ActiveForm */
@@ -25,7 +25,7 @@
     <?= Html::activeLabel($model, 'answersText', ['label' => Yii::t('PollsModule.base', 'Answers'), 'class' => 'control-label']); ?>
     <?= AddAnswerInput::widget(['name' => 'newAnswers[]', 'showTitle' => false]); ?>
 
-    <div class="container">
+    <div class="container gx-0 overflow-x-hidden">
         <div class="row">
             <div class="col-md-6">
                 <?= $form->field($model, 'allow_multiple')->checkbox() ?>