diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/TimerUtil.as b/bigbluebutton-client/src/org/bigbluebutton/core/TimerUtil.as
index f04cfea57ece935b43d57da9f5039f27b2df93a6..0c9c0e7318f32162d4d5601dbf52155f2544f02c 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/core/TimerUtil.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/core/TimerUtil.as
@@ -17,23 +17,23 @@
  *
  */
 package org.bigbluebutton.core {
-	
+
 	import flash.events.TimerEvent;
 	import flash.utils.Dictionary;
 	import flash.utils.Timer;
 	import mx.controls.Label;
 	import org.bigbluebutton.util.i18n.ResourceUtil;
-	
+
 	public final class TimerUtil {
 		public static var timers:Dictionary = new Dictionary(true);
-		
-		public static function setCountDownTimer(label:Label, seconds:int, preLabel:String = ''):void {
+
+		public static function setCountDownTimer(label:Label, seconds:int):void {
 			var timer:Timer = getTimer(label.id, seconds);
 			if (!timer.hasEventListener(TimerEvent.TIMER)) {
 				timer.addEventListener(TimerEvent.TIMER, function():void {
 					var remainingSeconds:int = timer.repeatCount - timer.currentCount;
 					var formattedTime:String = (Math.floor(remainingSeconds / 60)) + ":" + (remainingSeconds % 60 >= 10 ? "" : "0") + (remainingSeconds % 60);
-					label.text = preLabel + ResourceUtil.getInstance().getString('bbb.users.breakout.remainingTime', [formattedTime]);
+					label.text = ResourceUtil.getInstance().getString('bbb.users.breakout.remainingTime', [formattedTime]);
 				});
 				timer.addEventListener(TimerEvent.TIMER_COMPLETE, function():void {
 					label.text = ResourceUtil.getInstance().getString('bbb.users.breakout.remainingTimeEnded');
@@ -44,7 +44,7 @@ package org.bigbluebutton.core {
 			}
 			timer.start();
 		}
-		
+
 		public static function getTimer(name:String, defaultRepeatCount:Number):Timer {
 			if (timers[name] == undefined) {
 				timers[name] = new Timer(1000, defaultRepeatCount);
@@ -52,7 +52,7 @@ package org.bigbluebutton.core {
 			Timer(timers[name]).repeatCount = defaultRepeatCount;
 			return timers[name];
 		}
-		
+
 		public static function stopTimer(name:String):void {
 			if (timers[name] != undefined) {
 				timers[name].stop();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml
index 56eb5aca301c2b52c22d38197d4894d3baacede7..3ef493b98b8b18ae0019faaf0cb181d82aa97b93 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml
@@ -24,7 +24,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				xmlns:s="library://ns.adobe.com/flex/spark" 
 				xmlns:mx="library://ns.adobe.com/flex/mx"
 				xmlns:mate="http://mate.asfusion.com/"
-				width="630" height="600"
+				width="630" height="540"
 				close="onCloseClicked()"
 				creationComplete="creationCompleteHandler(event)"
 				showCloseButton="false">
@@ -138,27 +138,26 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 					 id="textArea" text="{ResourceUtil.getInstance().getString('bbb.users.breakout.breakoutRooms')}"
 					 styleName="breakoutRoomSettingTitleStyle"/>
 		
+		<mx:Canvas width="100%" styleName="breakoutTipBox" backgroundColor="0xcccccc">
+			<mx:Text horizontalCenter="0" text="{ResourceUtil.getInstance().getString('bbb.users.breakout.dragAndDropToolTip')}"/>
+		</mx:Canvas>
+		
 		<mx:HBox id="roomsBox" paddingTop="20" width="100%">
-			<mx:HBox width="50%" horizontalAlign="left">
+			<mx:HBox width="33%" horizontalAlign="left">
 				<mx:Label text="{ResourceUtil.getInstance().getString('bbb.users.breakout.rooms')}" />
 				<mx:ComboBox id="roomsCombo" width="80%" change="{assignUsers()}" dataProvider="{roomsProvider}"/>				
 			</mx:HBox>
-			<mx:HBox width="50%" horizontalAlign="center">
+			<mx:HBox width="33%" horizontalAlign="center">
 				<mx:Label text="{ResourceUtil.getInstance().getString('bbb.users.breakout.timeLimit')}" />
 				<mx:NumericStepper id="durationStepper" value="15" minimum="1" maximum="600"/>
 				<mx:Label text="{ResourceUtil.getInstance().getString('bbb.users.breakout.minutes')}"/>
 			</mx:HBox>
+			<mx:Button paddingLeft="20" width="33%" id="randomAssignBtn"
+					   label="{ResourceUtil.getInstance().getString('bbb.users.breakout.randomAssign')}" click="assignUsers()"/>
 		</mx:HBox>
 		
 		<mx:Tile id="roomsContainer" styleName="roomsContainer" width="100%" height="100%"/>
 			
-		<mx:VBox width="100%" horizontalAlign="center" verticalGap="12">
-			<mx:Button paddingLeft="20" id="randomAssignBtn" label="{ResourceUtil.getInstance().getString('bbb.users.breakout.randomAssign')}" click="assignUsers()"/>
-			<mx:Canvas width="100%" styleName="breakoutTipBox" backgroundColor="0xcccccc">
-				<mx:Text horizontalCenter="0" text="{ResourceUtil.getInstance().getString('bbb.users.breakout.dragAndDropToolTip')}"/>
-			</mx:Canvas>
-		</mx:VBox>
-		
 		<mx:HBox width="100%" horizontalAlign="right" verticalGap="15">
 			<mx:Button id="startButton" label="{ResourceUtil.getInstance().getString('bbb.users.breakout.start')}" click="onStartClicked()"/>
 			<mx:Button label="{ResourceUtil.getInstance().getString('bbb.users.breakout.close')}" click="onCloseClicked()"/>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
index 0d2e3fbdbdcf1d96b12078a44446498ca701a5c4..7f46b54e320edabc2f7cc957535bb87e4cb38db3 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
@@ -312,7 +312,7 @@
 			}
 			
 			private function handleRemainingTimeUpdate(event:BreakoutRoomEvent):void {
-				TimerUtil.setCountDownTimer(breakoutTimeLabel, event.durationInMinutes, ResourceUtil.getInstance().getString('bbb.users.breakout.breakoutRooms'));
+				TimerUtil.setCountDownTimer(breakoutTimeLabel, event.durationInMinutes);
 			}
 
 			private function breakoutRoomsListChangeListener(event:CollectionEvent):void {
@@ -586,7 +586,10 @@
 			 visible="{breakoutRoomsList.length > 0 &amp;&amp; amIModerator}"
 			 includeInLayout="{breakoutRoomsList.length > 0 &amp;&amp; amIModerator}"
 			 width="100%" height="50%">
-		<mx:Label id="breakoutTimeLabel" text="{ResourceUtil.getInstance().getString('bbb.users.breakout.breakoutRooms')}"/>
+		<mx:HBox width="100%">
+			<mx:Label text="{ResourceUtil.getInstance().getString('bbb.users.breakout.breakoutRooms')}"/>
+			<mx:Label width="100%" textAlign="right" id="breakoutTimeLabel"/>
+		</mx:HBox>
 
 		<mx:DataGrid id="roomsGrid" editable="false" sortableColumns="false" dataProvider="{breakoutRoomsList}"
 					 dragEnabled="false" width="100%" height="100%" draggableColumns="false">