diff --git a/application/views/system/users.php b/application/views/system/users.php
index c68c58451..701787e57 100644
--- a/application/views/system/users.php
+++ b/application/views/system/users.php
@@ -29,8 +29,10 @@
 				{
 			?>
 				<div>
-					Assign to:<br>
-					<select id="linkToGruppe" name="aufnahmegruppe">
+					Assign to:
+				</div>
+				<div>
+					<select name="aufnahmegruppe">
 						<?php foreach($gruppen as $v): ?>
 							<?php
 								$selected = '';
@@ -44,7 +46,11 @@
 							</option>
 						<?php endforeach; ?>
 					</select>
-					<select id="linkToStufe" name="stufe">
+					&nbsp;&nbsp;&nbsp;
+					<input type="button" id="linkToGruppe" value="Assign to this group">
+				</div>
+				<div>
+					<select name="stufe">
 						<?php foreach($stufen as $v): ?>
 							<?php
 								$selected = '';
@@ -58,6 +64,8 @@
 							</option>
 						<?php endforeach; ?>
 					</select>
+					&nbsp;&nbsp;&nbsp;
+					<input type="button" id="linkToStufe" value="Assign this stufe">
 				</div>
 			<?php
 				}
@@ -178,7 +186,7 @@
 		$(document).ready(function() {
 			if ($("#linkToStufe"))
 			{
-				$("#linkToStufe").change(function() {
+				$("#linkToStufe").click(function() {
 					if ($("#linkUsersForm"))
 					{
 						$("#linkUsersForm").attr("action", "<?php echo $hrefLinkToStufe; ?>");
@@ -189,7 +197,7 @@
 
 			if ($("#linkToGruppe"))
 			{
-				$("#linkToGruppe").change(function() {
+				$("#linkToGruppe").click(function() {
 					if ($("#linkUsersForm"))
 					{
 						$("#linkUsersForm").attr("action", "<?php echo $hrefLinkToAufnahmegruppe; ?>");
diff --git a/application/views/widgets/usersfilters.php b/application/views/widgets/usersfilters.php
index 0a7553f8b..edc85b224 100644
--- a/application/views/widgets/usersfilters.php
+++ b/application/views/widgets/usersfilters.php
@@ -35,7 +35,6 @@
 				</option>
 			<?php endforeach; ?>
 		</select>
-		AND
 		<select id="studiensemester" name="studiensemester">
 			<?php foreach($studiensemester as $v): ?>
 				<?php
@@ -50,7 +49,6 @@
 				</option>
 			<?php endforeach; ?>
 		</select>
-		->
 		<select id="reihungstest" name="reihungstest">
 			<?php foreach($reihungstest as $v): ?>
 				<?php
@@ -66,9 +64,6 @@
 			<?php endforeach; ?>
 		</select>
 	</div>
-	<div>
-		AND
-	</div>
 	<div>
 		<select id="gruppe" name="gruppe">
 			<?php foreach($gruppen as $v): ?>
@@ -84,7 +79,6 @@
 				</option>
 			<?php endforeach; ?>
 		</select>
-		AND
 		<select id="stufe" name="stufe">
 			<?php foreach($stufen as $v): ?>
 				<?php