Index: lams_monitoring/web/grouping/chosenGrouping.jsp
===================================================================
diff -u -r535fcc23a61dda850e4657f90169271b2cd1589f -r4cb3aec4c6127df469015fb218cb21bd31a5bc2d
--- lams_monitoring/web/grouping/chosenGrouping.jsp	(.../chosenGrouping.jsp)	(revision 535fcc23a61dda850e4657f90169271b2cd1589f)
+++ lams_monitoring/web/grouping/chosenGrouping.jsp	(.../chosenGrouping.jsp)	(revision 4cb3aec4c6127df469015fb218cb21bd31a5bc2d)
@@ -437,38 +437,36 @@
    		 </tr>
 		<tr>
 			<td width="34%">
-					<select id="groups" name="groups" size="15" onChange="getMembers(this)">
-					</select>
-				<p>
-					<input type="button" class="button" id="groupremove" name="groupremove" value="<fmt:message key="button.grouping.remove.selected.group"/>" onclick="removeGroup()" disabled=true />
-				</p>
+				<select id="groups" name="groups" size="15" onChange="getMembers(this)">
+				</select>
 			</td >
 			<td width="33%">
-					<select  id="nonmembers[]" name="nonmembers[]" size="15" multiple="multiple" onChange="ajustButtonStatus()">
-					</select>
-				<p>
-					<input type="button" class="button"  id="nonmembersadd" name="nonmembersadd" value="<fmt:message key="button.grouping.add.user.to.group"/>" onclick="addMembersToGroup()" disabled=true  />
-				</p>
+				<select  id="nonmembers[]" name="nonmembers[]" size="15" multiple="multiple" onChange="ajustButtonStatus()">
+				</select>
 			</td>
 			<td width="33%">
-					<select  id="members[]" name="members[]" size="15" multiple="multiple" onChange="ajustButtonStatus()">
-					</select>
-        			<p>
-			        <input type="button" class="button" id="membersremove" name="membersremove" value="<fmt:message key="button.grouping.remove.user.from.group"/>" onclick="removeMembersFromGroup()" disabled=true  />
-				</p>
+				<select  id="members[]" name="members[]" size="15" multiple="multiple" onChange="ajustButtonStatus()">
+				</select>
 			</td>
 		</tr>
 		<tr>
-			<td><p>
-	   			<input id="newgroupname" name="newgroupname" type="text" size="25"  />
+			<td width="34%">
+				<input type="button" class="button" id="groupremove" name="groupremove" value="<fmt:message key="button.grouping.remove.selected.group"/>" onclick="removeGroup()" disabled="true"/>
+			</td>
+			<td width="33%">
+				<input type="button" class="button"  id="nonmembersadd" name="nonmembersadd" value="<fmt:message key="button.grouping.add.user.to.group"/>" onclick="addMembersToGroup()" disabled="true"/>
+			</td>
+			<td width="33%">
+				   <input type="button" class="button" id="membersremove" name="membersremove" value="<fmt:message key="button.grouping.remove.user.from.group"/>" onclick="removeMembersFromGroup()" disabled="true"/>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="3">
+				<input type="text" name="newgroupname" id="newgroupname" size="25"  /><br>
 				<input type="button" class="button" id="groupadd" name="groupadd" value="<fmt:message key="button.grouping.add.group"/>" onclick="addGroup()"  />
-				</p>
 			</td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
 		</tr>
 	</table>
-
 	<%@ include file="../template/finishbutton.jsp" %>
 	</form>
 
Index: lams_monitoring/web/template/finishbutton.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r4cb3aec4c6127df469015fb218cb21bd31a5bc2d
--- lams_monitoring/web/template/finishbutton.jsp	(.../finishbutton.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_monitoring/web/template/finishbutton.jsp	(.../finishbutton.jsp)	(revision 4cb3aec4c6127df469015fb218cb21bd31a5bc2d)
@@ -19,4 +19,5 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<div class="right-buttons"><a href="javascript:window.close();" class="button"><fmt:message key="button.finished"/></a></div>
+<p align="right"><a href="javascript:window.close();" class="button"><fmt:message key="button.finished"/></a></p>
+