diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
index 1602482b63..379e9c3d5f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
@@ -33,8 +33,6 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.logging.Level;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.adempiere.util.Callback;
 import org.adempiere.webui.AdempiereIdGenerator;
 import org.adempiere.webui.AdempiereWebUI;
@@ -44,6 +42,7 @@ import org.adempiere.webui.WRequest;
 import org.adempiere.webui.WZoomAcross;
 import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.apps.BusyDialogTemplate;
+import org.adempiere.webui.apps.HelpWindow;
 import org.adempiere.webui.apps.ProcessModalDialog;
 import org.adempiere.webui.apps.form.WCreateFromFactory;
 import org.adempiere.webui.apps.form.WCreateFromWindow;
@@ -72,7 +71,6 @@ import org.adempiere.webui.panel.action.ReportAction;
 import org.adempiere.webui.part.AbstractUIPart;
 import org.adempiere.webui.part.ITabOnSelectHandler;
 import org.adempiere.webui.session.SessionManager;
-import org.adempiere.webui.theme.ThemeManager;
 import org.adempiere.webui.window.CustomizeGridViewDialog;
 import org.adempiere.webui.window.FDialog;
 import org.adempiere.webui.window.FindWindow;
@@ -103,7 +101,6 @@ import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.compiere.util.Util;
-import org.compiere.util.WebDoc;
 import org.zkoss.zk.au.out.AuScript;
 import org.zkoss.zk.ui.AbstractComponent;
 import org.zkoss.zk.ui.Component;
@@ -1585,12 +1582,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
      */
     public void onHelp()
     {
-    	WebDoc doc = gridWindow.getHelpDoc(false);
-    	String html = doc.toString();
-    	HttpServletRequest request = (HttpServletRequest) Executions.getCurrent().getNativeRequest();
-    	String logo = request.getContextPath() + ThemeManager.getThemeResource("images/header-logo.png");
-    	html = html.replace("images/header-logo.png", logo);
-		SessionManager.getAppDesktop().showHTMLContent(html, "Help", true);
+    	SessionManager.getAppDesktop().showWindow(new HelpWindow(gridWindow), "center");
     }
 
     /**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java
index ec71958263..7692e7163d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/FeedbackRequestWindow.java
@@ -136,6 +136,7 @@ public class FeedbackRequestWindow extends Window implements EventListener<Event
 		txtSummary = new Textbox();
 		txtSummary.setRows(10);
 		txtSummary.setWidth("95%");
+		txtSummary.setHeight("100%");
 		
 		confirmPanel = new ConfirmPanel(true);
 		confirmPanel.addActionListener(this);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/HelpWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/HelpWindow.java
new file mode 100644
index 0000000000..fcf03e480e
--- /dev/null
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/HelpWindow.java
@@ -0,0 +1,418 @@
+package org.adempiere.webui.apps;
+
+import org.adempiere.webui.component.Borderlayout;
+import org.adempiere.webui.component.Window;
+import org.apache.ecs.xhtml.a;
+import org.apache.ecs.xhtml.h3;
+import org.apache.ecs.xhtml.h4;
+import org.apache.ecs.xhtml.h5;
+import org.apache.ecs.xhtml.p;
+import org.apache.ecs.xhtml.table;
+import org.apache.ecs.xhtml.td;
+import org.apache.ecs.xhtml.tr;
+import org.compiere.model.GridField;
+import org.compiere.model.GridTab;
+import org.compiere.model.GridWindow;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.WebDoc;
+import org.zkoss.zul.Center;
+import org.zkoss.zul.Html;
+
+public class HelpWindow extends Window {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3474696533193340582L;
+	private GridWindow gridWindow;
+	
+	public HelpWindow(GridWindow gridWindow)
+	{
+		super();
+		
+		this.setTitle(Msg.getMsg(Env.getCtx(), "Help"));
+		this.gridWindow = gridWindow;
+		this.setWidth("99%");
+		this.setHeight("100%");
+		this.setAttribute(Window.MODE_KEY, Window.MODE_EMBEDDED);
+		this.setSclass("help-window");
+						
+		Borderlayout borderlayout = new Borderlayout();
+		this.appendChild(borderlayout);
+		borderlayout.setHflex("1");
+		borderlayout.setVflex("1");
+		
+		Center centerPane = new Center();
+		centerPane.setAutoscroll(true);
+		borderlayout.appendChild(centerPane);
+		
+		Html html = new Html();
+		centerPane.appendChild(html);
+		
+		WebDoc doc = WebDoc.create(true);
+		
+		table table = new table("0", "0", "0", "100%", null);
+		doc.getBody().addElement(table);
+		
+		tr tr = new tr();
+		table.addElement(tr);
+		
+		td td = new td();
+		tr.addElement(td);
+		td.addElement(getHeader());
+		
+		tr = new tr();
+		table.addElement(tr);
+		
+		td = new td();
+		tr.addElement(td);
+		td.addElement(getContent());
+		
+		html.setContent(doc.toString());
+	}
+	
+	private table getHeader()
+	{
+		table table = new table("0", "0", "0", "100%", null);
+		table.setClass("help-window-header");
+		
+		tr tr = new tr();
+		table.addElement(tr);
+		
+		td td = new td();
+		td.setClass("help-window-title");
+		tr.addElement(td);
+		StringBuilder title = new StringBuilder(Msg.getMsg(Env.getCtx(), "Window")).append(": ").append(gridWindow.getName());
+		h3 h3 = new h3(title.toString());
+		td.addElement(h3);
+		
+		tr = new tr();
+		table.addElement(tr);
+		
+		td = new td();
+		tr.addElement(td);
+		td.addElement(WebDoc.NBSP);
+		
+		if (gridWindow.getDescription().length() != 0)
+		{
+			tr = new tr();
+			table.addElement(tr);
+			
+			td = new td();
+			td.setClass("help-window-description");
+			tr.addElement(td);
+			td.addElement(new p().addElement(gridWindow.getDescription()));
+			
+			tr = new tr();
+			table.addElement(tr);
+			
+			td = new td();
+			tr.addElement(td);
+			td.addElement(WebDoc.NBSP);
+		}
+		
+		if (gridWindow.getHelp().length() != 0)
+		{
+			tr = new tr();
+			table.addElement(tr);
+			
+			td = new td();
+			td.setClass("help-window-help");
+			tr.addElement(td);
+			td.addElement(new p().addElement(gridWindow.getHelp()));
+			
+			tr = new tr();
+			table.addElement(tr);
+			
+			td = new td();
+			tr.addElement(td);
+			td.addElement(WebDoc.NBSP);
+		}
+
+		tr = new tr();
+		table.addElement(tr);
+		
+		td = new td();
+		td.setClass("help-window-tabs");
+		tr.addElement(td);
+		td.addElement(new a().setName("Tabs"));
+		h4 h4 = new h4("Tabs");
+		td.addElement(h4);
+		
+		tr = new tr();
+		table.addElement(tr);
+		
+		td = new td();
+		tr.addElement(td);
+		td.addElement(WebDoc.NBSP);
+		
+		return table;
+	}
+	
+	private table getContent()
+	{
+		table table = new table("0", "0", "0", "100%", null);
+		table.setClass("help-window-content");
+		
+		tr tr = new tr();
+		tr.setVAlign("top");
+		table.addElement(tr);
+		
+		td td = new td();
+		td.setWidth("20%");
+		tr.addElement(td);
+		td.addElement(getLeftContent());
+		
+		td = new td();
+		td.setWidth("80%");
+		tr.addElement(td);
+		td.addElement(getRightContent());
+				
+		return table;
+	}
+	
+	private table getLeftContent()
+	{
+		table table = new table("0", "0", "0", "100%", null);
+		table.setClass("help-window-content-l");
+		
+		int size = gridWindow.getTabCount();
+		for (int i = 0; i < size; i++)
+		{
+			tr tr = new tr();
+			table.addElement(tr);
+			
+			td td = new td();
+			tr.addElement(td);			
+
+			GridTab tab = gridWindow.getTab(i);
+			td.addElement(new a("#Tab"+i).addElement(tab.getName()));
+		}
+		
+		return table;
+	}
+	
+	private table getRightContent()
+	{
+		table table = new table("0", "0", "0", "100%", null);
+		table.setClass("help-window-content-r");
+				
+		int size = gridWindow.getTabCount();
+		for (int i = 0; i < size; i++)
+		{
+			GridTab tab = gridWindow.getTab(i);
+
+			// tab
+			tr tr = new tr();
+			table.addElement(tr);
+			
+			td td = new td();
+			tr.addElement(td);
+			td.addElement(getTabBox(tab, i));
+			
+			// fields
+			tr = new tr();
+			table.addElement(tr);
+			
+			td = new td();
+			tr.addElement(td);
+			td.addElement(getFieldsBox(tab, i));
+			
+			for (int j = 0; j < tab.getFieldCount(); j++)
+			{
+				GridField field = tab.getField(j);
+				if (!field.isDisplayed(false)) {
+					continue;
+				}
+				
+				String hdr = field.getHeader();
+				if (hdr != null && hdr.length() > 0)
+				{
+					// field
+					tr = new tr();
+					table.addElement(tr);
+					
+					td = new td();
+					tr.addElement(td);
+					td.addElement(getFieldBox(field, i, j));
+				}
+			}
+		}
+		
+		return table;
+	}
+	
+	private table getTabBox(GridTab tab, int tabIndex)
+	{
+		table table = new table("0", "0", "0", "100%", null);
+		table.setClass("help-window-tab");
+		
+		tr tr = new tr();
+		tr.setClass("help-window-tab-header");
+		table.addElement(tr);
+		
+		td td = new td();
+		td.setClass("help-window-tab-name");
+		td.setWidth("40%");
+		tr.addElement(td);
+		td.addElement(new a().setName("Tab" + tabIndex));
+		h3 h3 = new h3(Msg.getMsg(Env.getCtx(), "Tab") + ": " + tab.getName());
+		td.addElement(h3);
+		td.addElement(WebDoc.NBSP).addElement(WebDoc.NBSP);
+		td.addElement(new a("#Tabs").addElement("..").addAttribute("title", "Up one level"));
+		
+		td = new td();
+		td.setClass("help-window-tab-description");
+		td.setWidth("60%");
+		tr.addElement(td);
+		
+		if (tab.getDescription().length() != 0)
+		{
+			h5 h5 = new h5(tab.getDescription());
+			td.addElement(h5);
+		}
+		
+		if (tab.getHelp().length() != 0)
+		{
+			tr = new tr();
+			tr.setClass("help-window-tab-help");
+			table.addElement(tr);
+			
+			td = new td();
+			td.setColSpan(2);
+			tr.addElement(td);
+			td.addElement(new p().addElement(tab.getHelp()));
+			
+			tr = new tr();
+			table.addElement(tr);
+			
+			td = new td();
+			td.setColSpan(2);
+			tr.addElement(td);
+			td.addElement(WebDoc.NBSP);
+		}
+		
+		return table;
+	}
+	
+	private table getFieldsBox(GridTab tab, int tabIndex)
+	{
+		table table = new table("0", "0", "0", "100%", null);
+		table.setClass("help-window-fields");
+		
+		tr tr = new tr();
+		table.addElement(tr);
+				
+		td td = new td();
+		tr.addElement(td);
+		td.addElement(new a().setName("Fields"+tabIndex));
+		h4 h4 = new h4("Fields");
+		td.addElement(h4);
+		
+		tr = new tr();
+		table.addElement(tr);
+		
+		td = new td();
+		tr.addElement(td);
+		td.addElement(WebDoc.NBSP);
+		
+		tr = new tr();
+		tr.setClass("help-window-fields-link");
+		table.addElement(tr);
+		
+		td = new td();
+		tr.addElement(td);
+		p p = new p();
+		td.addElement(p);
+		
+		if (!tab.isLoadComplete())
+			gridWindow.initTab(tabIndex);
+		for (int j = 0; j < tab.getFieldCount(); j++)
+		{
+			GridField field = tab.getField(j);
+			if (!field.isDisplayed(false)) {
+				continue;
+			}
+			String hdr = field.getHeader();
+			if (hdr != null && hdr.length() > 0)
+			{
+				if (j > 0)
+					p.addElement(WebDoc.NBSP);
+				p.addElement(new a("#Field" + tabIndex + "-" + j, hdr));
+			}
+		}
+		
+		tr = new tr();
+		table.addElement(tr);
+		
+		td = new td();
+		tr.addElement(td);
+		td.addElement(WebDoc.NBSP);
+		
+		return table;
+	}
+	
+	private table getFieldBox(GridField field, int tabIndex, int fieldIndex)
+	{
+		table table = new table("0", "0", "0", "100%", null);
+		table.setClass("help-window-field");
+		
+		tr tr = new tr();
+		tr.setClass("help-window-field-name");
+		table.addElement(tr);
+				
+		td td = new td();
+		tr.addElement(td);
+		td.addElement(new a().setName("Field" + tabIndex + "-" + fieldIndex));
+		h4 h4 = new h4(Msg.getMsg(Env.getCtx(), "Field") + ": " + field.getHeader());
+		td.addElement(h4);
+		td.addElement(WebDoc.NBSP).addElement(WebDoc.NBSP);
+		td.addElement(new a("#Fields"+tabIndex).addElement("..").addAttribute("title", "Up one level"));
+		
+		tr = new tr();
+		table.addElement(tr);
+		
+		td = new td();
+		tr.addElement(td);
+		td.addElement(WebDoc.NBSP);
+				
+		if (field.getDescription().length() != 0)
+		{
+			tr = new tr();
+			tr.setClass("help-window-field-description");
+			table.addElement(tr);
+					
+			td = new td();
+			tr.addElement(td);
+			td.addElement(new p().addElement(field.getDescription()));
+			
+			tr = new tr();
+			table.addElement(tr);
+			
+			td = new td();
+			tr.addElement(td);
+			td.addElement(WebDoc.NBSP);
+		}
+		
+		if (field.getHelp().length() != 0)
+		{
+			tr = new tr();
+			tr.setClass("help-window-field-help");
+			table.addElement(tr);
+					
+			td = new td();
+			tr.addElement(td);
+			td.addElement(new p().addElement(field.getHelp()));
+			
+			tr = new tr();
+			table.addElement(tr);
+			
+			td = new td();
+			tr.addElement(td);
+			td.addElement(WebDoc.NBSP);
+		}
+		
+		return table;
+	}
+}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java
index a5855f3475..90ff3c91b4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java
@@ -400,6 +400,7 @@ public class WArchiveViewer extends Archive implements IFormController, EventLis
 		rows.appendChild(row);
 		row.appendCellChild(descriptionField, 3);
 		descriptionField.setRows(3);
+		descriptionField.setHeight("100%");
 		descriptionField.setHflex("1");
 		
 		row = new Row();
@@ -411,6 +412,7 @@ public class WArchiveViewer extends Archive implements IFormController, EventLis
 		rows.appendChild(row);
 		row.appendCellChild(helpField, 3);
 		helpField.setRows(3);
+		helpField.setHeight("100%");
 		helpField.setHflex("1");
 		
 		row = new Row();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormWindow.java
index b27c55ad71..d75c8be15a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormWindow.java
@@ -13,6 +13,7 @@
  *****************************************************************************/
 package org.adempiere.webui.apps.form;
 
+import org.adempiere.webui.LayoutUtils;
 import org.adempiere.webui.apps.BusyDialog;
 import org.adempiere.webui.component.ConfirmPanel;
 import org.adempiere.webui.component.Panel;
@@ -83,7 +84,8 @@ public class WPaymentFormWindow extends Window implements EventListener<Event>,
 		mainLayout.appendChild(center);
 		mainLayout.setHflex("1");
 		mainLayout.setVflex("min");	
-		center.appendChild(centerPanel = getPanel());	
+		center.appendChild(centerPanel = getPanel());
+		LayoutUtils.addSclass("payment-form-content", centerPanel);
 		centerPanel.setVflex("1");
 		centerPanel.setHflex("1");
 		center.setAutoscroll(true);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSQLProcess.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSQLProcess.java
index 4a6dfd1e91..18a66b452e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSQLProcess.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSQLProcess.java
@@ -42,6 +42,8 @@ import org.compiere.util.Msg;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zul.Borderlayout;
+import org.zkoss.zul.Center;
 
 /**
  * A Custom Form to specify and process SQL statements.
@@ -103,6 +105,8 @@ public class WSQLProcess extends ADForm implements EventListener<Event>
         m_txbSqlField.setMultiline(true);
         m_txbSqlField.setMaxlength(maxStatementLength);
         m_txbSqlField.setRows(noStatementRows);
+        m_txbSqlField.setHeight("100%");
+        m_txbSqlField.setHflex("1");
         m_txbSqlField.setCols(noColumns);
         m_txbSqlField.setReadonly(false);
 
@@ -117,6 +121,8 @@ public class WSQLProcess extends ADForm implements EventListener<Event>
         // create the bottom row of components
         m_txbResultField.setCols(noColumns);
         m_txbResultField.setRows(noResultRows);
+        m_txbResultField.setHeight("100%");
+        m_txbResultField.setHflex("1");
         m_txbResultField.setReadonly(true);
 
         rwBottom.appendCellChild(m_txbResultField, 3);
@@ -127,7 +133,16 @@ public class WSQLProcess extends ADForm implements EventListener<Event>
         // put it all together
         m_grdMain.appendChild(rows);
 
-        this.appendChild(m_grdMain);
+        Borderlayout contentPane = new Borderlayout();
+		this.appendChild(contentPane);
+		contentPane.setWidth("99%");
+		contentPane.setHeight("100%");
+		Center center = new Center();
+		center.setStyle("border: none");
+		contentPane.appendChild(center);
+		m_grdMain.setHflex("true");
+		m_grdMain.setVflex("true");
+		center.appendChild(m_grdMain);
 
         return;
     }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java
index 8b7023c04a..08287cb838 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java
@@ -364,6 +364,8 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 		wfnodeTree.setVflex("1");
 		centerBox.appendChild(centerBoxdown);
 		centerBoxdown.setOrient("horizontal");
+		centerBoxdown.setAlign("center");
+		centerBoxdown.setPack("start");
 		centerBoxdown.appendChild(bExpand);
 		centerBoxdown.appendChild(justmine);
 		centerBoxdown.appendChild(showColors);
@@ -392,6 +394,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 		
 		divNote.appendChild(notesField);
 		notesField.setRows(4);
+		notesField.setHeight("100%");
 		notesField.setWidth("99%");
 
 		MLookup lookup = MLookupFactory.get(Env.getCtx(), form.getWindowNo(),
@@ -400,6 +403,8 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
                 Env.getCtx(), "AD_User_ID"), "", false, false, true);
 
 		westdown.setOrient("horizontal");
+		westdown.setAlign("center");
+		westdown.setPack("center");
 		westdown.appendChild(bZoomLabel);
 		westdown.appendChild(bZoom);
 		westdown.appendChild(userLabel);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTabEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTabEditor.java
index 453290f5a1..76c837cae1 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTabEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTabEditor.java
@@ -511,6 +511,7 @@ public class WTabEditor extends TabEditor implements IFormController, EventListe
 		tabform.setWidth("95%");
 		tabform.setHeight("95%");
 		tabform.appendChild (mainLayout);
+		LayoutUtils.addSclass("tab-editor-form-content", mainLayout);
 		tabform.setBorder("normal");
 
 		confirmPanel.addActionListener(Events.ON_CLICK, this);
@@ -540,8 +541,6 @@ public class WTabEditor extends TabEditor implements IFormController, EventListe
 		westVLayout = new Vlayout();
 		westVLayout.setHeight("100%");
 		westVLayout.appendChild(visible);
-		Separator wsep = new Separator("horizontal");
-		westVLayout.appendChild(wsep);
 		westVLayout.appendChild(invisible);
 
 		createUI();
@@ -552,12 +551,12 @@ public class WTabEditor extends TabEditor implements IFormController, EventListe
 		centerVLayout.setStyle("overflow:auto");
 
 		Center center = new Center();
-		LayoutUtils.addSclass("tab-editor-form-center-panel", east);
+		LayoutUtils.addSclass("tab-editor-form-center-panel", center);
 		mainLayout.appendChild(center);
 		center.appendChild(centerVLayout);
 
 		West west = new West();
-		LayoutUtils.addSclass("tab-editor-form-west-panel", east);
+		LayoutUtils.addSclass("tab-editor-form-west-panel", west);
 		mainLayout.appendChild(west);
 		west.appendChild(westVLayout);
 		west.setCollapsible(true);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
index d6be723efe..64c6494932 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
@@ -187,10 +187,11 @@ public class WWFActivity extends ADForm implements EventListener<Event>
 		row.appendChild(div);
 		row.appendChild(fHelp);
 		fHelp.setMultiline(true);
+		fHelp.setRows(3);
 		fHelp.setWidth("100%");
+		fHelp.setHeight("100%");
 		fHelp.setHflex("true");
 		fHelp.setReadonly(true);
-		fHelp.setRows(3);
 		row.appendChild(new Label());
 
 		row = new Row();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/EventWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/EventWindow.java
index 632bda3bd5..a200a51dda 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/EventWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/EventWindow.java
@@ -81,6 +81,7 @@ public class EventWindow extends Window implements EventListener<Event> {
 		txtContent = new Textbox();
 		txtContent.setRows(5);
 		txtContent.setWidth("95%");
+		txtContent.setHeight("100%");
 		txtContent.setReadonly(true);
 		
 		txtHeaderColor = new Textbox();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
index 22deb99f3b..4a641fea3c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
@@ -135,6 +135,8 @@ public class WStringEditor extends WEditor implements ContextMenuListener
 	        else
 	            getComponent().setMultiline(false);
 	        getComponent().setRows(gridField.getNumLines() <= 0 ? 1 : gridField.getNumLines());
+	        if (getComponent().getRows() > 1)
+	        	getComponent().setHeight("100%");
 
 	        if (getComponent() instanceof Textbox)
 	        	((Textbox)getComponent()).setObscureType(obscureType);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java
index ad4ae3f798..1f9c9c9daa 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java
@@ -66,6 +66,9 @@ public class InfoPAttributeInstancePanel extends Window implements EventListener
 	{
 		super();
 		setTitle(Msg.getMsg(Env.getCtx(), "PAttributeInstance"));
+        setWidth("700px");
+        setHeight("400px");
+		setSclass("popup-dialog");
 		
 		init (M_Warehouse_ID, M_Locator_ID, M_Product_ID, C_BPartner_ID);
 		AEnv.showCenterWindow(parent, this);
@@ -121,9 +124,8 @@ public class InfoPAttributeInstancePanel extends Window implements EventListener
         showAll.setText(Msg.getMsg(Env.getCtx(), "ShowAll"));
         
 		Borderlayout borderlayout = new Borderlayout();
-        borderlayout.setWidth("700px");
-        borderlayout.setHeight("400px");
-        borderlayout.setStyle("border: none; position: relative");
+		borderlayout.setHflex("1");
+		borderlayout.setVflex("1");
         this.appendChild(borderlayout);
         
         North north = new North();
@@ -134,6 +136,7 @@ public class InfoPAttributeInstancePanel extends Window implements EventListener
         north.appendChild(div);
         
         Center center = new Center();
+        center.setSclass("dialog-content");
         center.setAutoscroll(true);
         borderlayout.appendChild(center);
 		center.appendChild(m_table);
@@ -141,6 +144,7 @@ public class InfoPAttributeInstancePanel extends Window implements EventListener
 		m_table.setHflex("1");
 		
 		South south = new South();
+		south.setSclass("dialog-footer");
 		borderlayout.appendChild(south);
 		south.appendChild(confirmPanel);
 		
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java
index b61a929a8d..d815761a8e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java
@@ -92,6 +92,7 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 			log.log(Level.SEVERE, "", ex);
 		}
 		
+		this.setSclass("popup-dialog");
 		AEnv.showCenterWindow(parent, this);
 	}	//	InvoiceHistory
 
@@ -188,7 +189,7 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 		north.appendChild(label);
 		
 		Center center = new Center();
-		center.setStyle("border: none");
+		center.setSclass("dialog-content");
 		center.setAutoscroll(true);
         borderlayout.appendChild(center);
 		center.appendChild(tabbox);
@@ -196,7 +197,7 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 		tabbox.setHflex("1");
 		
 		South south = new South();
-		south.setStyle("border: none");
+		south.setSclass("dialog-footer");
 		borderlayout.appendChild(south);
 		south.appendChild(confirmPanel);
 	}	//	jbInit
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
index 382da4e2b6..2a20ebc134 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
@@ -238,6 +238,8 @@ public class WAttachment extends Window implements EventListener<Event>
 		cbContent.setRows(0);
 		cbContent.addEventListener(Events.ON_SELECT, this);
 
+		toolBar.setAlign("center");
+		toolBar.setPack("start");
 		toolBar.appendChild(bLoad);
 		toolBar.appendChild(bDelete);
 		toolBar.appendChild(bSave);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java
index f6f7ac07ce..2d90bc891c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java
@@ -30,10 +30,16 @@ import org.adempiere.webui.adwindow.AbstractADWindowContent;
 import org.adempiere.webui.adwindow.IADTabbox;
 import org.adempiere.webui.adwindow.IADTabpanel;
 import org.adempiere.webui.component.Checkbox;
+import org.adempiere.webui.component.Column;
+import org.adempiere.webui.component.Columns;
 import org.adempiere.webui.component.ConfirmPanel;
+import org.adempiere.webui.component.Grid;
+import org.adempiere.webui.component.GridFactory;
 import org.adempiere.webui.component.Label;
 import org.adempiere.webui.component.ListItem;
 import org.adempiere.webui.component.Listbox;
+import org.adempiere.webui.component.Row;
+import org.adempiere.webui.component.Rows;
 import org.adempiere.webui.component.Window;
 import org.adempiere.webui.event.DialogEvents;
 import org.adempiere.webui.window.FDialog;
@@ -43,9 +49,8 @@ import org.compiere.util.Msg;
 import org.zkoss.util.media.AMedia;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
-import org.zkoss.zul.Div;
 import org.zkoss.zul.Filedownload;
-import org.zkoss.zul.Hbox;
+import org.zkoss.zul.Space;
 import org.zkoss.zul.Vbox;
 import org.zkoss.zul.Vlayout;
 
@@ -121,24 +126,33 @@ public class ExportAction implements EventListener<Event>
 			vlayout.setSclass("dialog-content");
 			vb.appendChild(vlayout);
 			
-			Hbox hb = new Hbox();
-			hb.setAlign("center");
-			hb.setPack("start");
-			Div div = new Div();
-			div.setStyle("text-align: right;");
-			div.appendChild(new Label(Msg.getMsg(Env.getCtx(), "FilesOfType")));
-			hb.appendChild(div);
-			hb.appendChild(cboType);
-			cboType.setWidth("100%");
-			vlayout.appendChild(hb);
-
-			hb = new Hbox();
-			hb.setAlign("center");
-			hb.setPack("start");
+			Grid grid = GridFactory.newGridLayout();
+			vlayout.appendChild(grid);
+	        
+	        Columns columns = new Columns();
+	        Column column = new Column();
+	        column.setHflex("min");
+	        columns.appendChild(column);
+	        column = new Column();
+	        column.setHflex("1");
+	        columns.appendChild(column);
+	        grid.appendChild(columns);
+	        
+			Rows rows = new Rows();
+			grid.appendChild(rows);
+			
+			Row row = new Row();
+			rows.appendChild(row);
+			row.appendChild(new Label(Msg.getMsg(Env.getCtx(), "FilesOfType")));
+			row.appendChild(cboType);
+			cboType.setHflex("1");
+			
+			row = new Row();
+			rows.appendChild(row);
+			row.appendChild(new Space());
 			chkCurrentRow.setLabel(Msg.getMsg(Env.getCtx(), "ExportCurrentRowOnly"));
 			chkCurrentRow.setSelected(true);
-			hb.appendChild(chkCurrentRow);
-			vlayout.appendChild(hb);
+			row.appendChild(chkCurrentRow);
 
 			LayoutUtils.addSclass("dialog-footer", confirmPanel);
 			vb.appendChild(confirmPanel);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java
index ba2ec4adea..5cb17f349f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java
@@ -33,10 +33,16 @@ import org.adempiere.webui.adwindow.AbstractADWindowContent;
 import org.adempiere.webui.adwindow.IADTabbox;
 import org.adempiere.webui.adwindow.IADTabpanel;
 import org.adempiere.webui.component.Button;
+import org.adempiere.webui.component.Column;
+import org.adempiere.webui.component.Columns;
 import org.adempiere.webui.component.ConfirmPanel;
+import org.adempiere.webui.component.Grid;
+import org.adempiere.webui.component.GridFactory;
 import org.adempiere.webui.component.Label;
 import org.adempiere.webui.component.ListItem;
 import org.adempiere.webui.component.Listbox;
+import org.adempiere.webui.component.Row;
+import org.adempiere.webui.component.Rows;
 import org.adempiere.webui.component.Window;
 import org.adempiere.webui.event.DialogEvents;
 import org.adempiere.webui.util.ReaderInputStream;
@@ -52,9 +58,8 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.event.UploadEvent;
-import org.zkoss.zul.Div;
 import org.zkoss.zul.Filedownload;
-import org.zkoss.zul.Hbox;
+import org.zkoss.zul.Space;
 import org.zkoss.zul.Vbox;
 import org.zkoss.zul.Vlayout;
 
@@ -157,55 +162,54 @@ public class FileImportAction implements EventListener<Event>
 			vlayout.setSclass("dialog-content");
 			vb.appendChild(vlayout);
 			
-			Hbox hb = new Hbox();
-			hb.setAlign("center");
-			hb.setPack("start");
-			Div div = new Div();
-			div.setStyle("text-align: right;");
-			div.appendChild(new Label(Msg.getMsg(Env.getCtx(), "FilesOfType")));
-			hb.appendChild(div);
-			hb.appendChild(cboType);
-			cboType.setWidth("100%");
-			vlayout.appendChild(hb);
-
-			hb = new Hbox();
-			hb.setAlign("center");
-			hb.setPack("start");
-			Div div2 = new Div();
-			div2.setStyle("text-align: right;");
-			div2.appendChild(new Label(Msg.getMsg(Env.getCtx(), "Charset", false)));
-			hb.appendChild(div2);
+			Grid grid = GridFactory.newGridLayout();
+			vlayout.appendChild(grid);
+	        
+	        Columns columns = new Columns();
+	        Column column = new Column();
+	        column.setHflex("min");
+	        columns.appendChild(column);
+	        column = new Column();
+	        column.setHflex("1");
+	        columns.appendChild(column);
+	        grid.appendChild(columns);
+	        
+			Rows rows = new Rows();
+			grid.appendChild(rows);
+			
+			Row row = new Row();
+			rows.appendChild(row);
+			row.appendChild(new Label(Msg.getMsg(Env.getCtx(), "FilesOfType")));
+			row.appendChild(cboType);
+			cboType.setHflex("1");
+			
+			row = new Row();
+			rows.appendChild(row);
+			row.appendChild(new Label(Msg.getMsg(Env.getCtx(), "Charset", false) + ": "));
 			fCharset.setMold("select");
 			fCharset.setRows(0);
 			fCharset.setTooltiptext(Msg.getMsg(Env.getCtx(), "Charset", false));
-			hb.appendChild(fCharset);
-			fCharset.setWidth("100%");
-			vlayout.appendChild(hb);
-			
-			hb = new Hbox();
-			hb.setAlign("center");
-			hb.setPack("start");
-			Div div3 = new Div();
-			div3.setStyle("text-align: right;");
-			div3.appendChild(new Label(Msg.getMsg(Env.getCtx(), "import.mode", true)));
-			hb.appendChild(div3);
+			row.appendChild(fCharset);
+			fCharset.setHflex("1");
+
+			row = new Row();
+			rows.appendChild(row);
+			row.appendChild(new Label(Msg.getMsg(Env.getCtx(), "import.mode", true)));
 			fImportMode.setMold("select");
 			fImportMode.setRows(0);
 			fImportMode.setTooltiptext(Msg.getMsg(Env.getCtx(), "import.mode", false));
-			hb.appendChild(fImportMode);
-			fImportMode.setWidth("100%");
-			vlayout.appendChild(hb);
+			row.appendChild(fImportMode);
+			fImportMode.setHflex("1");
 			
-			hb = new Hbox();
-			hb.setAlign("center");
-			hb.setPack("start");
+			row = new Row();
+			rows.appendChild(row);
+			row.appendChild(new Space());
 			bFile.setLabel(Msg.getMsg(Env.getCtx(), "FileImportFile"));
 			bFile.setTooltiptext(Msg.getMsg(Env.getCtx(), "FileImportFileInfo"));
 			bFile.setUpload(AdempiereWebUI.getUploadSetting());
 			LayoutUtils.addSclass("txt-btn", bFile);
 			bFile.addEventListener(Events.ON_UPLOAD, this);
-			hb.appendChild(bFile);
-			vlayout.appendChild(hb);
+			row.appendChild(bFile);
 
 			LayoutUtils.addSclass("dialog-footer", confirmPanel);
 			vb.appendChild(confirmPanel);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
index 2876f19573..91a93a4dc7 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
@@ -30,10 +30,17 @@ import org.adempiere.webui.LayoutUtils;
 import org.adempiere.webui.adwindow.AbstractADWindowContent;
 import org.adempiere.webui.apps.WProcessCtl;
 import org.adempiere.webui.component.Checkbox;
+import org.adempiere.webui.component.Column;
+import org.adempiere.webui.component.Columns;
 import org.adempiere.webui.component.ConfirmPanel;
+import org.adempiere.webui.component.Grid;
+import org.adempiere.webui.component.GridFactory;
 import org.adempiere.webui.component.Label;
 import org.adempiere.webui.component.ListItem;
 import org.adempiere.webui.component.Listbox;
+import org.adempiere.webui.component.Panel;
+import org.adempiere.webui.component.Row;
+import org.adempiere.webui.component.Rows;
 import org.adempiere.webui.component.Window;
 import org.adempiere.webui.window.FDialog;
 import org.compiere.model.GridTab;
@@ -54,9 +61,8 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.util.Clients;
-import org.zkoss.zul.Div;
 import org.zkoss.zul.Filedownload;
-import org.zkoss.zul.Hbox;
+import org.zkoss.zul.Space;
 import org.zkoss.zul.Tabpanel;
 import org.zkoss.zul.Vbox;
 
@@ -142,33 +148,55 @@ public class ReportAction implements EventListener<Event>
 			winReport.setSclass("toolbar-popup-window");
 			vb.setSclass("toolbar-popup-window-cnt");
 			vb.setAlign("stretch");
-
-			Hbox hb = new Hbox();
-			hb.setAlign("center");
-			hb.setPack("start");
-			Div div = new Div();
-			div.appendChild(new Label(Msg.translate(Env.getCtx(), "AD_PrintFormat_ID")));
-			hb.appendChild(div);
-			hb.appendChild(cboPrintFormat);
-			cboPrintFormat.setWidth("100%");
+			
+			Grid grid = GridFactory.newGridLayout();
+			vb.appendChild(grid);
+	        
+	        Columns columns = new Columns();
+	        Column column = new Column();
+	        column.setHflex("min");
+	        columns.appendChild(column);
+	        column = new Column();
+	        column.setHflex("1");
+	        columns.appendChild(column);
+	        grid.appendChild(columns);
+	        
+	        Rows rows = new Rows();
+			grid.appendChild(rows);
+			
+			Row row = new Row();
+			rows.appendChild(row);
+			row.appendChild(new Label(Msg.translate(Env.getCtx(), "AD_PrintFormat_ID")));
+			row.appendChild(cboPrintFormat);
+			cboPrintFormat.setHflex("1");
 			cboPrintFormat.addEventListener(Events.ON_SELECT, this);
-			vb.appendChild(hb);
+			
+			row = new Row();
+			rows.appendChild(row);
+			row.appendChild(new Space());
+			row.appendChild(chkCurrentRowOnly);
 
-			vb.appendChild(chkCurrentRowOnly);
-
-			if ( isCanExport )
+			if (isCanExport)
 			{
-				hb = new Hbox();
-				hb.setAlign("center");
-				hb.setPack("start");
-				hb.appendChild(chkExport);
+				Panel panel = new Panel();
+				panel.appendChild(chkExport);
+				chkExport.setHflex("min");
+				panel.appendChild(new Space());
 				chkExport.addEventListener(Events.ON_CHECK, this);
-				hb.appendChild(cboExportType);
-				cboExportType.setWidth("100%");
-				vb.appendChild(hb);
+				panel.appendChild(cboExportType);
+				cboExportType.setHflex("1");
+				panel.setHflex("1");
+				
+				row = new Row();
+				rows.appendChild(row);
+				row.appendChild(new Space());
+				row.appendChild(panel);
 			}
 			
-			vb.appendChild(chkAllColumns);
+			row = new Row();
+			rows.appendChild(row);
+			row.appendChild(new Space());
+			row.appendChild(chkAllColumns);
 
 			vb.appendChild(confirmPanel);
 			LayoutUtils.addSclass("dialog-footer", confirmPanel);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
index 3a4e38cfbf..8d4eb06429 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
@@ -268,7 +268,7 @@ public class AboutWindow extends Window implements EventListener<Event> {
 		listHead.setSizable(true);
 		for (Object obj : columnNames) {
 			ListHeader header = new ListHeader(obj.toString());
-			header.setWidth("100px");
+			header.setHflex("1");
 			listHead.appendChild(header);
 		}
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java
index 1e7824bc76..d38dfacba1 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java
@@ -200,7 +200,8 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 		row.appendCellChild(fDescription, 2);
 		fDescription.setMultiline(true);
 		fDescription.setRows(3);
-		fDescription.setStyle("width: 100%");
+		fDescription.setWidth("100%");
+		fDescription.setHeight("100%");
 		rows.appendChild(row);
 		
 		row = new Row();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java
index 368f9768f3..90536fd3c4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java
@@ -143,10 +143,10 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 		//
 		
 		Center center = new Center();
+		center.setSclass("dialog-content");
 		Vlayout content = new Vlayout();
 		content.setHflex("1");
 		content.setVflex("1");
-		content.setSclass("dialog-content");
 		center.appendChild(content);
 		messageTree.setHflex("1");
 		messageTree.setVflex("1");
@@ -156,6 +156,7 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 		//
 		content.appendChild(newText);
 		newText.setRows(3);
+		newText.setHeight("100%");
 		newText.setMultiline(true);		
 		newText.setHflex("1");
 		newText.setVflex("min");
@@ -320,8 +321,9 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 			div.setWidth("100%");
 			Textbox replyTextbox = new Textbox();
 			replyTextbox.setMultiline(true);
-			replyTextbox.setWidth("100%");
 			replyTextbox.setRows(3);
+			replyTextbox.setWidth("100%");
+			replyTextbox.setHeight("100%");
 			div.appendChild(replyTextbox);
 			Button btn = new Button(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Ok")));
 			div.appendChild(btn);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
index b6dcff398d..02595ab132 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
@@ -39,6 +39,7 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.event.UploadEvent;
 import org.zkoss.zul.Borderlayout;
 import org.zkoss.zul.Center;
+import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Image;
 import org.zkoss.zul.North;
 import org.zkoss.zul.Separator;
@@ -127,7 +128,7 @@ public class WImageDialog extends Window implements EventListener<Event>
 		mainLayout.setHflex("1");
 		mainLayout.setVflex("1");
 		
-		fileLabel.setValue(Msg.getMsg(Env.getCtx(), "SelectFile"));
+		fileLabel.setValue(Msg.getMsg(Env.getCtx(), "SelectFile") + ": ");
 		fileButton.setLabel("-");
 		LayoutUtils.addSclass("txt-btn", fileButton);
 		
@@ -135,9 +136,18 @@ public class WImageDialog extends Window implements EventListener<Event>
 		north.setParent(mainLayout);
 		north.appendChild(parameterPanel);
 		
-		parameterPanel.appendChild(fileLabel);
-		parameterPanel.appendChild(new Separator());
-		parameterPanel.appendChild((fileButton));
+		Hbox hbox = new Hbox();
+		hbox.setAlign("center");
+		hbox.setPack("start");
+		hbox.appendChild(fileLabel);
+		hbox.appendChild(fileButton);
+		
+		parameterPanel.setStyle("padding: 5px");
+		parameterPanel.appendChild(hbox);
+		Separator separator = new Separator();
+		separator.setOrient("horizontal");
+		separator.setBar(true);
+		parameterPanel.appendChild(separator);
 		
 		Center center = new Center();
 		center.setSclass("dialog-content");
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
index 59ea1b8f17..0527c39010 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
@@ -16,6 +16,8 @@
  *****************************************************************************/
 package org.adempiere.webui.window;
 
+import static org.compiere.model.SystemIDs.COLUMN_M_MOVEMENTLINE_M_ATTRIBUTESETINSTANCE_ID;
+
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -24,9 +26,12 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.logging.Level;
 
+import org.adempiere.webui.LayoutUtils;
 import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.component.Button;
 import org.adempiere.webui.component.Checkbox;
+import org.adempiere.webui.component.Column;
+import org.adempiere.webui.component.Columns;
 import org.adempiere.webui.component.ConfirmPanel;
 import org.adempiere.webui.component.Datebox;
 import org.adempiere.webui.component.Grid;
@@ -53,7 +58,6 @@ import org.compiere.model.MLotCtl;
 import org.compiere.model.MQuery;
 import org.compiere.model.MRole;
 import org.compiere.model.MSerNoCtl;
-import static org.compiere.model.SystemIDs.*;
 import org.compiere.model.X_M_MovementLine;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
@@ -66,9 +70,9 @@ import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.Borderlayout;
 import org.zkoss.zul.Center;
-import org.zkoss.zul.South;
 import org.zkoss.zul.Menuitem;
 import org.zkoss.zul.Menupopup;
+import org.zkoss.zul.South;
 import org.zkoss.zul.Space;
 import org.zkoss.zul.impl.InputElement;
 
@@ -103,9 +107,11 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 	{
 		super ();
 		this.setTitle(Msg.translate(Env.getCtx(), "M_AttributeSetInstance_ID"));
-		this.setBorder("normal");
 		this.setWidth("500px");
-		this.setHeight("600px");
+		this.setSclass("popup-dialog");
+//		this.setHeight("600px");
+		this.setBorder("normal");
+		this.setShadow(true);
 		this.setSizable(true);
 		
 		if (log.isLoggable(Level.CONFIG)) log.config("M_AttributeSetInstance_ID=" + M_AttributeSetInstance_ID 
@@ -201,16 +207,18 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 	private void init () throws Exception
 	{
 		mainLayout.setParent(this);
-		mainLayout.setWidth("100%");
-		mainLayout.setHeight("100%");
+		mainLayout.setHflex("1");
+		mainLayout.setVflex("min");
 		
 		Center center = new Center();
+		center.setSclass("dialog-content");
 		center.setParent(mainLayout);
-		centerPanel.setHflex("true");
-		centerPanel.setVflex("true");
+		centerPanel.setVflex("1");
+		centerPanel.setHflex("1");
 		center.appendChild(centerPanel);
 
 		South south = new South();
+		south.setSclass("dialog-footer");
 		south.setParent(mainLayout);
 		south.appendChild(confirmPanel);
 		
@@ -226,6 +234,17 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 	 */
 	private boolean initAttributes ()
 	{
+		Columns columns = new Columns();
+		columns.setParent(centerLayout);
+		
+		Column column = new Column();
+		column.setParent(columns);
+		column.setWidth("30%");
+		
+		column = new Column();
+		column.setParent(columns);
+		column.setWidth("70%");
+		
 		Rows rows = new Rows();
 		rows.setParent(centerLayout);
 		
@@ -292,9 +311,11 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			}
 			existingCombo.addActionListener(this);
 			row.appendChild(existingCombo);
+			existingCombo.setHflex("1");
 			
 			row = new Row();
 			row.setParent(rows);
+			LayoutUtils.addSclass("txt-btn", bNewRecord);
 			bNewRecord.addActionListener(this);
 			row.appendChild(bNewRecord);
 			row.appendChild(new Space());
@@ -330,6 +351,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			bSelect.setImage(ThemeManager.getThemeResource("images/PAttribute16.png"));
 			bSelect.addEventListener(Events.ON_CLICK, this);
 			row.appendChild(bSelect);
+			bSelect.setHflex("1");
 			rows.appendChild(row);
 			
 			//	All Attributes
@@ -348,6 +370,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			Label label = new Label (Msg.translate(Env.getCtx(), "Lot"));
 			row.appendChild(label);
 			row.appendChild(fieldLotString);
+			fieldLotString.setHflex("1");
 			fieldLotString.setText (m_masi.getLot());
 			//	M_Lot_ID
 		//	int AD_Column_ID = 9771;	//	M_AttributeSetInstance.M_Lot_ID
@@ -371,6 +394,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			m_row++;
 			row.appendChild(label);
 			row.appendChild(fieldLot);
+			fieldLot.setHflex("1");
 			if (m_masi.getM_Lot_ID() != 0)
 			{
 				for (int i = 1; i < fieldLot.getItemCount(); i++)
@@ -397,6 +421,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 					m_row++;
 					row.appendChild(bLot);
 					bLot.addEventListener(Events.ON_CLICK, this);
+					LayoutUtils.addSclass("txt-btn", bLot);
 				}
 			}
 			//	Popup 
@@ -416,6 +441,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			Label label = new Label (Msg.translate(Env.getCtx(), "SerNo"));
 			row.appendChild(label);
 			row.appendChild(fieldSerNo);
+			fieldSerNo.setHflex("1");
 			fieldSerNo.setText(m_masi.getSerNo());
 			
 			//	New SerNo Button
@@ -429,6 +455,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 					m_row++;
 					row.appendChild(bSerNo);
 					bSerNo.addEventListener(Events.ON_CLICK, this);
+					LayoutUtils.addSclass("txt-btn", bSerNo);
 				}
 			}
 		}	//	SerNo
@@ -487,6 +514,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		row.setParent(rows);
 		row.appendChild(label);
 		row.appendChild(fieldDescription);
+		fieldDescription.setHflex("1");
 		
 		return true;
 	}	//	initAttribute
@@ -528,6 +556,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			else
 				m_editors.add (editor);
 			row.appendChild(editor);
+			editor.setHflex("1");
 			setListAttribute(attribute, editor);
 		}
 		else if (MAttribute.ATTRIBUTEVALUETYPE_Number.equals(attribute.getAttributeValueType()))
@@ -535,6 +564,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			NumberBox editor = new NumberBox(false);
 			setNumberAttribute(attribute, editor);
 			row.appendChild(editor);
+			editor.setHflex("1");
 			if (readOnly)
 				editor.setEnabled(false);
 			else
@@ -545,6 +575,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			Textbox editor = new Textbox();
 			setStringAttribute(attribute, editor);
 			row.appendChild(editor);
+			editor.setHflex("1");
 			if (readOnly)
 				editor.setEnabled(false);
 			else
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
index 48b058eb76..7b50bbfe33 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
@@ -99,6 +99,7 @@ public class WTextEditorDialog extends Window implements EventListener<Event>{
 		textBox = new Textbox(text);
 		textBox.setCols(80);
 		textBox.setRows(30);
+		textBox.setHeight("100%");
 		textBox.setEnabled(editable);
 		textBox.setHflex("1");
 		textBox.setVflex("1");
diff --git a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
index 758f47b232..99d8c6b9a8 100644
--- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
@@ -1634,6 +1634,8 @@ table.z-vbox > tbody > tr > td > table {
 <%-- tab editor --%>
 .tab-editor-form {
 }
+.tab-editor-form-content {
+}
 .tab-editor-form-east-panel {
 }
 .tab-editor-form-center-panel {
@@ -1660,4 +1662,102 @@ table.z-vbox > tbody > tr > td > table {
 .find-window-simple .img-btn, .find-window-simple .img-btn.btn-ok.z-button-os, .find-window-simple .img-btn.btn-cancel.z-button-os,
 .find-window-advanced .img-btn, .find-window-advanced .img-btn.btn-ok.z-button-os, .find-window-advanced .img-btn.btn-cancel.z-button-os {
 	margin: 0 2px;
+}
+
+<%-- payment form --%>
+.payment-form-content {
+}
+
+<%-- help window --%>
+.help-window {
+}
+.help-window-header {
+	padding: 10px 0 10px 20px;
+}
+.help-window-title {
+	color: #FF0000;
+}
+.help-window-description {
+}
+.help-window-help {
+}
+.help-window-tabs {
+	color: #0000CC;
+}
+.help-window-content {
+	border-top: 1px solid #ddd;
+}
+.help-window-content-l {
+}
+.help-window-content-r {
+	border-left: 1px solid #ddd;
+	padding: 5px;
+}
+.help-window-tab {
+	border-bottom: 1px solid #ddd;
+}
+.help-window-tab-header {
+	background-color: #E6E6FA;
+}
+.help-window-tab-name {
+	padding: 3px 15px !important;
+	color: #000066;
+}
+.help-window-tab-description {
+	padding: 3px !important;
+}
+.help-window-tab-help {
+}
+.help-window-fields {
+	border-bottom: 1px solid #ddd;
+	color: #6600CC;
+	padding: 5px 15px;
+}
+.help-window-fields-link {
+}
+.help-window-field {
+	border-bottom: 1px solid #ddd;
+	padding: 5px 15px;
+}
+.help-window-field-name {
+	color: #0000CC;
+}
+.help-window-field-description {
+}
+.help-window-field-help {
+}
+
+.help-window p, .help-window h3, .help-window h4, .help-window h5 {
+	display: inline;
+}
+
+.help-window-content-r a {
+	color: #3465a4 !important;
+	text-decoration: underline;
+}
+
+.help-window-content-r a:hover {
+	text-decoration: none;
+}
+
+.help-window-content-l a {
+	color: #000 !important;
+	text-decoration: none;
+}
+
+.help-window-content-l a:hover {
+	text-decoration: none;
+}
+
+.help-window-content-l td {
+	padding: 8px 20px;
+	border-bottom: 1px solid #ddd;
+}
+
+.help-window-tab td {
+	padding: 5px 15px 0 15px;
+}
+
+.help-window-content-l tr:hover td {
+  background-color: #eee; 
 }
\ No newline at end of file