diff --git a/views/components/bootstrap/bs_card.templ b/views/components/bootstrap/alert.templ
similarity index 75%
rename from views/components/bootstrap/bs_card.templ
rename to views/components/bootstrap/alert.templ
index 6f4073b..c2be6c8 100644
--- a/views/components/bootstrap/bs_card.templ
+++ b/views/components/bootstrap/alert.templ
@@ -17,7 +17,3 @@ templ BootstrapAlert(message, variant string) {
 		{ message }
 	</div>
 }
-
-templ BootstrapButton(message, variant string) {
-	<button type="button" class={ getButtonVariant(variant) }>{ message }</button>
-}
diff --git a/views/components/bootstrap/button.templ b/views/components/bootstrap/button.templ
new file mode 100644
index 0000000..fc85b61
--- /dev/null
+++ b/views/components/bootstrap/button.templ
@@ -0,0 +1,10 @@
+package bootstrap
+
+const (
+	ButtonTypeSubmit  = "submit"
+	ButtonTypeDefault = "button"
+)
+
+templ BootstrapButton(message, variant, buttonType string) {
+	<button type={ buttonType } class={ getButtonVariant(variant) }>{ message }</button>
+}
diff --git a/views/components/bootstrap/label.templ b/views/components/bootstrap/label.templ
new file mode 100644
index 0000000..9786fe9
--- /dev/null
+++ b/views/components/bootstrap/label.templ
@@ -0,0 +1,5 @@
+package bootstrap
+
+templ Label(cssClass, name, cssForId, message string) {
+    <label class={ cssClass } name={ name } for={ cssForId }>{ message }</label>
+}
\ No newline at end of file
diff --git a/views/components/bootstrap/switch.templ b/views/components/bootstrap/switch.templ
new file mode 100644
index 0000000..e0635f3
--- /dev/null
+++ b/views/components/bootstrap/switch.templ
@@ -0,0 +1,13 @@
+package bootstrap
+
+const (
+	SwitchTypeCheckbox = "checkbox"
+)
+
+templ Switch(name, switchType, cssId string, enabled bool) {
+	if enabled == true {
+		<input class="form-check-input" name={ name } type={ switchType } role="switch" id={ cssId } checked/>
+	} else {
+		<input class="form-check-input" name={ name } type={ switchType } role="switch" id={ cssId }/>
+	}
+}