diff --git a/src/messenger/webim/default.css b/src/messenger/webim/default.css
index c7c8f7c7..1ed25c6a 100644
--- a/src/messenger/webim/default.css
+++ b/src/messenger/webim/default.css
@@ -329,6 +329,13 @@ div.errinfo {
 	background: url(images/subitem.gif) no-repeat 10px 2px;
 }
 
+.fieldinrow {
+	min-width: 300px;
+	display: inline;
+	float:left;
+	width: 45%;
+}
+
 .fvalue {
 	float: left;
 }
diff --git a/src/messenger/webim/view/gen_button.php b/src/messenger/webim/view/gen_button.php
index 3f708535..0fdd94c8 100644
--- a/src/messenger/webim/view/gen_button.php
+++ b/src/messenger/webim/view/gen_button.php
@@ -37,22 +37,23 @@ require_once('inc_errors.php');
 	<div class="mform"><div class="formtop"><div class="formtopi"></div></div><div class="forminner">
 
 	<div class="fieldForm">
-		<div class="field">
+		<div class="fieldinrow">
 			<div class="flabel"><?php echo getlocal("page.gen_button.choose_locale") ?></div>
 			<div class="fvaluenodesc">
 				<select name="lang" onchange="this.form.submit();"><?php foreach($page['availableLocales'] as $k) { echo "<option value=\"".$k."\"".($k == form_value("lang") ? " selected=\"selected\"" : "").">".$k."</option>"; } ?></select>
 			</div>
 		</div>
 
-		<div class="field">
+		<div class="fieldinrow">
 			<div class="flabel"><?php echo getlocal("page.gen_button.choose_image") ?></div>
 			<div class="fvaluenodesc">
 				<select name="i" onchange="this.form.submit();"><?php foreach($page['availableImages'] as $k) { echo "<option value=\"".$k."\"".($k == form_value("image") ? " selected=\"selected\"" : "").">".$k."</option>"; } ?></select>
 			</div>
 		</div>
+		<br clear="all"/>
 
 <?php if($page['showgroups']) { ?>
-		<div class="field">
+		<div class="fieldinrow">
 			<div class="flabel"><?php echo getlocal("page.gen_button.choose_group") ?></div>
 			<div class="fvaluenodesc">
 				<select name="group" onchange="this.form.submit();"><?php foreach($page['groups'] as $k) { echo "<option value=\"".$k['groupid']."\"".($k['groupid'] == form_value("group") ? " selected=\"selected\"" : "").">".$k['vclocalname']."</option>"; } ?></select>
@@ -60,14 +61,15 @@ require_once('inc_errors.php');
 		</div>
 <?php } ?>
 
-		<div class="field">
+		<div class="fieldinrow">
 			<div class="flabel"><?php echo getlocal("page.gen_button.choose_style") ?></div>
 			<div class="fvaluenodesc">
 				<select name="style" onchange="this.form.submit();"><?php foreach($page['availableStyles'] as $k => $v) { echo "<option value=\"".$k."\"".($k == form_value("style") ? " selected=\"selected\"" : "").">".$v."</option>"; } ?></select>
 			</div>
 		</div>
+		<br clear="all"/>
 
-		<div class="field">
+		<div class="fieldinrow">
 			<div class="flabel"><?php echo getlocal("page.gen_button.include_site_name") ?></div>
 			<div class="fvaluenodesc">
 				<input type="checkbox" name="hostname" value="on"<?php echo form_value_cb('hostname') ? " checked=\"checked\"" : "" ?> onchange="this.form.submit();"/>
@@ -76,13 +78,14 @@ require_once('inc_errors.php');
 
 <?php if( $page['formhostname'] ) { ?>
 
-		<div class="field">
+		<div class="fieldinrow">
 			<div class="flabel"><?php echo getlocal("page.gen_button.secure_links") ?></div>
 			<div class="fvaluenodesc">
 				<input type="checkbox" name="secure" value="on"<?php echo form_value_cb('secure') ? " checked=\"checked\"" : "" ?> onchange="this.form.submit();"/>
 			</div>
 		</div>
 <?php } ?>
+		<br clear="all"/>
 
 		<div class="field">
 			<div class="flabel"><?php echo getlocal("page.gen_button.modsecurity") ?></div>