diff --git a/pages/_docs/form-elements.md b/pages/_docs/form-elements.md
index f18ac6e07..fa67995c2 100644
--- a/pages/_docs/form-elements.md
+++ b/pages/_docs/form-elements.md
@@ -197,7 +197,7 @@ bootstrap-link: components/forms/
 {% example %}
 <div class="mb-2">
    <label class="form-label">Date of birth</label>
-   <div class="row row-xs">
+   <div class="row row-sm">
       <div class="col-5">
          <select name="user[month]" class="form-select">
             <option value="">Month</option>
diff --git a/pages/_includes/cards/credit-card.html b/pages/_includes/cards/credit-card.html
new file mode 100644
index 000000000..00ae10fae
--- /dev/null
+++ b/pages/_includes/cards/credit-card.html
@@ -0,0 +1,47 @@
+<div class="card">
+	<div class="card-body">
+		<div class="mb-3">
+			<div class="form-label">Card number</div>
+			{% include ui/form/input-mask.html mask="0000 0000 0000 0000" visible=true %}
+		</div>
+
+		<div class="mb-3">
+			<div class="form-label">Card name</div>
+			<input type="text" class="form-control">
+		</div>
+
+		<div class="row">
+			<div class="col-8">
+				<div class="mb-3">
+					<label class="form-label">Expiration date</label>
+					<div class="row row-sm">
+						<div class="col">
+							<select class="form-select">
+								{% for month in (1..12) %}
+								<option value="{{ month }}">{{ month }}</option>
+								{% endfor %}
+							</select>
+						</div>
+						<div class="col">
+							<select class="form-select">
+								{% for year in (2020..2030) %}
+								<option value="{{ year }}">{{ year }}</option>
+								{% endfor %}
+							</select>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="col">
+				<div class="mb-3">
+					<div class="form-label">CVV</div>
+					<input type="number" class="form-control">
+				</div>
+			</div>
+		</div>
+
+		<div class="mt-2">
+			{% include ui/button.html text="Pay now" color="primary" block=true  %}
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/pages/_includes/cards/feed-card.html b/pages/_includes/cards/feed-card.html
index 679be5132..9c6d2740b 100644
--- a/pages/_includes/cards/feed-card.html
+++ b/pages/_includes/cards/feed-card.html
@@ -18,7 +18,7 @@
 		{% endif %}
 
 		{% if include.feed %}
-		<div class="row row-xs">
+		<div class="row row-sm">
 			{% if include.feed == 1 %}
 			<div class="col-6 mb-2">
 				<div class="media media-2x1 rounded">
@@ -61,7 +61,7 @@
 				<div class="media media-2x1 mb-2 rounded">
 					<a class="media-content" style="background-image: url({{ site.base }}/static/photos/{{ site.data.photos[7].file }})"></a>
 				</div>
-				<div class="row row-xs">
+				<div class="row row-sm">
 					<div class="col-6">
 						<div class="media rounded">
 							<a class="media-content" style="background-image: url({{ site.base }}/static/photos/{{ site.data.photos[8].file }})"></a>
@@ -109,7 +109,7 @@
 				</div>
 			</div>
 			<div class="col-6">
-				<div class="row row-xs">
+				<div class="row row-sm">
 					<div class="col-6">
 						<div class="media mb-2 rounded">
 							<a class="media-content" style="background-image: url({{ site.base }}/static/photos/{{ site.data.photos[16].file }})"></a>
@@ -140,7 +140,7 @@
 				</div>
 			</div>
 			<div class="col-6">
-				<div class="row row-xs">
+				<div class="row row-sm">
 					<div class="col-6">
 						<div class="media mb-2 rounded">
 							<a class="media-content" style="background-image: url({{ site.base }}/static/photos/{{ site.data.photos[21].file }})"></a>
diff --git a/pages/_includes/cards/timeline.html b/pages/_includes/cards/timeline.html
index 0b7dbc82b..d88e5146e 100644
--- a/pages/_includes/cards/timeline.html
+++ b/pages/_includes/cards/timeline.html
@@ -54,7 +54,7 @@
 					<div class="list-timeline-time">3 days ago</div>
 					<p class="list-timeline-title">+2 New photos</p>
 					<div class="mt-3">
-						<div class="row row-xs">
+						<div class="row row-sm">
 							<div class="col-6">
 								<div class="media media-2x1 rounded">
 									<a class="media-content" style="background-image: url({% include ui/image.html id=6 %})"></a>
diff --git a/pages/_includes/forms/form-elements-5.html b/pages/_includes/forms/form-elements-5.html
index 603b653fd..ddfec5ba2 100644
--- a/pages/_includes/forms/form-elements-5.html
+++ b/pages/_includes/forms/form-elements-5.html
@@ -41,7 +41,7 @@
 
 <div class="mb-3">
    <label class="form-label">Date of birth</label>
-   <div class="row row-xs">
+   <div class="row row-sm">
       <div class="col-5">
          <select name="user[month]" class="form-select">
             <option value="">Month</option>
diff --git a/pages/_includes/parts/form/input-color.html b/pages/_includes/parts/form/input-color.html
index 5eef56a0f..6c608fcf9 100644
--- a/pages/_includes/parts/form/input-color.html
+++ b/pages/_includes/parts/form/input-color.html
@@ -5,7 +5,7 @@
 
 <div class="mb-3">
 	<label class="form-label">Color Input</label>
-	<div class="row row-xs">
+	<div class="row row-sm">
 		{% for color in colors %}
 		<div class="col-auto">
 			<label class="form-colorinput{% if color == 'white' %} form-colorinput-light{% endif %}">
diff --git a/pages/_includes/parts/form/input-icon-separated.html b/pages/_includes/parts/form/input-icon-separated.html
index c8844f533..b1b31502d 100644
--- a/pages/_includes/parts/form/input-icon-separated.html
+++ b/pages/_includes/parts/form/input-icon-separated.html
@@ -1,6 +1,6 @@
 <div class="mb-3">
 	<label class="form-label">Separated inputs</label>
-	<div class="row row-xs">
+	<div class="row row-sm">
 		<div class="col">
 			<input type="text" class="form-control" placeholder="Search for…">
 		</div>
diff --git a/pages/_includes/parts/form/input-image.html b/pages/_includes/parts/form/input-image.html
index 313687909..82b41f40e 100644
--- a/pages/_includes/parts/form/input-image.html
+++ b/pages/_includes/parts/form/input-image.html
@@ -1,7 +1,7 @@
 {% assign limit = include.limit | default: 9 %}
 <div class="mb-3">
 	<label class="form-label">Image Check</label>
-	<div class="row row-xs">
+	<div class="row row-sm">
 		{% assign photos = site.data.photos | where: 'horizontal', true %}
 
 		{% for photo in photos limit: limit %}
diff --git a/pages/_includes/ui/form/input-mask.html b/pages/_includes/ui/form/input-mask.html
index d55cd2f04..9a00a6861 100644
--- a/pages/_includes/ui/form/input-mask.html
+++ b/pages/_includes/ui/form/input-mask.html
@@ -4,16 +4,17 @@
 {% capture_once scripts %}
 <script>
 (function () {
-	const $elem = $('[data-mask]');
-
-	if ($elem) {
-		$elem.each(function () {
-			IMask($(this).get(0), {
-				mask: $(this).attr('data-mask'),
-				lazy: $(this).attr('data-mask-visible') === 'true',
-			});
-		});
-	}
+	/**
+	 * Input mask
+	 */
+	var maskElementList = [].slice.call(document.querySelectorAll('[data-mask]'))
+	maskElementList.map(function (maskEl) {
+		console.log('maskEl', maskEl);
+		return new IMask(maskEl, {
+			mask: maskEl.dataset.mask,
+			lazy: maskEl.dataset['mask-visible'] === 'true'
+		})
+	});
 })();
 </script>
 {% endcapture_once %}
diff --git a/pages/cards.html b/pages/cards.html
index 9b968f3ea..77055b2a3 100644
--- a/pages/cards.html
+++ b/pages/cards.html
@@ -32,6 +32,7 @@ menu: base.cards
             {% include cards/card.html status-bottom="success" title="Card with bottom status" %}
             {% include cards/card.html status-left="primary" title="Card with side status" %}
             {% include cards/card.html class="card-stacked" title="Stacked card" %}
+	         {% include cards/credit-card.html %}
          </div>
          <div class="col-xl-6">
             {% include cards/card.html title="Card title" subtitle="Card subtitle" %}
diff --git a/scss/ui/_grid.scss b/scss/ui/_grid.scss
index 75797b1c7..4bf533924 100644
--- a/scss/ui/_grid.scss
+++ b/scss/ui/_grid.scss
@@ -11,7 +11,7 @@
   }
 }
 
-@each $name, $value in (0: 0, xs: .25rem, sm: .5rem, md: 1.5rem, lg: 3rem) {
+@each $name, $value in (0: 0, sm: .375rem, md: 1.5rem, lg: 3rem) {
   .row-#{$name} {
     margin-right: (-$value);
     margin-left: -($value);