Added Action and WindowListener implementation