diff --git a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.js b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.js
index 3d8fd230ee6..5f932fe886f 100644
--- a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.js
+++ b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.js
@@ -9,5 +9,4 @@ function doBootstrapRadio(){
             $("#answer" + name + "othertext").val('').trigger("change");
         }
     });
-    
 }
diff --git a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig
index d98490019cb..3e6197568cc 100644
--- a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig
+++ b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig
@@ -14,8 +14,8 @@
 {% set max_buttons_row = (question_template_attribute.max_buttons_row == 'default' or question_template_attribute.max_buttons_row is empty) ? 'col-sm-2' : question_template_attribute.max_buttons_row %}
 
 <!-- answer_row -->
-<div class="bootstrap-buttons-div col-xs-12 {{ max_buttons_row }}">
-    <div  id="javatbd{{ myfname }}" class="button-item btn btn-primary {{ button_size_class }} {% if checkedState!='' %} active {% endif %} col-xs-12 col-sm-12">
+<div id="javatbd{{ myfname }}" class="bootstrap-buttons-div col-xs-12 {{ max_buttons_row }}">
+    <div class="button-item btn btn-primary {{ button_size_class }} {% if checkedState!='' %} active {% endif %} col-xs-12 col-sm-12">
         <input
             class="bootstrap-radio sr-only"
             type="radio"
diff --git a/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/config.xml b/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/config.xml
index 827ed1d6a00..2686f6ab015 100644
--- a/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/config.xml
+++ b/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Default configuration for the multiplechoice question template.
 -->
@@ -14,7 +14,7 @@
         <authorUrl>http://www.limesurvey.org</authorUrl>
         <copyright>Copyright (C) 2005 - 2018 LimeSurvey Gmbh, Inc. All rights reserved.</copyright>
         <license>GNU General Public License version 2 or later</license>
-        <version>1.0</version>
+        <version>1.1</version>
         <apiVersion>1</apiVersion>
         <description>New implementation of the Bootstrap buttons question theme</description>
     </metadata>
diff --git a/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row.twig b/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row.twig
index 30c2f0ce36d..41c0b2de5f7 100644
--- a/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row.twig
+++ b/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row.twig
@@ -20,8 +20,8 @@
 #}
 
 <!-- answer_row -->
-<div class="bootstrap-buttons-div col-xs-12 {{ max_buttons_row }}">
-    <div id='javatbd{{ myfname }}' class="button-item btn btn-primary {{ button_size_class }} {% if checkedState!='' %} active {% endif %} col-xs-12 col-sm-12">
+<div id='javatbd{{ myfname }}' class="bootstrap-buttons-div col-xs-12 {{ max_buttons_row }}">
+    <div class="button-item btn btn-primary {{ button_size_class }} {% if checkedState!='' %} active {% endif %} col-xs-12 col-sm-12">
         <input
             type="checkbox"
             name="{{ myfname }}"