4 files changed, 22 insertions, 10 deletions
diff --git a/Course/Detail/Classic.ui.qml b/Course/Detail/Classic.ui.qml
index 710ff59..04f94b9 100644
--- a/Course/Detail/Classic.ui.qml
+++ b/Course/Detail/Classic.ui.qml
@@ -2,9 +2,9 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtGraphicalEffects 1.15
+import Bootstrap 5.3
 import Eduport 1.4
 import "../../DropShadow" as DrpShdw
-import "../../Label" as Lbl
 import "Classic/Content" as Content
 import "Classic/Content/Sidebar" as ContentSidebar
 
@@ -45,9 +45,11 @@ Flickable {
 					implicitHeight: introBadge.height
 					radius: 5.2
 					color: Qt.rgba( .0235, .416, .788, 1.0)
-					Lbl.H6 {
+					Label {
 						id: introBadge
 						text: qsTr("Digital Marketing")
+						Bootstrap.heading: 6
+						wrapMode: Label.Wrap
 						color: "white"
 						font.family: Eduport.baseFont
 									.family
@@ -62,9 +64,11 @@ Flickable {
 					}
 				}
 
-				Lbl.H1 {
+				Label {
 					id: introTitleHeader
 					text: qsTr("The Complete Digital Marketing Course - 12 Courses in 1")
+					wrapMode: Label.Wrap
+					Bootstrap.heading: 1
 					Layout.fillWidth: true
 				}
 
diff --git a/Course/Detail/Classic/Content/Main.ui.qml b/Course/Detail/Classic/Content/Main.ui.qml
index 0b1c642..c4217a1 100644
--- a/Course/Detail/Classic/Content/Main.ui.qml
+++ b/Course/Detail/Classic/Content/Main.ui.qml
@@ -2,9 +2,9 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtGraphicalEffects 1.15
+import Bootstrap 5.3
 import Eduport 1.4
 import "../../../../DropShadow" as DrpShdw
-import "../../../../Label" as Lbl
 import "../../../../Button/NavLink" as NavLink
 import "Main/TabContents" as MainTabContents
 
@@ -97,8 +97,10 @@ ColumnLayout {
 					ColumnLayout {
 						id: overview
 
-						Lbl.H5 {
+						Label {
 							text: qsTr("Course Description")
+							wrapMode: Label.Wrap
+							Bootstrap.heading: 5
 							Layout.fillWidth: true
 							Layout.bottomMargin: 16
 						}
diff --git a/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml b/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml
index bff0110..42e2d97 100644
--- a/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml
+++ b/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import "../../../../../../Label" as Lbl
+import Bootstrap 5.3
 import "Instructor"
 
 ColumnLayout {
@@ -26,8 +26,10 @@ ColumnLayout {
 			Layout.bottomMargin: 16
 			spacing: 0
 
-			Lbl.H3 {
+			Label {
 				text: qsTr("Louis Ferguson")
+				wrapMode: Label.Wrap
+				Bootstrap.heading: 3
 			}
 
 			Label {
@@ -55,9 +57,11 @@ ColumnLayout {
 		}
 	}
 
-	Lbl.H5 {
+	Label {
 		Layout.bottomMargin: 16
 		text: qsTr("About Instructor")
+		wrapMode: Label.Wrap
+		Bootstrap.heading: 5
 	}
 
 	Label {
diff --git a/Course/Detail/Classic/Content/Sidebar/Video.ui.qml b/Course/Detail/Classic/Content/Sidebar/Video.ui.qml
index c6ca75f..3bd67d6 100644
--- a/Course/Detail/Classic/Content/Sidebar/Video.ui.qml
+++ b/Course/Detail/Classic/Content/Sidebar/Video.ui.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtGraphicalEffects 1.15
 import QtMultimedia 5.15
+import Bootstrap 5.3
 import Eduport 1.4
-import "../../../../../Label" as Lbl
 import "../../../../../Button" as Btn
 import "../../../../../Button/Outline" as BtnOutline
 
@@ -70,8 +70,10 @@ ColumnLayout {
 				RowLayout {
 					spacing: 8
 
-					Lbl.H3 {
+					Label {
 						text: priceText
+						wrapMode: Label.Wrap
+						Bootstrap.heading: 3
 					}
 
 					Label {