diff --git a/core/install/resources/page_parts/install_select_language.php b/core/install/resources/page_parts/install_select_language.php
index f6802f33bf..1f3715b622 100644
--- a/core/install/resources/page_parts/install_select_language.php
+++ b/core/install/resources/page_parts/install_select_language.php
@@ -39,10 +39,10 @@
 	echo "	".$text['label-select_language']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-		echo "<fieldset style='border:none;padding:0;margin:0;'>";
+		echo "<fieldset class='container'>";
 	foreach($_SESSION['app']['languages'] as $lang_code){
-		echo "<fieldset style='border:none;padding:0;margin:0;width:32%;display:inline-block;margin:1px'>";
-		echo "	<label style='display:block;width:100%;border:solid 1px;padding:2px;-webkit-border-radius: 3px;-moz-border-radius: 3px;border-radius: 3px;box-sizing:border-box;'>";
+		echo "<fieldset class='container'>";
+		echo "	<label class='radio' style='width:200px;'>";
 		echo "<input type='radio' name='install_language' value='$lang_code' id='lang_$lang_code' onchange='JavaScript:disable_next()'";
 		if($lang_code == $_SESSION['domain']['language']['code'])
 		{
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index beefeb7c01..fd0c9da8ad 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -282,7 +282,7 @@ input.btn:hover, input.button:hover, img.list_control_icon:hover, button:hover {
 	cursor: pointer;
 	}
 
-input.txt, textarea.txt, select.txt, .formfld {
+input.txt, textarea.txt, select.txt, .formfld, label.radio {
 	font-family: arial;
 	font-size: 12px;
 	color: #000;
@@ -311,6 +311,16 @@ input.txt:focus, .formfld:focus {
 	box-shadow: 0 0 5px #cddaf0;
 	}
 
+fieldset.container {
+	border:none;
+	padding:0;
+	margin:1px;
+	display:inline-block;
+}
+label.radio
+{
+	display:block;
+}
 /* removes spinners (increment/decrement controls) inside input fields */
 input[type=number] { -moz-appearance: textfield; }
 ::-webkit-inner-spin-button { -webkit-appearance: none; }
@@ -1424,7 +1434,7 @@ if (strlen($_SESSION['message']) > 0) {
 
 	<?php
 	// check for background image
-	if (isset($_SESSION['theme']['background_image_enabled']['boolean']) and $_SESSION['theme']['background_image_enabled']['boolean'] == 'true') {
+	if (isset($_SESSION['theme']['enable_background_images']['boolean']) and $_SESSION['theme']['enable_background_images']['boolean'] == 'true') {
 		// background image is enabled
 		$image_extensions = array('jpg','jpeg','png','gif');