diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index ad82d47..fa73e99 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.1.1 (Unreleased)
+-----------------------
+- Fix #7: Use bootstrap class to build button and link
+
 1.1.0 (August 28, 2025)
 -----------------------
 - Fix: Update module resources path
diff --git a/module.json b/module.json
index 10e1afd..a9d520b 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
     "description": "Integrating GitHub Sign-In (OAuth 2.0).",
     "keywords": [
     ],
-    "version": "1.1.0",
+    "version": "1.1.1",
     "homepage": "https://github.com/humhub-contrib/auth-github",
     "humhub": {
         "minVersion": "1.18"
diff --git a/views/admin/index.php b/views/admin/index.php
index 7e31d7f..1457d24 100644
--- a/views/admin/index.php
+++ b/views/admin/index.php
@@ -1,10 +1,11 @@
 <?php
-/* @var $this \humhub\components\View */
-/* @var $model \humhubContrib\auth\github\models\ConfigureForm */
 
+use humhub\widgets\bootstrap\Button;
+use humhub\widgets\bootstrap\Link;
 use humhub\widgets\form\ActiveForm;
-use yii\helpers\Html;
+use humhubContrib\auth\github\models\ConfigureForm;
 
+/* @var $model ConfigureForm */
 ?>
 <div class="container-fluid">
     <div class="panel panel-default">
@@ -13,7 +14,10 @@
 
         <div class="panel-body">
             <p>
-                <?= Html::a(Yii::t('AuthGithubModule.base', 'GitHub Documentation'), 'https://docs.github.com/en/developers/apps/creating-an-oauth-app', ['class' => 'btn btn-primary float-end btn-sm', 'target' => '_blank']); ?>
+                <?= Link::primary(Yii::t('AuthGithubModule.base', 'GitHub Documentation'))
+                    ->link('https://docs.github.com/en/developers/apps/creating-an-oauth-app')
+                    ->blank()->loader(false)
+                    ->right()->sm() ?>
                 <?= Yii::t('AuthGithubModule.base', 'Please follow the GitHub instructions to create the required <strong>OAuth client</strong> credentials.'); ?>
                 <br/>
             </p>
@@ -31,9 +35,7 @@
             <?= $form->field($model, 'redirectUri')->textInput(['readonly' => true]); ?>
             <br/>
 
-            <div class="mb-3">
-                <?= Html::submitButton(Yii::t('base', 'Save'), ['class' => 'btn btn-primary', 'data-ui-loader' => '']) ?>
-            </div>
+            <?= Button::save()->submit() ?>
 
             <?php ActiveForm::end(); ?>