Index: lams_admin/web/css/learningLibraryGroup.scss
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5fad66d149afd3cf16cc5b5817dd605a4bf15157
--- lams_admin/web/css/learningLibraryGroup.scss	(.../learningLibraryGroup.scss)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/css/learningLibraryGroup.scss	(.../learningLibraryGroup.scss)	(revision 5fad66d149afd3cf16cc5b5817dd605a4bf15157)
@@ -8,13 +8,8 @@
 	padding: 3px 5px;
     font-size: small;
     font-weight: bold;
-	border-bottom: $border-thin-dotted;
 }
 
-table#groupsTable {
-	height: 375px;
-}
-
 table#groupsTable td {
 	vertical-align: top;
 }
Index: lams_admin/web/includes/javascript/learningLibraryGroup.js
===================================================================
diff -u -r472fb979e3afdb43a7d537e588c5204554ba9f38 -r5fad66d149afd3cf16cc5b5817dd605a4bf15157
--- lams_admin/web/includes/javascript/learningLibraryGroup.js	(.../learningLibraryGroup.js)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
+++ lams_admin/web/includes/javascript/learningLibraryGroup.js	(.../learningLibraryGroup.js)	(revision 5fad66d149afd3cf16cc5b5817dd605a4bf15157)
@@ -201,8 +201,7 @@
  * Save groups and let parent window that it can close the dialog
  */
 function saveGroups(){
-	var groups = [],
-		result = false;
+	var groups = [];
 	
 	$('#groupsTable .groupContainer').not('#newGroupPlaceholder').each(function(){
 		var learningLibraries = $('div.draggableLearningLibrary', this),
@@ -235,13 +234,11 @@
 			},
 			'type' 	  : 'POST',
 			'success' : function(){
-				result = true;
+				$('#dialogToolGroup', window.parent.document).remove();
 			},
 			'error'	  : function(){
 				alert(LABELS.SAVE_ERROR);
 			}
 		});
 	}
-	
-	return result;
 }
\ No newline at end of file
Index: lams_admin/web/toolcontent/learningLibraryGroup.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r5fad66d149afd3cf16cc5b5817dd605a4bf15157
--- lams_admin/web/toolcontent/learningLibraryGroup.jsp	(.../learningLibraryGroup.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_admin/web/toolcontent/learningLibraryGroup.jsp	(.../learningLibraryGroup.jsp)	(revision 5fad66d149afd3cf16cc5b5817dd605a4bf15157)
@@ -37,6 +37,11 @@
 	
 		<div id="titleDiv">
 			<fmt:message key="tool.groups.dialog.instructions" />
+			<button class="pull-right btn btn-default btn-disable-on-downupload" onClick="javascript:saveGroups()">
+					<i class="fa fa-save"></i>
+				<span><fmt:message key="admin.save" /></span>
+			</button>
+			<div class="clearfix"></div>
 		</div>
 		
 		<table id="groupsTable">
Index: lams_admin/web/toolcontent/toolcontentlist.jsp
===================================================================
diff -u -r37bb2ae017713b44cdfd6a55cfceca28c3efab02 -r5fad66d149afd3cf16cc5b5817dd605a4bf15157
--- lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 37bb2ae017713b44cdfd6a55cfceca28c3efab02)
+++ lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 5fad66d149afd3cf16cc5b5817dd605a4bf15157)
@@ -14,38 +14,23 @@
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript">
-		$(document).ready(function(){
-			$('#toolGroupsDialog').dialog({
-				'autoOpen' : false,
-				'modal'	   : true,
-				'draggable': false,
-				'width'	   : 900,
-				'height'   : 700,
-				'title'	   : '<fmt:message key="tool.groups.dialog.title" />',
-				'open' 	   : function(){
-					$('#toolGroupsFrame', this).attr('src', 'openLearningLibraryGroups.do');
-				},
-				'beforeClose'	   : function(){
-					$('#toolGroupsFrame', this).attr('src', null);
-				}
-			});
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 	
-			$('div.ui-dialog-titlebar').prepend($('.customDialogButton'));
-		});
-	
+	<script type="text/javascript">
 		function openToolGroups(){
-			$('#toolGroupsDialog').dialog('open');
+			showDialog("dialogToolGroup", {
+				'width' : 900,
+				'height': 700,
+				'title'	: '<fmt:message key="tool.groups.dialog.title" />',
+				'open' : function() {
+					// load contents after opening the dialog
+					$('iframe', this).attr('src', 'openLearningLibraryGroups.do');
+				}
+			}, false);
 		}
-		
-		function saveToolGroups(){
-			var result = $('#toolGroupsFrame')[0].contentWindow.saveGroups();
-			if (result) {
-				$('#toolGroupsDialog').dialog('close');
-			}
-		}
 	</script>
-	
+				
 </lams:head>
     
 <body class="stripes">
@@ -67,12 +52,7 @@
 					
 					<a href="javascript:openToolGroups()" class="btn btn-default pull-right" 
 					   title="<fmt:message key='tool.groups.open.button.tooltip' />" ><fmt:message key="tool.groups.open.button" /></a>
-					<div id="toolGroupsDialog" style="display: none">
-						<a class="customDialogButton" href="javascript:saveToolGroups()" style="right: 50px;">
-							<fmt:message key="admin.save" />
-						</a>
-						<iframe id="toolGroupsFrame" style="border: none; width: 100%; height: 100%"></iframe>
-					</div>
+					<div class="clearfix"></div>
 					
 					<p>${fn:length(toolLibrary)}&nbsp;<fmt:message key="sysadmin.library.totals" /></p>
 				</div>