diff --git a/src/ui/window/JDialogCPUNode.java b/src/ui/window/JDialogCPUNode.java
index 9c76e6c8a9643276d2e6827f6abf91d4457132b5..cca6c7eee67f170843ca9b8721a75898ccd19de7 100755
--- a/src/ui/window/JDialogCPUNode.java
+++ b/src/ui/window/JDialogCPUNode.java
@@ -76,6 +76,9 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
 	protected JTextField sliceTime, nbOfCores, byteDataSize, pipelineSize, goIdleTime, maxConsecutiveIdleCycles, taskSwitchingTime, branchingPredictionPenalty, cacheMiss, clockRatio, execiTime, execcTime;
 	protected JComboBox schedulingPolicy, MECTypeCB, encryption;
 	
+	// Tabbed pane for panel1 and panel2
+	private JTabbedPane tabbedPane;
+	
 	// Main Panel
 	private JButton closeButton;
 	private JButton cancelButton;
@@ -115,6 +118,8 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
 		panel2.setLayout(gridbag2);
 		panel2.setBorder(new javax.swing.border.TitledBorder("CPU attributes"));
 		panel2.setPreferredSize(new Dimension(400, 300));
+
+		tabbedPane = new JTabbedPane();
 		
 		c2.gridwidth = 1;
 		c2.gridheight = 1;
@@ -230,7 +235,7 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
     c4.gridwidth = 1;
     c4.fill = GridBagConstraints.HORIZONTAL;
     c4.anchor = GridBagConstraints.CENTER;*/
-		panel4.add(new JLabel("Encryption"), c4);
+		panel4.add(new JLabel("Encryption:"), c4);
 		c4.gridwidth = GridBagConstraints.REMAINDER;
 		encryption = new JComboBox();
 		encryption.addItem("None");
@@ -250,6 +255,10 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
 		}
 		MECTypeCB.addActionListener(this);
     panel4.add( MECTypeCB, c4);
+
+		tabbedPane.addTab( "Simulation", panel2 );
+		tabbedPane.addTab( "Code generation", panel4 );
+		tabbedPane.setSelectedIndex(0);
         
 		// main panel;
 		c0.gridheight = 10;
@@ -257,8 +266,9 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
 		c0.weightx = 1.0;
 		c0.gridwidth = GridBagConstraints.REMAINDER; //end row
 		c0.fill = GridBagConstraints.BOTH;
-		c.add(panel2, c0);
-		c.add(panel4, c0);
+		/*c.add(panel2, c0);
+		c.add(panel4, c0);*/
+		c.add( tabbedPane, c0 );
 		
 		c0.gridwidth = 1;
 		c0.gridheight = 1;