diff --git a/bbb-api-demo/src/main/webapp/demo_header.jsp b/bbb-api-demo/src/main/webapp/demo_header.jsp
index feae7ec9eeb81af5ae149c4f99d84d0cf59f9a2c..85e08d4290d7d72fb3d5d7bb69cd0cd43e454ece 100755
--- a/bbb-api-demo/src/main/webapp/demo_header.jsp
+++ b/bbb-api-demo/src/main/webapp/demo_header.jsp
@@ -11,7 +11,7 @@
 
 <a href="create.jsp">Create</a> &nbsp;&nbsp;&nbsp;
 
-<a href="demo4.jsp">Activity Monitor</a> 
+<a href="demo4.jsp">Activity Monitor</a> &nbsp;&nbsp;&nbsp;
 
 <a href="demo_mozilla_persona.jsp">Login with Persona</a> 
  
diff --git a/bigbluebutton-client/build.xml b/bigbluebutton-client/build.xml
index d27038ccb04abdc18a7706d3ff72766ca4dd0b50..bc55c552639d23bbbdc89e378c68ed3193729368 100755
--- a/bigbluebutton-client/build.xml
+++ b/bigbluebutton-client/build.xml
@@ -382,6 +382,7 @@
 		<copy file="${PROD_RESOURCES_DIR}/locales.xml" todir="${OUTPUT_DIR}/conf" overwrite="true"/>	
 		<copy file="${PROD_RESOURCES_DIR}/expressInstall.swf" todir="${OUTPUT_DIR}" overwrite="true"/>	
 		<copy file="${PROD_RESOURCES_DIR}/example-info-data.xml" todir="${OUTPUT_DIR}/conf" overwrite="true"/>
+		<copy file="${BASE_DIR}/src/conf/layout.xml" todir="${OUTPUT_DIR}/conf" overwrite="true"/>
 		<if>
 			<equals arg1="${BUILD_ENV}" arg2="DEV"/>
 			<then>
@@ -389,8 +390,8 @@
 				<copy file="${BASE_DIR}/src/conf/config.xml" todir="${OUTPUT_DIR}/conf" /> 
 				<echo message="Copying join-mock.xml for development environment"/>
 				<copy file="${BASE_DIR}/src/conf/join-mock.xml" todir="${OUTPUT_DIR}/conf" /> 
-				<echo message="Copying layout.xml for development environment"/>
-				<copy file="${BASE_DIR}/src/conf/layout.xml" todir="${OUTPUT_DIR}/conf" /> 
+				<!-- echo message="Copying layout.xml for development environment"/>
+				<copy file="${BASE_DIR}/src/conf/layout.xml" todir="${OUTPUT_DIR}/conf" /--> 
 			</then>
 			<else>
 				<echo message="Need to copy config.xml.template for production environment"/>