Index: trunk/webapp/static/css/style.css
===================================================================
diff --git a/trunk/webapp/static/css/style.css b/trunk/webapp/static/css/style.css
--- a/trunk/webapp/static/css/style.css	(revision 191)
+++ b/trunk/webapp/static/css/style.css	(revision 192)
@@ -200,17 +200,19 @@
 	margin: 0px 5px;
 	border: 0px solid #1cc !important; }
 
-.divAntenna {
-	width: 220px;
+.divAntenna, .NewDivAntenna, .NewDivTx {
 	float: left;
 	margin: 10px;
 	border: 0px solid #fcc !important; }
 	
+.divAntenna {
+	width: 220px; }
+	
 .NewDivAntenna {
-	width: 290px;
-	float: left;
-	margin: 10px;
-	border: 0px solid #fcc !important; }
+	width: 280px; }
+
+.NewDivTx {
+	width: 210px; }
 
 .titleField {
 	display: block;
@@ -236,69 +238,108 @@
 	font-family: "Ubuntu";
 	font-size: inherit; }
 
+.boxAntenna, .boxTR {
+	border: 2px solid #eee !important;
+	text-align: center;
+	display: block;
+	float: left;
+	margin: 0;
+	padding: 0; }
+
 .boxAntenna {
-	width: 280px;
-	border: 2px solid #eee !important;
-	text-align: center;
-	display: block;
-	float: left;
-	margin: 0;
-	padding: 0; }
-			 
+	width: 250px;
+	padding: 3px 5px; }
+
+.boxTR {
+	width: 200px;
+	padding: 3px 5px; }
+
+.fullLine{
+	font-size: 0.95em; }
+
+.lineInputs, .lineInputsTx {
+	text-align: left;
+	line-height: 1.4em;
+	padding: 0;
+	margin: 0px;
+	display: block;
+	float: left;
+	border: 0px solid #1cc !important; }
+
 .lineInputs {
-	width: 262px;
-	text-align: center;
-	line-height: 18px;
-	padding: 0;
-	height: 20px;
-	margin: 0 auto;
-	display: block;
-	border: 0px solid #1cc !important; }
-
-.lineInputs label {
-	float: left;
-	margin: 0px 2px;
+	width: 240px;
+	border: 0px solid #1cc !important; }
+
+.lineInputsTx {
+	width: 185px;
+	border: 0px solid #1cc !important; }
+
+.divValuesAntenna, .divValuesTx {
+	float: left;
+	display: block;
+	margin: 0 auto;
 	border: 0px solid #bbb !important; }
 
-.divValuesAntenna, .divValuesTR {
-	float: left;
-	display: block;
-	margin: 0 auto;
+.divValuesAntenna {
+	width: 230px;
+	border: 0px solid #2eb !important; }
+	
+.divValuesTx {
+	width: 175px;
 	border: 0px solid #bbb !important; }
 
-.divValuesAntenna {
-	width: 230px; 
-	border: 0px solid #bbb !important; }
-	
-.divValuesTR {
-	width: 180px;
-	border: 0px solid #bbb !important; }
-
-.divValuesAntenna input[type=text], .divValuesTR input[type=text] {
+.divValuesAntenna input[type=text], .divValuesTx input[type=text] {
 	border: 0px;
 	border-bottom: 1px solid #666 !important;
-	line-height: 20px;
-}
+	line-height: 1.1em;
+	font-family: 'Roboto Condensed', sans-serif; }
 
 .divValuesAntenna input[type=text] {
 	width: 18px; }
 
-.divValuesTR input[type=text]{
-	width: 11px;
-}
-
-.lblSign {
-	width: 8px;
-	font-family: 'Roboto Condensed', sans-serif;
-	font-size: 1.1em;
-	color: #666; }
-
-#lblSignLeft, #lblSignRight {
-	margin: 0;
-	line-height: 18px;
-	height: 20px;
-	float: left;
-	padding: 0; }
+.divValuesTx input[type=text]{
+	width: 11px; }
+
+.lblSign, .lblSignTx {
+	font-family: 'Roboto Condensed', sans-serif;
+	color: #666;
+	float: left;
+	margin: 0px;
+	border: 0px solid #bbb !important; }
+
+.lblSignLeft {
+	font-family: 'Roboto Condensed', sans-serif;
+	color: #666;
+	float: left;
+	margin: 0px 2px 0px 0px;
+	padding: 0;
+	border: 0px solid #f00 !important; }
+
+.lblSignRight {
+	font-family: 'Roboto Condensed', sans-serif;
+	color: #666;
+	float: left;
+	margin: 0;
+	padding: 0;
+	border: 0px solid #f00 !important; }
+
+.lblNewSignLeft {
+	font-family: 'Roboto Condensed', sans-serif;
+	color: #666;
+	float: left;
+	margin: 0px 2px 0px 0px;
+	padding: 0;
+	border: 0px solid #f00 !important; }
+
+.lblNewSignRight {
+	font-family: 'Roboto Condensed', sans-serif;
+	color: #666;
+	float: left;
+	margin: 0;
+	padding: 0;
+	border: 0px solid #f00 !important; }
+
+
 
 .divTx {
 	display: block;
Index: trunk/webapp/templates/abscontrol/new.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/new.html b/trunk/webapp/templates/abscontrol/new.html
--- a/trunk/webapp/templates/abscontrol/new.html	(revision 191)
+++ b/trunk/webapp/templates/abscontrol/new.html	(revision 192)
@@ -28,45 +28,65 @@
                     <label for="lblAntenna" class="titleField">Antenna</label>
                     <div class="boxAntenna" id="divtxtAntenna">
                     {% for i in range %}
-                    	<div class="lineInputs">
-                    	{% if i == 0 %}<label for="lblSignLeft" class="lblSign" id="lblSignLeft">[</label>{% endif %}
-                    		<label for="lblSign" class="lblSign">[</label>
-                    		<div class="divValuesAntenna">
-                    		{% for j in range %}
-                    			<input type="text" name="txtUnitAntennaUp" class="txtUnitAntenna" id="txtUnitAntennaUp_{{ i }}_{{ j }}" value="0.5" />
-                    			{% if j != 7 %},{% endif %}
-                    		{% endfor %}
-                    		</div>
-                    		<label for="lblSign" class="lblSign">]</label>
-                    		{% if i == 7 %}<label for="lblSignRight" class="lblSign" id="lblSignRight">]</label>{% endif %}
+                    	<div class="fullLine">
+                    	{% if i == 0 %}
+                    		<label for="lblSignLeft" class="lblSignLeft">[</label>
+                    	{% elif i > 0 and i <= 7 %}
+                    		<label for="lblSignLeft" class="lblSignLeft">&nbsp;</label>
+                    	{% endif %}
+	                    	<div class="lineInputs">
+	                    		<label for="lblSign" class="lblSign">[</label>
+	                    		<div class="divValuesAntenna">
+	                    		{% for j in range %}
+	                    			<input type="text" name="txtUnitAntennaUp" class="txtUnitAntenna" id="txtUnitAntennaUp_{{ i }}_{{ j }}" value="0.5" />
+	                    			{% if j != 7 %},{% endif %}
+	                    		{% endfor %}
+	                    		</div>
+	                    		<label for="lblSign" class="lblSign">]</label>
+	                    	</div>
+                    	{% if i == 7 %}
+                    		<label for="lblSignRight" class="lblSignRight">]</label>
+                    	{% else %}
+                    		<label for="lblSignRight" class="lblSignRight">,</label>
+                    	{% endif %}
                     	</div>
+                    	<div class="cleardivs"></div>
                     {% endfor %}
                     </div>  
                 </div>
-                <div class="NewDivTR">
+                <div class="NewDivTx">
                 	<label for="lblTx" class="titleField">Tx</label>
                 	<div class="boxTR" id="divtxtTR">
                 	{% for i in range %}
-                    	<div class="lineInputsTR">
-                    	{% if i == 0 %}<label for="lblSignLeft" class="lblSign" id="lblSignLeft">[</label>{% endif %}
-                    		<label for="lblSign" class="lblSign">[</label>
-                    		<div class="divValuesTR">
-                    		{% for j in range %}
-                    			<input type="text" name="txtUnitTR" class="txtUnitTR" id="txtUnitTR_{{ i }}_{{ j }}" value="1" />
-                    			{% if j != 7 %},{% endif %}
-                    		{% endfor %}
-                    		</div>
-                    		<label for="lblSign" class="lblSign">]</label>
-                    		{% if i == 7 %}<label for="lblSignRight" class="lblSign" id="lblSignRight">]</label>{% endif %}
+                		<div class="fullLine">
+                    	{% if i == 0 %}
+                    		<label for="lblNewSignLeft" class="lblNewSignLeft">[</label>
+                    	{% elif i > 0 and i <= 7 %}
+                    		<label for="lblNewSignLeft" class="lblNewSignLeft">&nbsp;</label>
+                   		{% endif %}
+	                    	<div class="lineInputsTx">
+	                    		<label for="lblSign" class="lblSignTx">[</label>
+	                    		<div class="divValuesTx">
+	                    		{% for j in range %}
+	                    			<input type="text" name="txtUnitTR" class="txtUnitTR" id="txtUnitTR_{{ i }}_{{ j }}" value="1" />
+	                    			{% if j != 7 %},{% endif %}
+	                    		{% endfor %}
+	                    		</div>
+	                    		<label for="lblSign" class="lblSignTx">]</label>
+	                    	</div>
+                    	{% if i == 7 %}
+                    		<label for="lblNewSignRight" class="lblNewSignRight">]</label>
+                    	{% else %}
+                    		<label for="lblNewSignRight" class="lblNewSignRight">,</label>
+                    	{% endif %}
                     	</div>
+                    	<div class="cleardivs"></div>
                     {% endfor %}
                 	</div>
+                	<div class="cleardivs"></div>
                 </div>
                 <div class="divTx">
-                    <textarea name="txtTxUp" class="txtTR" cols="18" rows="8">{{ txtTxUp }}</textarea>    
-                </div>
-                <div class="divTx">
-                    <label for="lblRx" class="titleField"	>Rx</label>
+                    <label for="lblRx" class="titleField">Rx</label>
                     <textarea name="txtRxUp" class="txtTR" cols="18" rows="8">{{ txtRxUp }}</textarea>    
                 </div>
                 <div class="cleardivs"></div>
@@ -79,6 +99,7 @@
             </fieldset>
             <input type="hidden" name="txtAntennaUp" value="" />
             <input type="hidden" name="txtTxUp" value="" />
+            <input type="hidden" name="txtRxUp" value="" />
         </div>
         
         <div id="antennaDown" class="NewAntenna">