Index: trunk/src/scriptbuilder/gui/panels/OverviewWinSpike.java
===================================================================
--- trunk/src/scriptbuilder/gui/panels/OverviewWinSpike.java	(revision 86)
+++ trunk/src/scriptbuilder/gui/panels/OverviewWinSpike.java	(revision 88)
@@ -2,5 +2,11 @@
 
 import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
 import java.io.File;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.JFrame;
@@ -31,5 +37,7 @@
 
         TimelineTickPanel pnl = new TimelineTickPanel();
-        pnl.setLayout(new BoxLayout(pnl, BoxLayout.PAGE_AXIS));
+        //pnl.setLayout(new BoxLayout(pnl, BoxLayout.PAGE_AXIS));
+        //pnl.setLayout(new FlowLayout());
+        pnl.setLayout(new BorderLayout());
         // Create a script
         File inFile = new File("test/scriptbuilder/structures/test_input_file.xml");
@@ -37,15 +45,44 @@
         script.loadScriptFromFile(inFile);
         ScriptIncident incident = script.incidents.get(2);
+        
         IncidentNumberPanel inciNum = new IncidentNumberPanel();
         inciNum.update(incident);
-        JPanel row1 = new JPanel();
-        row1.setOpaque(false);  // so tick lines will show through
+        // Create yellow border during development for easy visualization
+        inciNum.setBorder(BorderFactory.createLineBorder(Color.yellow)); 
+
+        IncidentNumberPanel inciNum2 = new IncidentNumberPanel();
+        inciNum2.update(script.incidents.get(3));
+        //inciNum2.setSize(100,200);
+        
+        //Box col1 = new Box(BoxLayout.PAGE_AXIS);
+        JPanel col1 = new JPanel(new GridLayout(9,1));
+        col1.setOpaque(false);  // so tick lines will show throughut
+        col1.setAlignmentX(Component.LEFT_ALIGNMENT);
         //row1.setSize(200, 500);
-        row1.add(inciNum);
+        col1.add(inciNum);
+        col1.add(inciNum2);
+        col1.add(Box.createVerticalGlue());
+        
+        Box col2 = new Box(BoxLayout.PAGE_AXIS);
+        col2.setOpaque(false);  // so tick lines will show throughut
+        col2.setAlignmentX(Component.LEFT_ALIGNMENT);
+        
         RangeSlider slider = new RangeSlider(0,25);
         slider.setValue(5);
         slider.setUpperValue(10);
-        row1.add(slider);
-        pnl.add(row1);
+        slider.setAlignmentX(Component.LEFT_ALIGNMENT);
+        RangeSlider slider2 = new RangeSlider(0,25);
+        slider2.setValue(5);
+        slider2.setUpperValue(10);
+        slider2.setAlignmentX(Component.LEFT_ALIGNMENT);
+        
+        col2.add(Box.createVerticalStrut(50));
+        col2.add(slider);
+        col2.add(Box.createVerticalStrut(50));
+        col2.add(slider2);
+
+        pnl.add(col1, BorderLayout.LINE_START);
+        pnl.add(col2, BorderLayout.CENTER);
+        
         // update this panel with the script
         pnl.update(script);
Index: trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java
===================================================================
--- trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java	(revision 79)
+++ trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java	(revision 88)
@@ -7,4 +7,6 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
 import java.io.File;
@@ -12,5 +14,8 @@
 import java.util.Map;
 import javax.swing.JFrame;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
 import javax.swing.event.MouseInputAdapter;
 import scriptbuilder.gui.IncidentEditorFrame;
@@ -95,4 +100,50 @@
         }
 
+    /*
+    *   Popup menu for incident actions
+     */
+    private JPopupMenu createPopup()
+    {
+        JPopupMenu menu = new JPopupMenu();
+        JMenuItem eventsMenuItem = new JMenuItem("Events");
+        JMenuItem propsMenuItem = new JMenuItem("Properties");
+        JMenuItem deleteMenuItem = new JMenuItem("Delete");
+        eventsMenuItem.setActionCommand("Edit Events");
+        propsMenuItem.setActionCommand("Modify Incident Properties");
+        deleteMenuItem.setActionCommand("Delete Incident");
+
+        PopupMenuItemListener menuItemListener = new PopupMenuItemListener();
+
+        eventsMenuItem.addActionListener(menuItemListener);
+        propsMenuItem.addActionListener(menuItemListener);
+        deleteMenuItem.addActionListener(menuItemListener);
+
+        menu.add(eventsMenuItem);
+        menu.add(propsMenuItem);
+        menu.add(deleteMenuItem);
+        return menu;
+    }
+
+    class PopupMenuItemListener implements ActionListener
+    {
+
+        public void actionPerformed(ActionEvent e)
+        {
+            JOptionPane.showMessageDialog(null, e.getActionCommand() + " will be handled here.");
+        }
+    }
+        @Override
+        public void mousePressed(MouseEvent e)
+        {
+            int currentMouseX = e.getX();
+            int currentMouseY = e.getY();
+
+            // Does user want a popup menu?
+            if (e.isPopupTrigger())
+            {
+                JPopupMenu popup = createPopup();
+                popup.show(e.getComponent(), currentMouseX, currentMouseY);
+            }            
+        }
         /**
          * Determine if the mouse click happened within a valid timeSlice on
@@ -118,5 +169,5 @@
             x = cursorTime = e.getX();
             y = e.getY();
-
+            
             if (e.getX() % ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK
                     > ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK / 2)