diff --git a/client/src/org/compiere/acct/AcctViewer.java b/client/src/org/compiere/acct/AcctViewer.java
index 7ee176afc0..0fc8995955 100644
--- a/client/src/org/compiere/acct/AcctViewer.java
+++ b/client/src/org/compiere/acct/AcctViewer.java
@@ -16,22 +16,52 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.event.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.sql.Timestamp;
+import java.util.Iterator;
+import java.util.logging.Level;
 
-import org.compiere.apps.*;
-import org.compiere.apps.search.*;
-import org.compiere.grid.ed.*;
-import org.compiere.model.*;
-import org.compiere.report.core.*;
-import org.compiere.swing.*;
-import org.compiere.util.*;
+import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
+import javax.swing.border.TitledBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.compiere.apps.ADialog;
+import org.compiere.apps.AEnv;
+import org.compiere.apps.PrintScreenPainter;
+import org.compiere.apps.search.Info;
+import org.compiere.grid.ed.VDate;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MAcctSchemaElement;
+import org.compiere.model.X_C_AcctSchema_Element;
+import org.compiere.report.core.RModel;
+import org.compiere.report.core.RModelExcelExporter;
+import org.compiere.report.core.ResultTable;
+import org.compiere.swing.CButton;
+import org.compiere.swing.CCheckBox;
+import org.compiere.swing.CComboBox;
+import org.compiere.swing.CFrame;
+import org.compiere.swing.CLabel;
+import org.compiere.swing.CPanel;
+import org.compiere.swing.CScrollPane;
+import org.compiere.swing.CTabbedPane;
+import org.compiere.util.CLogMgt;
+import org.compiere.util.CLogger;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Ini;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Msg;
+import org.compiere.util.ValueNamePair;
 
 /**
  *  Account Viewer