diff --git a/dist/mailymaily.js b/dist/mailymaily.js
index 3ce41f8..152415b 100644
--- a/dist/mailymaily.js
+++ b/dist/mailymaily.js
@@ -105,7 +105,6 @@ var mailymailyApp = mailymailyApp || {};
      */
 	options.buttonText2 = 'Outlook Web';
 
-
 	/**
      * Text for button 4.
      * @type {String}
@@ -221,7 +220,7 @@ var mailymailyApp = mailymailyApp || {};
      */
 	app.buildModal = function() {
 		var modal = document.createElement('div');
-		var markup = `<div class="mailymaily-modal-content"><div class="mailymaily-modal-head"><div id="mailymaily-modal-title" class="mailymaily-modal-title">${options.title}</div><a id="mailymaily-modal-close" class="mailymaily-modal-close" href="#">&times</a></div><div class="mailymaily-modal-body"><div class="mailymaily-clients"><a id="mailymaily-button-1" class="mailymaily-button" href="#"><div class="mailymaily-button-content"><span id="mailymaily-button-icon-1" class="mailymaily-button-icon">${options.buttonIcon1}<span id="mailymaily-button-text-1" class="mailymaily-button-text">${options.buttonText1}</span></span></div></a><a id="mailymaily-button-2" class="mailymaily-button" href="#"><div class="mailymaily-button-content"><span id="mailymaily-button-icon-2" class="mailymaily-button-icon">${options.buttonIcon2}<span id="mailymaily-button-text-2" class="mailymaily-button-text">${options.buttonText2}</span></span></div></a><a id="mailymaily-button-4" class="mailymaily-button" href="#"><div class="mailymaily-button-content"><span id="mailymaily-button-icon-4" class="mailymaily-button-icon">${options.buttonIcon4}<span id="mailymaily-button-text-4" class="mailymaily-button-text">${options.buttonText4}</span></span></div></a></div><div id="mailymaily-copy" class="mailymaily-copy"><div id="mailymaily-email-address" class="mailymaily-email-address"></div><button id="mailymaily-button-copy" class="mailymaily-button-copy" data-copytargetid="mailymaily-email-address"><span id="mailymaily-button-icon-copy" class="mailymaily-button-icon">${options.buttonIconCopy}<span id="mailymaily-button-text-copy" class="mailymaily-button-text">${options.buttonTextCopy}</span></span></button></div></div></div>`;
+		var markup = `<div class="mailymaily-modal-content"><div class="mailymaily-modal-head"><div id="mailymaily-modal-title" class="mailymaily-modal-title">${options.title}</div><a id="mailymaily-modal-close" class="mailymaily-modal-close" href="#">&times</a></div><div class="mailymaily-modal-body"><div class="mailymaily-clients"><a id="mailymaily-button-1" class="mailymaily-button" href="#"><div class="mailymaily-button-content"><span id="mailymaily-button-icon-1" class="mailymaily-button-icon">${options.buttonIcon1}</span> <span id="mailymaily-button-text-1" class="mailymaily-button-text">${options.buttonText1}</span></div></a><a id="mailymaily-button-2" class="mailymaily-button" href="#"><div class="mailymaily-button-content"><span id="mailymaily-button-icon-2" class="mailymaily-button-icon">${options.buttonIcon2}</span> <span id="mailymaily-button-text-2" class="mailymaily-button-text">${options.buttonText2}</span></div></a><a id="mailymaily-button-4" class="mailymaily-button" href="#"><div class="mailymaily-button-content"><span id="mailymaily-button-icon-4" class="mailymaily-button-icon">${options.buttonIcon4}</span> <span id="mailymaily-button-text-4" class="mailymaily-button-text">${options.buttonText4}</span></div></a></div><div id="mailymaily-copy" class="mailymaily-copy"><div id="mailymaily-email-address" class="mailymaily-email-address"></div><button id="mailymaily-button-copy" class="mailymaily-button-copy" data-copytargetid="mailymaily-email-address"><span id="mailymaily-button-icon-copy" class="mailymaily-button-icon">${options.buttonIconCopy}</span> <span id="mailymaily-button-text-copy" class="mailymaily-button-text">${options.buttonTextCopy}</span></button></div></div></div>`;
 		markup = markup.replace(/mailymaily/g, app.prefix());
 		modal.setAttribute('id', app.prefix('-modal'));
 		modal.setAttribute('class', app.prefix('-modal'));
@@ -284,17 +283,7 @@ var mailymailyApp = mailymailyApp || {};
 		var body = app.getLinkField(link, 'body');
 
 		var gmail = document.getElementById(app.prefix('-button-1'));
-		gmail.href =
-			'https://mail.google.com/mail/?view=cm&fs=1&to=' +
-			email +
-			'&su=' +
-			subject +
-			'&cc=' +
-			cc +
-			'&bcc=' +
-			bcc +
-			'&body=' +
-			body;
+		gmail.href = `https://mail.google.com/mail/?view=cm&fs=1&to=${email}&su=${subject}&cc=${cc}&bcc=${bcc}&body=${body}`;
 
 		var outlook = document.getElementById(app.prefix('-button-2'));
 		outlook.href = `https://outlook.office.com/owa/?path=/mail/action/compose&to=${email}&subject=${subject}&body=${body}`;
diff --git a/src/html/component.html b/src/html/component.html
index a414f67..1327e6d 100644
--- a/src/html/component.html
+++ b/src/html/component.html
@@ -7,19 +7,22 @@
         <div class="mailymaily-clients">
             <a id="mailymaily-button-1" class="mailymaily-button" href="#">
                 <div class="mailymaily-button-content">
-                    <span id="mailymaily-button-icon-1" class="mailymaily-button-icon">${options.buttonIcon1}<span id="mailymaily-button-text-1" class="mailymaily-button-text">${options.buttonText1}</span></span>
+                    <span id="mailymaily-button-icon-1" class="mailymaily-button-icon">${options.buttonIcon1}</span>
+                    <span id="mailymaily-button-text-1" class="mailymaily-button-text">${options.buttonText1}</span>
                 </div>
             </a>
 
             <a id="mailymaily-button-2" class="mailymaily-button" href="#">
                 <div class="mailymaily-button-content">
-                    <span id="mailymaily-button-icon-2" class="mailymaily-button-icon">${options.buttonIcon2}<span id="mailymaily-button-text-2" class="mailymaily-button-text">${options.buttonText2}</span></span>
+                    <span id="mailymaily-button-icon-2" class="mailymaily-button-icon">${options.buttonIcon2}</span>
+                    <span id="mailymaily-button-text-2" class="mailymaily-button-text">${options.buttonText2}</span>
                 </div>
             </a>
 
             <a id="mailymaily-button-4" class="mailymaily-button" href="#">
                 <div class="mailymaily-button-content">
-                    <span id="mailymaily-button-icon-4" class="mailymaily-button-icon">${options.buttonIcon4}<span id="mailymaily-button-text-4" class="mailymaily-button-text">${options.buttonText4}</span></span>
+                    <span id="mailymaily-button-icon-4" class="mailymaily-button-icon">${options.buttonIcon4}</span>
+                    <span id="mailymaily-button-text-4" class="mailymaily-button-text">${options.buttonText4}</span>
                 </div>
             </a>
         </div>
@@ -27,7 +30,8 @@
         <div id="mailymaily-copy" class="mailymaily-copy">
             <div id="mailymaily-email-address" class="mailymaily-email-address"></div>
             <button id="mailymaily-button-copy" class="mailymaily-button-copy" data-copytargetid="mailymaily-email-address">
-                <span id="mailymaily-button-icon-copy" class="mailymaily-button-icon">${options.buttonIconCopy}<span id="mailymaily-button-text-copy" class="mailymaily-button-text">${options.buttonTextCopy}</span></span>
+                <span id="mailymaily-button-icon-copy" class="mailymaily-button-icon">${options.buttonIconCopy}</span>
+                <span id="mailymaily-button-text-copy" class="mailymaily-button-text">${options.buttonTextCopy}</span>
             </button>
         </div>
     </div>