diff --git a/BAKKA-Editor/MainForm.Designer.cs b/BAKKA-Editor/MainForm.Designer.cs
index 91b4733..df6208a 100644
--- a/BAKKA-Editor/MainForm.Designer.cs
+++ b/BAKKA-Editor/MainForm.Designer.cs
@@ -28,1451 +28,1434 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
+            components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
-            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
-            this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
-            this.circlePanel = new System.Windows.Forms.Panel();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.beat2Numeric = new System.Windows.Forms.NumericUpDown();
-            this.beat1Numeric = new System.Windows.Forms.NumericUpDown();
-            this.measureNumeric = new System.Windows.Forms.NumericUpDown();
-            this.label3 = new System.Windows.Forms.Label();
-            this.sizeTrackBar = new System.Windows.Forms.TrackBar();
-            this.sizeNumeric = new System.Windows.Forms.NumericUpDown();
-            this.label2 = new System.Windows.Forms.Label();
-            this.positionTrackBar = new System.Windows.Forms.TrackBar();
-            this.positionNumeric = new System.Windows.Forms.NumericUpDown();
-            this.label1 = new System.Windows.Forms.Label();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.flairRadio = new System.Windows.Forms.RadioButton();
-            this.bonusRadio = new System.Windows.Forms.RadioButton();
-            this.noBonusRadio = new System.Windows.Forms.RadioButton();
-            this.endHoldCheck = new System.Windows.Forms.CheckBox();
-            this.endChartButton = new System.Windows.Forms.Button();
-            this.holdButton = new System.Windows.Forms.Button();
-            this.chainButton = new System.Windows.Forms.Button();
-            this.blueButton = new System.Windows.Forms.Button();
-            this.redButton = new System.Windows.Forms.Button();
-            this.greenButton = new System.Windows.Forms.Button();
-            this.orangeButton = new System.Windows.Forms.Button();
-            this.tapButton = new System.Windows.Forms.Button();
-            this.gimmickTypeGroupBox = new System.Windows.Forms.GroupBox();
-            this.removeMaskRadio = new System.Windows.Forms.RadioButton();
-            this.reverseButton = new System.Windows.Forms.Button();
-            this.addMaskRadio = new System.Windows.Forms.RadioButton();
-            this.stopButton = new System.Windows.Forms.Button();
-            this.hiSpeedButton = new System.Windows.Forms.Button();
-            this.timeSigButton = new System.Windows.Forms.Button();
-            this.bpmChangeButton = new System.Windows.Forms.Button();
-            this.maskButton = new System.Windows.Forms.Button();
-            this.groupBox4 = new System.Windows.Forms.GroupBox();
-            this.centerMaskRadio = new System.Windows.Forms.RadioButton();
-            this.clockwiseMaskRadio = new System.Windows.Forms.RadioButton();
-            this.cClockwiseMaskRadio = new System.Windows.Forms.RadioButton();
-            this.groupBox5 = new System.Windows.Forms.GroupBox();
-            this.currentSelectionLabel = new System.Windows.Forms.Label();
-            this.playbackGroupBox = new System.Windows.Forms.GroupBox();
-            this.songFileLabel = new System.Windows.Forms.Label();
-            this.labelSpeed = new System.Windows.Forms.Label();
-            this.trackBarSpeed = new System.Windows.Forms.TrackBar();
-            this.trackBarVolume = new System.Windows.Forms.TrackBar();
-            this.labelVolume = new System.Windows.Forms.Label();
-            this.label20 = new System.Windows.Forms.Label();
-            this.songTrackBar = new System.Windows.Forms.TrackBar();
-            this.selectSongButton = new System.Windows.Forms.Button();
-            this.playButton = new System.Windows.Forms.Button();
-            this.openSongDialog = new System.Windows.Forms.OpenFileDialog();
-            this.updateTimer = new System.Windows.Forms.Timer(this.components);
-            this.groupBox9 = new System.Windows.Forms.GroupBox();
-            this.label21 = new System.Windows.Forms.Label();
-            this.visualHispeedNumeric = new System.Windows.Forms.NumericUpDown();
-            this.insertButton = new System.Windows.Forms.Button();
-            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.showCursorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.showCursorDuringPlaybackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.highlightViewedNoteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.selectLastInsertedNoteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.showGimmicksInCircleViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.showGimmicksDuringPlaybackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.chartToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.initialChartSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.menuStrip = new System.Windows.Forms.MenuStrip();
-            this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.groupBox6 = new System.Windows.Forms.GroupBox();
-            this.gimmickJumpToCurrTimeButton = new System.Windows.Forms.Button();
-            this.gimmickDeleteButton = new System.Windows.Forms.Button();
-            this.gimmickEditButton = new System.Windows.Forms.Button();
-            this.gimmickBeatLabel = new System.Windows.Forms.Label();
-            this.gimmickValueLabel = new System.Windows.Forms.Label();
-            this.gimmickTypeLabel = new System.Windows.Forms.Label();
-            this.gimmickMeasureLabel = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.gimmickNextButton = new System.Windows.Forms.Button();
-            this.gimmickPrevButton = new System.Windows.Forms.Button();
-            this.noteViewGroupBox = new System.Windows.Forms.GroupBox();
-            this.noteMaskLabel = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
-            this.noteSizeLabel = new System.Windows.Forms.Label();
-            this.label17 = new System.Windows.Forms.Label();
-            this.noteJumpToCurrTimeButton = new System.Windows.Forms.Button();
-            this.noteDeleteSelectedButton = new System.Windows.Forms.Button();
-            this.noteEditSelectedButton = new System.Windows.Forms.Button();
-            this.noteBeatLabel = new System.Windows.Forms.Label();
-            this.notePositionLabel = new System.Windows.Forms.Label();
-            this.noteTypeLabel = new System.Windows.Forms.Label();
-            this.noteMeasureLabel = new System.Windows.Forms.Label();
-            this.label13 = new System.Windows.Forms.Label();
-            this.label14 = new System.Windows.Forms.Label();
-            this.label15 = new System.Windows.Forms.Label();
-            this.label16 = new System.Windows.Forms.Label();
-            this.noteNextButton = new System.Windows.Forms.Button();
-            this.notePrevButton = new System.Windows.Forms.Button();
-            this.autoSaveTimer = new System.Windows.Forms.Timer(this.components);
-            this.groupBox1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.beat2Numeric)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.beat1Numeric)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.measureNumeric)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.sizeTrackBar)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.sizeNumeric)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.positionTrackBar)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.positionNumeric)).BeginInit();
-            this.groupBox2.SuspendLayout();
-            this.gimmickTypeGroupBox.SuspendLayout();
-            this.groupBox4.SuspendLayout();
-            this.groupBox5.SuspendLayout();
-            this.playbackGroupBox.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.trackBarSpeed)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.trackBarVolume)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.songTrackBar)).BeginInit();
-            this.groupBox9.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.visualHispeedNumeric)).BeginInit();
-            this.menuStrip.SuspendLayout();
-            this.groupBox6.SuspendLayout();
-            this.noteViewGroupBox.SuspendLayout();
-            this.SuspendLayout();
+            openFileDialog = new OpenFileDialog();
+            saveFileDialog = new SaveFileDialog();
+            circlePanel = new Panel();
+            groupBox1 = new GroupBox();
+            label4 = new Label();
+            beat2Numeric = new NumericUpDown();
+            beat1Numeric = new NumericUpDown();
+            measureNumeric = new NumericUpDown();
+            label3 = new Label();
+            sizeTrackBar = new TrackBar();
+            sizeNumeric = new NumericUpDown();
+            label2 = new Label();
+            positionTrackBar = new TrackBar();
+            positionNumeric = new NumericUpDown();
+            label1 = new Label();
+            groupBox2 = new GroupBox();
+            flairRadio = new RadioButton();
+            bonusRadio = new RadioButton();
+            noBonusRadio = new RadioButton();
+            endHoldCheck = new CheckBox();
+            endChartButton = new Button();
+            holdButton = new Button();
+            chainButton = new Button();
+            blueButton = new Button();
+            redButton = new Button();
+            greenButton = new Button();
+            orangeButton = new Button();
+            tapButton = new Button();
+            gimmickTypeGroupBox = new GroupBox();
+            removeMaskRadio = new RadioButton();
+            reverseButton = new Button();
+            addMaskRadio = new RadioButton();
+            stopButton = new Button();
+            hiSpeedButton = new Button();
+            timeSigButton = new Button();
+            bpmChangeButton = new Button();
+            maskButton = new Button();
+            groupBox4 = new GroupBox();
+            centerMaskRadio = new RadioButton();
+            clockwiseMaskRadio = new RadioButton();
+            cClockwiseMaskRadio = new RadioButton();
+            groupBox5 = new GroupBox();
+            currentSelectionLabel = new Label();
+            playbackGroupBox = new GroupBox();
+            songFileLabel = new Label();
+            labelSpeed = new Label();
+            trackBarSpeed = new TrackBar();
+            trackBarVolume = new TrackBar();
+            labelVolume = new Label();
+            label20 = new Label();
+            songTrackBar = new TrackBar();
+            selectSongButton = new Button();
+            playButton = new Button();
+            openSongDialog = new OpenFileDialog();
+            updateTimer = new System.Windows.Forms.Timer(components);
+            groupBox9 = new GroupBox();
+            label21 = new Label();
+            visualHispeedNumeric = new NumericUpDown();
+            insertButton = new Button();
+            fileToolStripMenuItem = new ToolStripMenuItem();
+            newToolStripMenuItem = new ToolStripMenuItem();
+            openToolStripMenuItem = new ToolStripMenuItem();
+            saveToolStripMenuItem = new ToolStripMenuItem();
+            saveAsToolStripMenuItem = new ToolStripMenuItem();
+            exitToolStripMenuItem = new ToolStripMenuItem();
+            viewToolStripMenuItem = new ToolStripMenuItem();
+            showCursorToolStripMenuItem = new ToolStripMenuItem();
+            showCursorDuringPlaybackToolStripMenuItem = new ToolStripMenuItem();
+            highlightViewedNoteToolStripMenuItem = new ToolStripMenuItem();
+            selectLastInsertedNoteToolStripMenuItem = new ToolStripMenuItem();
+            showGimmicksInCircleViewToolStripMenuItem = new ToolStripMenuItem();
+            showGimmicksDuringPlaybackToolStripMenuItem = new ToolStripMenuItem();
+            chartToolStripMenuItem = new ToolStripMenuItem();
+            initialChartSettingsToolStripMenuItem = new ToolStripMenuItem();
+            aboutToolStripMenuItem = new ToolStripMenuItem();
+            menuStrip = new MenuStrip();
+            editToolStripMenuItem = new ToolStripMenuItem();
+            undoToolStripMenuItem = new ToolStripMenuItem();
+            redoToolStripMenuItem = new ToolStripMenuItem();
+            groupBox6 = new GroupBox();
+            gimmickJumpToCurrTimeButton = new Button();
+            gimmickDeleteButton = new Button();
+            gimmickEditButton = new Button();
+            gimmickBeatLabel = new Label();
+            gimmickValueLabel = new Label();
+            gimmickTypeLabel = new Label();
+            gimmickMeasureLabel = new Label();
+            label8 = new Label();
+            label7 = new Label();
+            label6 = new Label();
+            label5 = new Label();
+            gimmickNextButton = new Button();
+            gimmickPrevButton = new Button();
+            noteViewGroupBox = new GroupBox();
+            noteMaskLabel = new Label();
+            label9 = new Label();
+            noteSizeLabel = new Label();
+            label17 = new Label();
+            noteJumpToCurrTimeButton = new Button();
+            noteDeleteSelectedButton = new Button();
+            noteEditSelectedButton = new Button();
+            noteBeatLabel = new Label();
+            notePositionLabel = new Label();
+            noteTypeLabel = new Label();
+            noteMeasureLabel = new Label();
+            label13 = new Label();
+            label14 = new Label();
+            label15 = new Label();
+            label16 = new Label();
+            noteNextButton = new Button();
+            notePrevButton = new Button();
+            autoSaveTimer = new System.Windows.Forms.Timer(components);
+            groupBox3 = new GroupBox();
+            notesOnBeat = new ListView();
+            Type = new ColumnHeader();
+            Position = new ColumnHeader();
+            Size = new ColumnHeader();
+            toolStripSeparator1 = new ToolStripSeparator();
+            dragPlaceNoteToolStripMenuItem = new ToolStripMenuItem();
+            groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)beat2Numeric).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)beat1Numeric).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)measureNumeric).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)sizeTrackBar).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)sizeNumeric).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)positionTrackBar).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)positionNumeric).BeginInit();
+            groupBox2.SuspendLayout();
+            gimmickTypeGroupBox.SuspendLayout();
+            groupBox4.SuspendLayout();
+            groupBox5.SuspendLayout();
+            playbackGroupBox.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)trackBarSpeed).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)trackBarVolume).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)songTrackBar).BeginInit();
+            groupBox9.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)visualHispeedNumeric).BeginInit();
+            menuStrip.SuspendLayout();
+            groupBox6.SuspendLayout();
+            noteViewGroupBox.SuspendLayout();
+            groupBox3.SuspendLayout();
+            SuspendLayout();
             // 
             // openFileDialog
             // 
-            this.openFileDialog.Filter = "MER files|*.mer";
-            this.openFileDialog.Title = "Select chart file to open";
+            openFileDialog.Filter = "MER files|*.mer";
+            openFileDialog.Title = "Select chart file to open";
             // 
             // saveFileDialog
             // 
-            this.saveFileDialog.DefaultExt = "*.mer";
-            this.saveFileDialog.Filter = "MER files|*.mer";
+            saveFileDialog.DefaultExt = "*.mer";
+            saveFileDialog.Filter = "MER files|*.mer";
             // 
             // circlePanel
             // 
-            this.circlePanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.circlePanel.Location = new System.Drawing.Point(257, 40);
-            this.circlePanel.Name = "circlePanel";
-            this.circlePanel.Size = new System.Drawing.Size(611, 524);
-            this.circlePanel.TabIndex = 2;
-            this.circlePanel.Paint += new System.Windows.Forms.PaintEventHandler(this.circlePanel_Paint);
-            this.circlePanel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.circlePanel_MouseDown);
-            this.circlePanel.MouseMove += new System.Windows.Forms.MouseEventHandler(this.circlePanel_MouseMove);
-            this.circlePanel.MouseUp += new System.Windows.Forms.MouseEventHandler(this.circlePanel_MouseUp);
+            circlePanel.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left;
+            circlePanel.Location = new Point(257, 40);
+            circlePanel.Name = "circlePanel";
+            circlePanel.Size = new Size(611, 524);
+            circlePanel.TabIndex = 2;
+            circlePanel.Paint += circlePanel_Paint;
+            circlePanel.MouseDown += circlePanel_MouseDown;
+            circlePanel.MouseMove += circlePanel_MouseMove;
+            circlePanel.MouseUp += circlePanel_MouseUp;
             // 
             // groupBox1
             // 
-            this.groupBox1.Controls.Add(this.label4);
-            this.groupBox1.Controls.Add(this.beat2Numeric);
-            this.groupBox1.Controls.Add(this.beat1Numeric);
-            this.groupBox1.Controls.Add(this.measureNumeric);
-            this.groupBox1.Controls.Add(this.label3);
-            this.groupBox1.Controls.Add(this.sizeTrackBar);
-            this.groupBox1.Controls.Add(this.sizeNumeric);
-            this.groupBox1.Controls.Add(this.label2);
-            this.groupBox1.Controls.Add(this.positionTrackBar);
-            this.groupBox1.Controls.Add(this.positionNumeric);
-            this.groupBox1.Controls.Add(this.label1);
-            this.groupBox1.Location = new System.Drawing.Point(12, 446);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(239, 160);
-            this.groupBox1.TabIndex = 3;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "Current Note Settings";
+            groupBox1.Controls.Add(label4);
+            groupBox1.Controls.Add(beat2Numeric);
+            groupBox1.Controls.Add(beat1Numeric);
+            groupBox1.Controls.Add(measureNumeric);
+            groupBox1.Controls.Add(label3);
+            groupBox1.Controls.Add(sizeTrackBar);
+            groupBox1.Controls.Add(sizeNumeric);
+            groupBox1.Controls.Add(label2);
+            groupBox1.Controls.Add(positionTrackBar);
+            groupBox1.Controls.Add(positionNumeric);
+            groupBox1.Controls.Add(label1);
+            groupBox1.Location = new Point(12, 446);
+            groupBox1.Name = "groupBox1";
+            groupBox1.Size = new Size(239, 160);
+            groupBox1.TabIndex = 3;
+            groupBox1.TabStop = false;
+            groupBox1.Text = "Current Note Settings";
             // 
             // label4
             // 
-            this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(175, 131);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(12, 15);
-            this.label4.TabIndex = 10;
-            this.label4.Text = "/";
+            label4.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            label4.AutoSize = true;
+            label4.Location = new Point(175, 131);
+            label4.Name = "label4";
+            label4.Size = new Size(12, 15);
+            label4.TabIndex = 10;
+            label4.Text = "/";
             // 
             // beat2Numeric
             // 
-            this.beat2Numeric.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.beat2Numeric.Location = new System.Drawing.Point(193, 129);
-            this.beat2Numeric.Maximum = new decimal(new int[] {
-            1920,
-            0,
-            0,
-            0});
-            this.beat2Numeric.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.beat2Numeric.Name = "beat2Numeric";
-            this.beat2Numeric.Size = new System.Drawing.Size(38, 23);
-            this.beat2Numeric.TabIndex = 9;
-            this.beat2Numeric.Value = new decimal(new int[] {
-            16,
-            0,
-            0,
-            0});
-            this.beat2Numeric.ValueChanged += new System.EventHandler(this.beat2Numeric_ValueChanged);
+            beat2Numeric.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            beat2Numeric.Location = new Point(193, 129);
+            beat2Numeric.Maximum = new decimal(new int[] { 1920, 0, 0, 0 });
+            beat2Numeric.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
+            beat2Numeric.Name = "beat2Numeric";
+            beat2Numeric.Size = new Size(38, 23);
+            beat2Numeric.TabIndex = 9;
+            beat2Numeric.Value = new decimal(new int[] { 16, 0, 0, 0 });
+            beat2Numeric.ValueChanged += beat2Numeric_ValueChanged;
             // 
             // beat1Numeric
             // 
-            this.beat1Numeric.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.beat1Numeric.Location = new System.Drawing.Point(131, 129);
-            this.beat1Numeric.Maximum = new decimal(new int[] {
-            1920,
-            0,
-            0,
-            0});
-            this.beat1Numeric.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            -2147483648});
-            this.beat1Numeric.Name = "beat1Numeric";
-            this.beat1Numeric.Size = new System.Drawing.Size(38, 23);
-            this.beat1Numeric.TabIndex = 8;
-            this.beat1Numeric.ValueChanged += new System.EventHandler(this.beat1Numeric_ValueChanged);
+            beat1Numeric.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            beat1Numeric.Location = new Point(131, 129);
+            beat1Numeric.Maximum = new decimal(new int[] { 1920, 0, 0, 0 });
+            beat1Numeric.Minimum = new decimal(new int[] { 1, 0, 0, int.MinValue });
+            beat1Numeric.Name = "beat1Numeric";
+            beat1Numeric.Size = new Size(38, 23);
+            beat1Numeric.TabIndex = 8;
+            beat1Numeric.ValueChanged += beat1Numeric_ValueChanged;
             // 
             // measureNumeric
             // 
-            this.measureNumeric.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.measureNumeric.Location = new System.Drawing.Point(6, 129);
-            this.measureNumeric.Maximum = new decimal(new int[] {
-            9999,
-            0,
-            0,
-            0});
-            this.measureNumeric.Name = "measureNumeric";
-            this.measureNumeric.Size = new System.Drawing.Size(119, 23);
-            this.measureNumeric.TabIndex = 7;
-            this.measureNumeric.ValueChanged += new System.EventHandler(this.measureNumeric_ValueChanged);
+            measureNumeric.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            measureNumeric.Location = new Point(6, 129);
+            measureNumeric.Maximum = new decimal(new int[] { 9999, 0, 0, 0 });
+            measureNumeric.Name = "measureNumeric";
+            measureNumeric.Size = new Size(119, 23);
+            measureNumeric.TabIndex = 7;
+            measureNumeric.ValueChanged += measureNumeric_ValueChanged;
             // 
             // label3
             // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(6, 111);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(55, 15);
-            this.label3.TabIndex = 6;
-            this.label3.Text = "Measure:";
+            label3.AutoSize = true;
+            label3.Location = new Point(6, 111);
+            label3.Name = "label3";
+            label3.Size = new Size(55, 15);
+            label3.TabIndex = 6;
+            label3.Text = "Measure:";
             // 
             // sizeTrackBar
             // 
-            this.sizeTrackBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.sizeTrackBar.Location = new System.Drawing.Point(50, 81);
-            this.sizeTrackBar.Maximum = 60;
-            this.sizeTrackBar.Minimum = 4;
-            this.sizeTrackBar.Name = "sizeTrackBar";
-            this.sizeTrackBar.Size = new System.Drawing.Size(183, 45);
-            this.sizeTrackBar.TabIndex = 5;
-            this.sizeTrackBar.TickStyle = System.Windows.Forms.TickStyle.None;
-            this.sizeTrackBar.Value = 4;
-            this.sizeTrackBar.ValueChanged += new System.EventHandler(this.sizeTrackBar_ValueChanged);
+            sizeTrackBar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            sizeTrackBar.Location = new Point(50, 81);
+            sizeTrackBar.Maximum = 60;
+            sizeTrackBar.Minimum = 4;
+            sizeTrackBar.Name = "sizeTrackBar";
+            sizeTrackBar.Size = new Size(183, 45);
+            sizeTrackBar.TabIndex = 5;
+            sizeTrackBar.TickStyle = TickStyle.None;
+            sizeTrackBar.Value = 4;
+            sizeTrackBar.ValueChanged += sizeTrackBar_ValueChanged;
             // 
             // sizeNumeric
             // 
-            this.sizeNumeric.Location = new System.Drawing.Point(6, 81);
-            this.sizeNumeric.Maximum = new decimal(new int[] {
-            60,
-            0,
-            0,
-            0});
-            this.sizeNumeric.Minimum = new decimal(new int[] {
-            4,
-            0,
-            0,
-            0});
-            this.sizeNumeric.Name = "sizeNumeric";
-            this.sizeNumeric.Size = new System.Drawing.Size(38, 23);
-            this.sizeNumeric.TabIndex = 4;
-            this.sizeNumeric.Value = new decimal(new int[] {
-            4,
-            0,
-            0,
-            0});
-            this.sizeNumeric.ValueChanged += new System.EventHandler(this.sizeNumeric_ValueChanged);
+            sizeNumeric.Location = new Point(6, 81);
+            sizeNumeric.Maximum = new decimal(new int[] { 60, 0, 0, 0 });
+            sizeNumeric.Minimum = new decimal(new int[] { 4, 0, 0, 0 });
+            sizeNumeric.Name = "sizeNumeric";
+            sizeNumeric.Size = new Size(38, 23);
+            sizeNumeric.TabIndex = 4;
+            sizeNumeric.Value = new decimal(new int[] { 4, 0, 0, 0 });
+            sizeNumeric.ValueChanged += sizeNumeric_ValueChanged;
             // 
             // label2
             // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(6, 63);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(30, 15);
-            this.label2.TabIndex = 3;
-            this.label2.Text = "Size:";
+            label2.AutoSize = true;
+            label2.Location = new Point(6, 63);
+            label2.Name = "label2";
+            label2.Size = new Size(30, 15);
+            label2.TabIndex = 3;
+            label2.Text = "Size:";
             // 
             // positionTrackBar
             // 
-            this.positionTrackBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.positionTrackBar.Location = new System.Drawing.Point(50, 37);
-            this.positionTrackBar.Maximum = 59;
-            this.positionTrackBar.Name = "positionTrackBar";
-            this.positionTrackBar.Size = new System.Drawing.Size(183, 45);
-            this.positionTrackBar.TabIndex = 2;
-            this.positionTrackBar.TickStyle = System.Windows.Forms.TickStyle.None;
-            this.positionTrackBar.ValueChanged += new System.EventHandler(this.positionTrackBar_ValueChanged);
+            positionTrackBar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            positionTrackBar.Location = new Point(50, 37);
+            positionTrackBar.Maximum = 59;
+            positionTrackBar.Name = "positionTrackBar";
+            positionTrackBar.Size = new Size(183, 45);
+            positionTrackBar.TabIndex = 2;
+            positionTrackBar.TickStyle = TickStyle.None;
+            positionTrackBar.ValueChanged += positionTrackBar_ValueChanged;
             // 
             // positionNumeric
             // 
-            this.positionNumeric.Location = new System.Drawing.Point(6, 37);
-            this.positionNumeric.Maximum = new decimal(new int[] {
-            59,
-            0,
-            0,
-            0});
-            this.positionNumeric.Name = "positionNumeric";
-            this.positionNumeric.Size = new System.Drawing.Size(38, 23);
-            this.positionNumeric.TabIndex = 1;
-            this.positionNumeric.ValueChanged += new System.EventHandler(this.positionNumeric_ValueChanged);
+            positionNumeric.Location = new Point(6, 37);
+            positionNumeric.Maximum = new decimal(new int[] { 59, 0, 0, 0 });
+            positionNumeric.Name = "positionNumeric";
+            positionNumeric.Size = new Size(38, 23);
+            positionNumeric.TabIndex = 1;
+            positionNumeric.ValueChanged += positionNumeric_ValueChanged;
             // 
             // label1
             // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(6, 19);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(53, 15);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Position:";
+            label1.AutoSize = true;
+            label1.Location = new Point(6, 19);
+            label1.Name = "label1";
+            label1.Size = new Size(53, 15);
+            label1.TabIndex = 0;
+            label1.Text = "Position:";
             // 
             // groupBox2
             // 
-            this.groupBox2.Controls.Add(this.flairRadio);
-            this.groupBox2.Controls.Add(this.bonusRadio);
-            this.groupBox2.Controls.Add(this.noBonusRadio);
-            this.groupBox2.Controls.Add(this.endHoldCheck);
-            this.groupBox2.Controls.Add(this.endChartButton);
-            this.groupBox2.Controls.Add(this.holdButton);
-            this.groupBox2.Controls.Add(this.chainButton);
-            this.groupBox2.Controls.Add(this.blueButton);
-            this.groupBox2.Controls.Add(this.redButton);
-            this.groupBox2.Controls.Add(this.greenButton);
-            this.groupBox2.Controls.Add(this.orangeButton);
-            this.groupBox2.Controls.Add(this.tapButton);
-            this.groupBox2.Location = new System.Drawing.Point(12, 27);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(109, 358);
-            this.groupBox2.TabIndex = 4;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "Note Types";
+            groupBox2.Controls.Add(flairRadio);
+            groupBox2.Controls.Add(bonusRadio);
+            groupBox2.Controls.Add(noBonusRadio);
+            groupBox2.Controls.Add(endHoldCheck);
+            groupBox2.Controls.Add(endChartButton);
+            groupBox2.Controls.Add(holdButton);
+            groupBox2.Controls.Add(chainButton);
+            groupBox2.Controls.Add(blueButton);
+            groupBox2.Controls.Add(redButton);
+            groupBox2.Controls.Add(greenButton);
+            groupBox2.Controls.Add(orangeButton);
+            groupBox2.Controls.Add(tapButton);
+            groupBox2.Location = new Point(12, 27);
+            groupBox2.Name = "groupBox2";
+            groupBox2.Size = new Size(109, 358);
+            groupBox2.TabIndex = 4;
+            groupBox2.TabStop = false;
+            groupBox2.Text = "Note Types";
             // 
             // flairRadio
             // 
-            this.flairRadio.AutoSize = true;
-            this.flairRadio.Location = new System.Drawing.Point(6, 329);
-            this.flairRadio.Name = "flairRadio";
-            this.flairRadio.Size = new System.Drawing.Size(94, 19);
-            this.flairRadio.TabIndex = 16;
-            this.flairRadio.Text = "R Note (Flair)";
-            this.flairRadio.UseVisualStyleBackColor = true;
-            this.flairRadio.CheckedChanged += new System.EventHandler(this.BonusRadioCheck);
+            flairRadio.AutoSize = true;
+            flairRadio.Location = new Point(6, 329);
+            flairRadio.Name = "flairRadio";
+            flairRadio.Size = new Size(94, 19);
+            flairRadio.TabIndex = 16;
+            flairRadio.Text = "R Note (Flair)";
+            flairRadio.UseVisualStyleBackColor = true;
+            flairRadio.CheckedChanged += BonusRadioCheck;
             // 
             // bonusRadio
             // 
-            this.bonusRadio.AutoSize = true;
-            this.bonusRadio.Location = new System.Drawing.Point(6, 304);
-            this.bonusRadio.Name = "bonusRadio";
-            this.bonusRadio.Size = new System.Drawing.Size(79, 19);
-            this.bonusRadio.TabIndex = 15;
-            this.bonusRadio.Text = "Bonus Get";
-            this.bonusRadio.UseVisualStyleBackColor = true;
-            this.bonusRadio.CheckedChanged += new System.EventHandler(this.BonusRadioCheck);
+            bonusRadio.AutoSize = true;
+            bonusRadio.Location = new Point(6, 304);
+            bonusRadio.Name = "bonusRadio";
+            bonusRadio.Size = new Size(79, 19);
+            bonusRadio.TabIndex = 15;
+            bonusRadio.Text = "Bonus Get";
+            bonusRadio.UseVisualStyleBackColor = true;
+            bonusRadio.CheckedChanged += BonusRadioCheck;
             // 
             // noBonusRadio
             // 
-            this.noBonusRadio.AutoSize = true;
-            this.noBonusRadio.Checked = true;
-            this.noBonusRadio.Location = new System.Drawing.Point(6, 279);
-            this.noBonusRadio.Name = "noBonusRadio";
-            this.noBonusRadio.Size = new System.Drawing.Size(77, 19);
-            this.noBonusRadio.TabIndex = 14;
-            this.noBonusRadio.TabStop = true;
-            this.noBonusRadio.Text = "No Bonus";
-            this.noBonusRadio.UseVisualStyleBackColor = true;
-            this.noBonusRadio.CheckedChanged += new System.EventHandler(this.BonusRadioCheck);
+            noBonusRadio.AutoSize = true;
+            noBonusRadio.Checked = true;
+            noBonusRadio.Location = new Point(6, 279);
+            noBonusRadio.Name = "noBonusRadio";
+            noBonusRadio.Size = new Size(77, 19);
+            noBonusRadio.TabIndex = 14;
+            noBonusRadio.TabStop = true;
+            noBonusRadio.Text = "No Bonus";
+            noBonusRadio.UseVisualStyleBackColor = true;
+            noBonusRadio.CheckedChanged += BonusRadioCheck;
             // 
             // endHoldCheck
             // 
-            this.endHoldCheck.AutoSize = true;
-            this.endHoldCheck.Location = new System.Drawing.Point(6, 254);
-            this.endHoldCheck.Name = "endHoldCheck";
-            this.endHoldCheck.Size = new System.Drawing.Size(75, 19);
-            this.endHoldCheck.TabIndex = 13;
-            this.endHoldCheck.Text = "End Hold";
-            this.endHoldCheck.UseVisualStyleBackColor = true;
-            this.endHoldCheck.CheckedChanged += new System.EventHandler(this.endHoldCheck_CheckedChanged);
+            endHoldCheck.AutoSize = true;
+            endHoldCheck.Location = new Point(6, 254);
+            endHoldCheck.Name = "endHoldCheck";
+            endHoldCheck.Size = new Size(75, 19);
+            endHoldCheck.TabIndex = 13;
+            endHoldCheck.Text = "End Hold";
+            endHoldCheck.UseVisualStyleBackColor = true;
+            endHoldCheck.CheckedChanged += endHoldCheck_CheckedChanged;
             // 
             // endChartButton
             // 
-            this.endChartButton.BackColor = System.Drawing.Color.Black;
-            this.endChartButton.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
-            this.endChartButton.ForeColor = System.Drawing.Color.White;
-            this.endChartButton.Location = new System.Drawing.Point(6, 225);
-            this.endChartButton.Name = "endChartButton";
-            this.endChartButton.Size = new System.Drawing.Size(97, 23);
-            this.endChartButton.TabIndex = 12;
-            this.endChartButton.Text = "End of Chart";
-            this.endChartButton.UseVisualStyleBackColor = false;
-            this.endChartButton.Click += new System.EventHandler(this.endChartButton_Click);
+            endChartButton.BackColor = Color.Black;
+            endChartButton.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point);
+            endChartButton.ForeColor = Color.White;
+            endChartButton.Location = new Point(6, 225);
+            endChartButton.Name = "endChartButton";
+            endChartButton.Size = new Size(97, 23);
+            endChartButton.TabIndex = 12;
+            endChartButton.Text = "End of Chart";
+            endChartButton.UseVisualStyleBackColor = false;
+            endChartButton.Click += endChartButton_Click;
             // 
             // holdButton
             // 
-            this.holdButton.BackColor = System.Drawing.Color.Yellow;
-            this.holdButton.Location = new System.Drawing.Point(6, 196);
-            this.holdButton.Name = "holdButton";
-            this.holdButton.Size = new System.Drawing.Size(97, 23);
-            this.holdButton.TabIndex = 11;
-            this.holdButton.Text = "Hold";
-            this.holdButton.UseVisualStyleBackColor = false;
-            this.holdButton.Click += new System.EventHandler(this.holdButton_Click);
+            holdButton.BackColor = Color.Yellow;
+            holdButton.Location = new Point(6, 196);
+            holdButton.Name = "holdButton";
+            holdButton.Size = new Size(97, 23);
+            holdButton.TabIndex = 11;
+            holdButton.Text = "Hold";
+            holdButton.UseVisualStyleBackColor = false;
+            holdButton.Click += holdButton_Click;
             // 
             // chainButton
             // 
-            this.chainButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(190)))), ((int)(((byte)(45)))));
-            this.chainButton.Location = new System.Drawing.Point(6, 167);
-            this.chainButton.Name = "chainButton";
-            this.chainButton.Size = new System.Drawing.Size(97, 23);
-            this.chainButton.TabIndex = 10;
-            this.chainButton.Text = "Chain";
-            this.chainButton.UseVisualStyleBackColor = false;
-            this.chainButton.Click += new System.EventHandler(this.chainButton_Click);
+            chainButton.BackColor = Color.FromArgb(204, 190, 45);
+            chainButton.Location = new Point(6, 167);
+            chainButton.Name = "chainButton";
+            chainButton.Size = new Size(97, 23);
+            chainButton.TabIndex = 10;
+            chainButton.Text = "Chain";
+            chainButton.UseVisualStyleBackColor = false;
+            chainButton.Click += chainButton_Click;
             // 
             // blueButton
             // 
-            this.blueButton.BackColor = System.Drawing.Color.Cyan;
-            this.blueButton.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.blueButton.Location = new System.Drawing.Point(6, 138);
-            this.blueButton.Name = "blueButton";
-            this.blueButton.Size = new System.Drawing.Size(97, 23);
-            this.blueButton.TabIndex = 9;
-            this.blueButton.Text = "↓ Snap";
-            this.blueButton.UseVisualStyleBackColor = false;
-            this.blueButton.Click += new System.EventHandler(this.blueButton_Click);
+            blueButton.BackColor = Color.Cyan;
+            blueButton.ForeColor = SystemColors.ControlText;
+            blueButton.Location = new Point(6, 138);
+            blueButton.Name = "blueButton";
+            blueButton.Size = new Size(97, 23);
+            blueButton.TabIndex = 9;
+            blueButton.Text = "↓ Snap";
+            blueButton.UseVisualStyleBackColor = false;
+            blueButton.Click += blueButton_Click;
             // 
             // redButton
             // 
-            this.redButton.BackColor = System.Drawing.Color.Red;
-            this.redButton.ForeColor = System.Drawing.Color.White;
-            this.redButton.Location = new System.Drawing.Point(6, 109);
-            this.redButton.Name = "redButton";
-            this.redButton.Size = new System.Drawing.Size(97, 23);
-            this.redButton.TabIndex = 8;
-            this.redButton.Text = "↑ Snap";
-            this.redButton.UseVisualStyleBackColor = false;
-            this.redButton.Click += new System.EventHandler(this.redButton_Click);
+            redButton.BackColor = Color.Red;
+            redButton.ForeColor = Color.White;
+            redButton.Location = new Point(6, 109);
+            redButton.Name = "redButton";
+            redButton.Size = new Size(97, 23);
+            redButton.TabIndex = 8;
+            redButton.Text = "↑ Snap";
+            redButton.UseVisualStyleBackColor = false;
+            redButton.Click += redButton_Click;
             // 
             // greenButton
             // 
-            this.greenButton.BackColor = System.Drawing.Color.Lime;
-            this.greenButton.Location = new System.Drawing.Point(6, 80);
-            this.greenButton.Name = "greenButton";
-            this.greenButton.Size = new System.Drawing.Size(97, 23);
-            this.greenButton.TabIndex = 7;
-            this.greenButton.Text = "⤿ Slide";
-            this.greenButton.UseVisualStyleBackColor = false;
-            this.greenButton.Click += new System.EventHandler(this.greenButton_Click);
+            greenButton.BackColor = Color.Lime;
+            greenButton.Location = new Point(6, 80);
+            greenButton.Name = "greenButton";
+            greenButton.Size = new Size(97, 23);
+            greenButton.TabIndex = 7;
+            greenButton.Text = "⤿ Slide";
+            greenButton.UseVisualStyleBackColor = false;
+            greenButton.Click += greenButton_Click;
             // 
             // orangeButton
             // 
-            this.orangeButton.BackColor = System.Drawing.Color.Orange;
-            this.orangeButton.Location = new System.Drawing.Point(6, 51);
-            this.orangeButton.Name = "orangeButton";
-            this.orangeButton.Size = new System.Drawing.Size(97, 23);
-            this.orangeButton.TabIndex = 6;
-            this.orangeButton.Text = "⤾ Slide";
-            this.orangeButton.UseVisualStyleBackColor = false;
-            this.orangeButton.Click += new System.EventHandler(this.orangeButton_Click);
+            orangeButton.BackColor = Color.Orange;
+            orangeButton.Location = new Point(6, 51);
+            orangeButton.Name = "orangeButton";
+            orangeButton.Size = new Size(97, 23);
+            orangeButton.TabIndex = 6;
+            orangeButton.Text = "⤾ Slide";
+            orangeButton.UseVisualStyleBackColor = false;
+            orangeButton.Click += orangeButton_Click;
             // 
             // tapButton
             // 
-            this.tapButton.BackColor = System.Drawing.Color.Fuchsia;
-            this.tapButton.Location = new System.Drawing.Point(6, 22);
-            this.tapButton.Name = "tapButton";
-            this.tapButton.Size = new System.Drawing.Size(97, 23);
-            this.tapButton.TabIndex = 5;
-            this.tapButton.Text = "Touch";
-            this.tapButton.UseVisualStyleBackColor = false;
-            this.tapButton.Click += new System.EventHandler(this.tapButton_Click);
+            tapButton.BackColor = Color.Fuchsia;
+            tapButton.Location = new Point(6, 22);
+            tapButton.Name = "tapButton";
+            tapButton.Size = new Size(97, 23);
+            tapButton.TabIndex = 5;
+            tapButton.Text = "Touch";
+            tapButton.UseVisualStyleBackColor = false;
+            tapButton.Click += tapButton_Click;
             // 
             // gimmickTypeGroupBox
             // 
-            this.gimmickTypeGroupBox.Controls.Add(this.removeMaskRadio);
-            this.gimmickTypeGroupBox.Controls.Add(this.reverseButton);
-            this.gimmickTypeGroupBox.Controls.Add(this.addMaskRadio);
-            this.gimmickTypeGroupBox.Controls.Add(this.stopButton);
-            this.gimmickTypeGroupBox.Controls.Add(this.hiSpeedButton);
-            this.gimmickTypeGroupBox.Controls.Add(this.timeSigButton);
-            this.gimmickTypeGroupBox.Controls.Add(this.bpmChangeButton);
-            this.gimmickTypeGroupBox.Controls.Add(this.maskButton);
-            this.gimmickTypeGroupBox.Location = new System.Drawing.Point(127, 27);
-            this.gimmickTypeGroupBox.Name = "gimmickTypeGroupBox";
-            this.gimmickTypeGroupBox.Size = new System.Drawing.Size(124, 252);
-            this.gimmickTypeGroupBox.TabIndex = 5;
-            this.gimmickTypeGroupBox.TabStop = false;
-            this.gimmickTypeGroupBox.Text = "Gimmick Types";
+            gimmickTypeGroupBox.Controls.Add(removeMaskRadio);
+            gimmickTypeGroupBox.Controls.Add(reverseButton);
+            gimmickTypeGroupBox.Controls.Add(addMaskRadio);
+            gimmickTypeGroupBox.Controls.Add(stopButton);
+            gimmickTypeGroupBox.Controls.Add(hiSpeedButton);
+            gimmickTypeGroupBox.Controls.Add(timeSigButton);
+            gimmickTypeGroupBox.Controls.Add(bpmChangeButton);
+            gimmickTypeGroupBox.Controls.Add(maskButton);
+            gimmickTypeGroupBox.Location = new Point(127, 27);
+            gimmickTypeGroupBox.Name = "gimmickTypeGroupBox";
+            gimmickTypeGroupBox.Size = new Size(124, 252);
+            gimmickTypeGroupBox.TabIndex = 5;
+            gimmickTypeGroupBox.TabStop = false;
+            gimmickTypeGroupBox.Text = "Gimmick Types";
             // 
             // removeMaskRadio
             // 
-            this.removeMaskRadio.AutoSize = true;
-            this.removeMaskRadio.Location = new System.Drawing.Point(6, 222);
-            this.removeMaskRadio.Name = "removeMaskRadio";
-            this.removeMaskRadio.Size = new System.Drawing.Size(99, 19);
-            this.removeMaskRadio.TabIndex = 18;
-            this.removeMaskRadio.Text = "Remove Mask";
-            this.removeMaskRadio.UseVisualStyleBackColor = true;
-            this.removeMaskRadio.CheckedChanged += new System.EventHandler(this.maskRatio_CheckChanged);
+            removeMaskRadio.AutoSize = true;
+            removeMaskRadio.Location = new Point(6, 222);
+            removeMaskRadio.Name = "removeMaskRadio";
+            removeMaskRadio.Size = new Size(99, 19);
+            removeMaskRadio.TabIndex = 18;
+            removeMaskRadio.Text = "Remove Mask";
+            removeMaskRadio.UseVisualStyleBackColor = true;
+            removeMaskRadio.CheckedChanged += maskRatio_CheckChanged;
             // 
             // reverseButton
             // 
-            this.reverseButton.Location = new System.Drawing.Point(6, 167);
-            this.reverseButton.Name = "reverseButton";
-            this.reverseButton.Size = new System.Drawing.Size(112, 23);
-            this.reverseButton.TabIndex = 5;
-            this.reverseButton.Text = "Reverse";
-            this.reverseButton.UseVisualStyleBackColor = true;
-            this.reverseButton.Click += new System.EventHandler(this.reverseButton_Click);
+            reverseButton.Location = new Point(6, 167);
+            reverseButton.Name = "reverseButton";
+            reverseButton.Size = new Size(112, 23);
+            reverseButton.TabIndex = 5;
+            reverseButton.Text = "Reverse";
+            reverseButton.UseVisualStyleBackColor = true;
+            reverseButton.Click += reverseButton_Click;
             // 
             // addMaskRadio
             // 
-            this.addMaskRadio.AutoSize = true;
-            this.addMaskRadio.Checked = true;
-            this.addMaskRadio.Location = new System.Drawing.Point(6, 197);
-            this.addMaskRadio.Name = "addMaskRadio";
-            this.addMaskRadio.Size = new System.Drawing.Size(78, 19);
-            this.addMaskRadio.TabIndex = 17;
-            this.addMaskRadio.TabStop = true;
-            this.addMaskRadio.Text = "Add Mask";
-            this.addMaskRadio.UseVisualStyleBackColor = true;
-            this.addMaskRadio.CheckedChanged += new System.EventHandler(this.maskRatio_CheckChanged);
+            addMaskRadio.AutoSize = true;
+            addMaskRadio.Checked = true;
+            addMaskRadio.Location = new Point(6, 197);
+            addMaskRadio.Name = "addMaskRadio";
+            addMaskRadio.Size = new Size(78, 19);
+            addMaskRadio.TabIndex = 17;
+            addMaskRadio.TabStop = true;
+            addMaskRadio.Text = "Add Mask";
+            addMaskRadio.UseVisualStyleBackColor = true;
+            addMaskRadio.CheckedChanged += maskRatio_CheckChanged;
             // 
             // stopButton
             // 
-            this.stopButton.Location = new System.Drawing.Point(6, 138);
-            this.stopButton.Name = "stopButton";
-            this.stopButton.Size = new System.Drawing.Size(112, 23);
-            this.stopButton.TabIndex = 4;
-            this.stopButton.Text = "Stop";
-            this.stopButton.UseVisualStyleBackColor = true;
-            this.stopButton.Click += new System.EventHandler(this.stopButton_Click);
+            stopButton.Location = new Point(6, 138);
+            stopButton.Name = "stopButton";
+            stopButton.Size = new Size(112, 23);
+            stopButton.TabIndex = 4;
+            stopButton.Text = "Stop";
+            stopButton.UseVisualStyleBackColor = true;
+            stopButton.Click += stopButton_Click;
             // 
             // hiSpeedButton
             // 
-            this.hiSpeedButton.Location = new System.Drawing.Point(6, 109);
-            this.hiSpeedButton.Name = "hiSpeedButton";
-            this.hiSpeedButton.Size = new System.Drawing.Size(112, 23);
-            this.hiSpeedButton.TabIndex = 3;
-            this.hiSpeedButton.Text = "Hi-Speed";
-            this.hiSpeedButton.UseVisualStyleBackColor = true;
-            this.hiSpeedButton.Click += new System.EventHandler(this.hiSpeedButton_Click);
+            hiSpeedButton.Location = new Point(6, 109);
+            hiSpeedButton.Name = "hiSpeedButton";
+            hiSpeedButton.Size = new Size(112, 23);
+            hiSpeedButton.TabIndex = 3;
+            hiSpeedButton.Text = "Hi-Speed";
+            hiSpeedButton.UseVisualStyleBackColor = true;
+            hiSpeedButton.Click += hiSpeedButton_Click;
             // 
             // timeSigButton
             // 
-            this.timeSigButton.Location = new System.Drawing.Point(6, 80);
-            this.timeSigButton.Name = "timeSigButton";
-            this.timeSigButton.Size = new System.Drawing.Size(112, 23);
-            this.timeSigButton.TabIndex = 2;
-            this.timeSigButton.Text = "Time Signature";
-            this.timeSigButton.UseVisualStyleBackColor = true;
-            this.timeSigButton.Click += new System.EventHandler(this.timeSigButton_Click);
+            timeSigButton.Location = new Point(6, 80);
+            timeSigButton.Name = "timeSigButton";
+            timeSigButton.Size = new Size(112, 23);
+            timeSigButton.TabIndex = 2;
+            timeSigButton.Text = "Time Signature";
+            timeSigButton.UseVisualStyleBackColor = true;
+            timeSigButton.Click += timeSigButton_Click;
             // 
             // bpmChangeButton
             // 
-            this.bpmChangeButton.Location = new System.Drawing.Point(6, 51);
-            this.bpmChangeButton.Name = "bpmChangeButton";
-            this.bpmChangeButton.Size = new System.Drawing.Size(112, 23);
-            this.bpmChangeButton.TabIndex = 1;
-            this.bpmChangeButton.Text = "BPM Change";
-            this.bpmChangeButton.UseVisualStyleBackColor = true;
-            this.bpmChangeButton.Click += new System.EventHandler(this.bpmChangeButton_Click);
+            bpmChangeButton.Location = new Point(6, 51);
+            bpmChangeButton.Name = "bpmChangeButton";
+            bpmChangeButton.Size = new Size(112, 23);
+            bpmChangeButton.TabIndex = 1;
+            bpmChangeButton.Text = "BPM Change";
+            bpmChangeButton.UseVisualStyleBackColor = true;
+            bpmChangeButton.Click += bpmChangeButton_Click;
             // 
             // maskButton
             // 
-            this.maskButton.Location = new System.Drawing.Point(6, 22);
-            this.maskButton.Name = "maskButton";
-            this.maskButton.Size = new System.Drawing.Size(112, 23);
-            this.maskButton.TabIndex = 0;
-            this.maskButton.Text = "Mask";
-            this.maskButton.UseVisualStyleBackColor = true;
-            this.maskButton.Click += new System.EventHandler(this.maskButton_Click);
+            maskButton.Location = new Point(6, 22);
+            maskButton.Name = "maskButton";
+            maskButton.Size = new Size(112, 23);
+            maskButton.TabIndex = 0;
+            maskButton.Text = "Mask";
+            maskButton.UseVisualStyleBackColor = true;
+            maskButton.Click += maskButton_Click;
             // 
             // groupBox4
             // 
-            this.groupBox4.Controls.Add(this.centerMaskRadio);
-            this.groupBox4.Controls.Add(this.clockwiseMaskRadio);
-            this.groupBox4.Controls.Add(this.cClockwiseMaskRadio);
-            this.groupBox4.Location = new System.Drawing.Point(127, 285);
-            this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(124, 100);
-            this.groupBox4.TabIndex = 19;
-            this.groupBox4.TabStop = false;
-            this.groupBox4.Text = "Mask Setting";
+            groupBox4.Controls.Add(centerMaskRadio);
+            groupBox4.Controls.Add(clockwiseMaskRadio);
+            groupBox4.Controls.Add(cClockwiseMaskRadio);
+            groupBox4.Location = new Point(127, 285);
+            groupBox4.Name = "groupBox4";
+            groupBox4.Size = new Size(124, 100);
+            groupBox4.TabIndex = 19;
+            groupBox4.TabStop = false;
+            groupBox4.Text = "Mask Setting";
             // 
             // centerMaskRadio
             // 
-            this.centerMaskRadio.AutoSize = true;
-            this.centerMaskRadio.Location = new System.Drawing.Point(6, 72);
-            this.centerMaskRadio.Name = "centerMaskRadio";
-            this.centerMaskRadio.Size = new System.Drawing.Size(91, 19);
-            this.centerMaskRadio.TabIndex = 19;
-            this.centerMaskRadio.Text = "From Center";
-            this.centerMaskRadio.UseVisualStyleBackColor = true;
-            this.centerMaskRadio.CheckedChanged += new System.EventHandler(this.maskRatio_CheckChanged);
+            centerMaskRadio.AutoSize = true;
+            centerMaskRadio.Location = new Point(6, 72);
+            centerMaskRadio.Name = "centerMaskRadio";
+            centerMaskRadio.Size = new Size(91, 19);
+            centerMaskRadio.TabIndex = 19;
+            centerMaskRadio.Text = "From Center";
+            centerMaskRadio.UseVisualStyleBackColor = true;
+            centerMaskRadio.CheckedChanged += maskRatio_CheckChanged;
             // 
             // clockwiseMaskRadio
             // 
-            this.clockwiseMaskRadio.AutoSize = true;
-            this.clockwiseMaskRadio.Checked = true;
-            this.clockwiseMaskRadio.Location = new System.Drawing.Point(6, 22);
-            this.clockwiseMaskRadio.Name = "clockwiseMaskRadio";
-            this.clockwiseMaskRadio.Size = new System.Drawing.Size(78, 19);
-            this.clockwiseMaskRadio.TabIndex = 17;
-            this.clockwiseMaskRadio.TabStop = true;
-            this.clockwiseMaskRadio.Text = "Clockwise";
-            this.clockwiseMaskRadio.UseVisualStyleBackColor = true;
-            this.clockwiseMaskRadio.CheckedChanged += new System.EventHandler(this.maskRatio_CheckChanged);
+            clockwiseMaskRadio.AutoSize = true;
+            clockwiseMaskRadio.Checked = true;
+            clockwiseMaskRadio.Location = new Point(6, 22);
+            clockwiseMaskRadio.Name = "clockwiseMaskRadio";
+            clockwiseMaskRadio.Size = new Size(78, 19);
+            clockwiseMaskRadio.TabIndex = 17;
+            clockwiseMaskRadio.TabStop = true;
+            clockwiseMaskRadio.Text = "Clockwise";
+            clockwiseMaskRadio.UseVisualStyleBackColor = true;
+            clockwiseMaskRadio.CheckedChanged += maskRatio_CheckChanged;
             // 
             // cClockwiseMaskRadio
             // 
-            this.cClockwiseMaskRadio.AutoSize = true;
-            this.cClockwiseMaskRadio.Location = new System.Drawing.Point(6, 47);
-            this.cClockwiseMaskRadio.Name = "cClockwiseMaskRadio";
-            this.cClockwiseMaskRadio.Size = new System.Drawing.Size(91, 19);
-            this.cClockwiseMaskRadio.TabIndex = 18;
-            this.cClockwiseMaskRadio.Text = "C-Clockwise";
-            this.cClockwiseMaskRadio.UseVisualStyleBackColor = true;
-            this.cClockwiseMaskRadio.CheckedChanged += new System.EventHandler(this.maskRatio_CheckChanged);
+            cClockwiseMaskRadio.AutoSize = true;
+            cClockwiseMaskRadio.Location = new Point(6, 47);
+            cClockwiseMaskRadio.Name = "cClockwiseMaskRadio";
+            cClockwiseMaskRadio.Size = new Size(91, 19);
+            cClockwiseMaskRadio.TabIndex = 18;
+            cClockwiseMaskRadio.Text = "C-Clockwise";
+            cClockwiseMaskRadio.UseVisualStyleBackColor = true;
+            cClockwiseMaskRadio.CheckedChanged += maskRatio_CheckChanged;
             // 
             // groupBox5
             // 
-            this.groupBox5.Controls.Add(this.currentSelectionLabel);
-            this.groupBox5.Location = new System.Drawing.Point(12, 392);
-            this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(239, 48);
-            this.groupBox5.TabIndex = 20;
-            this.groupBox5.TabStop = false;
-            this.groupBox5.Text = "Current Selection";
+            groupBox5.Controls.Add(currentSelectionLabel);
+            groupBox5.Location = new Point(12, 392);
+            groupBox5.Name = "groupBox5";
+            groupBox5.Size = new Size(239, 48);
+            groupBox5.TabIndex = 20;
+            groupBox5.TabStop = false;
+            groupBox5.Text = "Current Selection";
             // 
             // currentSelectionLabel
             // 
-            this.currentSelectionLabel.AutoSize = true;
-            this.currentSelectionLabel.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            this.currentSelectionLabel.Location = new System.Drawing.Point(6, 19);
-            this.currentSelectionLabel.Name = "currentSelectionLabel";
-            this.currentSelectionLabel.Size = new System.Drawing.Size(48, 20);
-            this.currentSelectionLabel.TabIndex = 21;
-            this.currentSelectionLabel.Text = "Touch";
+            currentSelectionLabel.AutoSize = true;
+            currentSelectionLabel.Font = new Font("Segoe UI", 11F, FontStyle.Regular, GraphicsUnit.Point);
+            currentSelectionLabel.Location = new Point(6, 19);
+            currentSelectionLabel.Name = "currentSelectionLabel";
+            currentSelectionLabel.Size = new Size(48, 20);
+            currentSelectionLabel.TabIndex = 21;
+            currentSelectionLabel.Text = "Touch";
             // 
             // playbackGroupBox
             // 
-            this.playbackGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.playbackGroupBox.Controls.Add(this.songFileLabel);
-            this.playbackGroupBox.Controls.Add(this.labelSpeed);
-            this.playbackGroupBox.Controls.Add(this.trackBarSpeed);
-            this.playbackGroupBox.Controls.Add(this.trackBarVolume);
-            this.playbackGroupBox.Controls.Add(this.labelVolume);
-            this.playbackGroupBox.Controls.Add(this.label20);
-            this.playbackGroupBox.Controls.Add(this.songTrackBar);
-            this.playbackGroupBox.Controls.Add(this.selectSongButton);
-            this.playbackGroupBox.Controls.Add(this.playButton);
-            this.playbackGroupBox.Location = new System.Drawing.Point(12, 657);
-            this.playbackGroupBox.Name = "playbackGroupBox";
-            this.playbackGroupBox.Size = new System.Drawing.Size(736, 118);
-            this.playbackGroupBox.TabIndex = 32;
-            this.playbackGroupBox.TabStop = false;
-            this.playbackGroupBox.Text = "Playback";
+            playbackGroupBox.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
+            playbackGroupBox.Controls.Add(songFileLabel);
+            playbackGroupBox.Controls.Add(labelSpeed);
+            playbackGroupBox.Controls.Add(trackBarSpeed);
+            playbackGroupBox.Controls.Add(trackBarVolume);
+            playbackGroupBox.Controls.Add(labelVolume);
+            playbackGroupBox.Controls.Add(label20);
+            playbackGroupBox.Controls.Add(songTrackBar);
+            playbackGroupBox.Controls.Add(selectSongButton);
+            playbackGroupBox.Controls.Add(playButton);
+            playbackGroupBox.Location = new Point(12, 657);
+            playbackGroupBox.Name = "playbackGroupBox";
+            playbackGroupBox.Size = new Size(736, 118);
+            playbackGroupBox.TabIndex = 32;
+            playbackGroupBox.TabStop = false;
+            playbackGroupBox.Text = "Playback";
             // 
             // songFileLabel
             // 
-            this.songFileLabel.AutoSize = true;
-            this.songFileLabel.Location = new System.Drawing.Point(98, 81);
-            this.songFileLabel.Name = "songFileLabel";
-            this.songFileLabel.Size = new System.Drawing.Size(134, 15);
-            this.songFileLabel.TabIndex = 33;
-            this.songFileLabel.Text = "Select File (*.ogg, *.wav)";
+            songFileLabel.AutoSize = true;
+            songFileLabel.Location = new Point(98, 81);
+            songFileLabel.Name = "songFileLabel";
+            songFileLabel.Size = new Size(134, 15);
+            songFileLabel.TabIndex = 33;
+            songFileLabel.Text = "Select File (*.ogg, *.wav)";
             // 
             // labelSpeed
             // 
-            this.labelSpeed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.labelSpeed.AutoSize = true;
-            this.labelSpeed.Location = new System.Drawing.Point(311, 51);
-            this.labelSpeed.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.labelSpeed.Name = "labelSpeed";
-            this.labelSpeed.Size = new System.Drawing.Size(77, 15);
-            this.labelSpeed.TabIndex = 36;
-            this.labelSpeed.Text = "Speed (x1.00)";
+            labelSpeed.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(311, 51);
+            labelSpeed.Margin = new Padding(2, 0, 2, 0);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(77, 15);
+            labelSpeed.TabIndex = 36;
+            labelSpeed.Text = "Speed (x1.00)";
             // 
             // trackBarSpeed
             // 
-            this.trackBarSpeed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.trackBarSpeed.LargeChange = 1;
-            this.trackBarSpeed.Location = new System.Drawing.Point(392, 52);
-            this.trackBarSpeed.Margin = new System.Windows.Forms.Padding(2);
-            this.trackBarSpeed.Maximum = 4;
-            this.trackBarSpeed.Minimum = 1;
-            this.trackBarSpeed.Name = "trackBarSpeed";
-            this.trackBarSpeed.Size = new System.Drawing.Size(137, 45);
-            this.trackBarSpeed.TabIndex = 35;
-            this.trackBarSpeed.Value = 4;
-            this.trackBarSpeed.ValueChanged += new System.EventHandler(this.trackBarSpeed_ValueChanged);
+            trackBarSpeed.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            trackBarSpeed.LargeChange = 1;
+            trackBarSpeed.Location = new Point(392, 52);
+            trackBarSpeed.Margin = new Padding(2);
+            trackBarSpeed.Maximum = 4;
+            trackBarSpeed.Minimum = 1;
+            trackBarSpeed.Name = "trackBarSpeed";
+            trackBarSpeed.Size = new Size(137, 45);
+            trackBarSpeed.TabIndex = 35;
+            trackBarSpeed.Value = 4;
+            trackBarSpeed.ValueChanged += trackBarSpeed_ValueChanged;
             // 
             // trackBarVolume
             // 
-            this.trackBarVolume.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.trackBarVolume.Location = new System.Drawing.Point(588, 51);
-            this.trackBarVolume.Margin = new System.Windows.Forms.Padding(2);
-            this.trackBarVolume.Maximum = 100;
-            this.trackBarVolume.Name = "trackBarVolume";
-            this.trackBarVolume.Size = new System.Drawing.Size(137, 45);
-            this.trackBarVolume.TabIndex = 34;
-            this.trackBarVolume.TickFrequency = 50;
-            this.trackBarVolume.Value = 100;
-            this.trackBarVolume.ValueChanged += new System.EventHandler(this.trackBarVolume_ValueChanged);
-            this.trackBarVolume.MouseDown += new System.Windows.Forms.MouseEventHandler(this.trackBarVolume_MouseDown);
+            trackBarVolume.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            trackBarVolume.Location = new Point(588, 51);
+            trackBarVolume.Margin = new Padding(2);
+            trackBarVolume.Maximum = 100;
+            trackBarVolume.Name = "trackBarVolume";
+            trackBarVolume.Size = new Size(137, 45);
+            trackBarVolume.TabIndex = 34;
+            trackBarVolume.TickFrequency = 50;
+            trackBarVolume.Value = 100;
+            trackBarVolume.ValueChanged += trackBarVolume_ValueChanged;
+            trackBarVolume.MouseDown += trackBarVolume_MouseDown;
             // 
             // labelVolume
             // 
-            this.labelVolume.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.labelVolume.AutoSize = true;
-            this.labelVolume.Location = new System.Drawing.Point(537, 51);
-            this.labelVolume.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.labelVolume.Name = "labelVolume";
-            this.labelVolume.Size = new System.Drawing.Size(47, 15);
-            this.labelVolume.TabIndex = 0;
-            this.labelVolume.Text = "Volume";
+            labelVolume.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            labelVolume.AutoSize = true;
+            labelVolume.Location = new Point(537, 51);
+            labelVolume.Margin = new Padding(2, 0, 2, 0);
+            labelVolume.Name = "labelVolume";
+            labelVolume.Size = new Size(47, 15);
+            labelVolume.TabIndex = 0;
+            labelVolume.Text = "Volume";
             // 
             // label20
             // 
-            this.label20.AutoSize = true;
-            this.label20.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            this.label20.Location = new System.Drawing.Point(6, 77);
-            this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(73, 20);
-            this.label20.TabIndex = 33;
-            this.label20.Text = "Song File:";
+            label20.AutoSize = true;
+            label20.Font = new Font("Segoe UI", 11F, FontStyle.Regular, GraphicsUnit.Point);
+            label20.Location = new Point(6, 77);
+            label20.Name = "label20";
+            label20.Size = new Size(73, 20);
+            label20.TabIndex = 33;
+            label20.Text = "Song File:";
             // 
             // songTrackBar
             // 
-            this.songTrackBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.songTrackBar.Location = new System.Drawing.Point(98, 22);
-            this.songTrackBar.Name = "songTrackBar";
-            this.songTrackBar.Size = new System.Drawing.Size(627, 45);
-            this.songTrackBar.TabIndex = 2;
-            this.songTrackBar.TickStyle = System.Windows.Forms.TickStyle.None;
-            this.songTrackBar.ValueChanged += new System.EventHandler(this.songTrackBar_ValueChanged);
-            this.songTrackBar.MouseDown += new System.Windows.Forms.MouseEventHandler(this.songTrackBar_MouseDown);
+            songTrackBar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            songTrackBar.Location = new Point(98, 22);
+            songTrackBar.Name = "songTrackBar";
+            songTrackBar.Size = new Size(627, 45);
+            songTrackBar.TabIndex = 2;
+            songTrackBar.TickStyle = TickStyle.None;
+            songTrackBar.ValueChanged += songTrackBar_ValueChanged;
+            songTrackBar.MouseDown += songTrackBar_MouseDown;
             // 
             // selectSongButton
             // 
-            this.selectSongButton.Location = new System.Drawing.Point(6, 51);
-            this.selectSongButton.Name = "selectSongButton";
-            this.selectSongButton.Size = new System.Drawing.Size(86, 23);
-            this.selectSongButton.TabIndex = 1;
-            this.selectSongButton.Text = "Select Song";
-            this.selectSongButton.UseVisualStyleBackColor = true;
-            this.selectSongButton.Click += new System.EventHandler(this.selectSongButton_Click);
+            selectSongButton.Location = new Point(6, 51);
+            selectSongButton.Name = "selectSongButton";
+            selectSongButton.Size = new Size(86, 23);
+            selectSongButton.TabIndex = 1;
+            selectSongButton.Text = "Select Song";
+            selectSongButton.UseVisualStyleBackColor = true;
+            selectSongButton.Click += selectSongButton_Click;
             // 
             // playButton
             // 
-            this.playButton.Location = new System.Drawing.Point(6, 22);
-            this.playButton.Name = "playButton";
-            this.playButton.Size = new System.Drawing.Size(86, 23);
-            this.playButton.TabIndex = 0;
-            this.playButton.Text = "Play";
-            this.playButton.UseVisualStyleBackColor = true;
-            this.playButton.Click += new System.EventHandler(this.playButton_Click);
+            playButton.Location = new Point(6, 22);
+            playButton.Name = "playButton";
+            playButton.Size = new Size(86, 23);
+            playButton.TabIndex = 0;
+            playButton.Text = "Play";
+            playButton.UseVisualStyleBackColor = true;
+            playButton.Click += playButton_Click;
             // 
             // openSongDialog
             // 
-            this.openSongDialog.Filter = "Audio Files (*.ogg;*.wav)|*.ogg;*.wav|All Files (*.*)|*.*";
+            openSongDialog.Filter = "Audio Files (*.ogg;*.wav)|*.ogg;*.wav|All Files (*.*)|*.*";
             // 
             // updateTimer
             // 
-            this.updateTimer.Interval = 20;
-            this.updateTimer.Tick += new System.EventHandler(this.updateTimer_Tick);
+            updateTimer.Interval = 20;
+            updateTimer.Tick += updateTimer_Tick;
             // 
             // groupBox9
             // 
-            this.groupBox9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupBox9.Controls.Add(this.label21);
-            this.groupBox9.Controls.Add(this.visualHispeedNumeric);
-            this.groupBox9.Location = new System.Drawing.Point(754, 657);
-            this.groupBox9.Name = "groupBox9";
-            this.groupBox9.Size = new System.Drawing.Size(114, 118);
-            this.groupBox9.TabIndex = 0;
-            this.groupBox9.TabStop = false;
-            this.groupBox9.Text = "Visual Settings";
+            groupBox9.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            groupBox9.Controls.Add(label21);
+            groupBox9.Controls.Add(visualHispeedNumeric);
+            groupBox9.Location = new Point(754, 657);
+            groupBox9.Name = "groupBox9";
+            groupBox9.Size = new Size(114, 118);
+            groupBox9.TabIndex = 0;
+            groupBox9.TabStop = false;
+            groupBox9.Text = "Visual Settings";
             // 
             // label21
             // 
-            this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(6, 19);
-            this.label21.Name = "label21";
-            this.label21.Size = new System.Drawing.Size(59, 15);
-            this.label21.TabIndex = 11;
-            this.label21.Text = "Hi-Speed:";
+            label21.AutoSize = true;
+            label21.Location = new Point(6, 19);
+            label21.Name = "label21";
+            label21.Size = new Size(59, 15);
+            label21.TabIndex = 11;
+            label21.Text = "Hi-Speed:";
             // 
             // visualHispeedNumeric
             // 
-            this.visualHispeedNumeric.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.visualHispeedNumeric.DecimalPlaces = 1;
-            this.visualHispeedNumeric.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            this.visualHispeedNumeric.Increment = new decimal(new int[] {
-            1,
-            0,
-            0,
-            65536});
-            this.visualHispeedNumeric.Location = new System.Drawing.Point(6, 37);
-            this.visualHispeedNumeric.Maximum = new decimal(new int[] {
-            500,
-            0,
-            0,
-            0});
-            this.visualHispeedNumeric.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            65536});
-            this.visualHispeedNumeric.Name = "visualHispeedNumeric";
-            this.visualHispeedNumeric.Size = new System.Drawing.Size(102, 29);
-            this.visualHispeedNumeric.TabIndex = 11;
-            this.visualHispeedNumeric.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.visualHispeedNumeric.Value = new decimal(new int[] {
-            15,
-            0,
-            0,
-            65536});
-            this.visualHispeedNumeric.ValueChanged += new System.EventHandler(this.visualHispeedNumeric_ValueChanged);
+            visualHispeedNumeric.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            visualHispeedNumeric.DecimalPlaces = 1;
+            visualHispeedNumeric.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
+            visualHispeedNumeric.Increment = new decimal(new int[] { 1, 0, 0, 65536 });
+            visualHispeedNumeric.Location = new Point(6, 37);
+            visualHispeedNumeric.Maximum = new decimal(new int[] { 500, 0, 0, 0 });
+            visualHispeedNumeric.Minimum = new decimal(new int[] { 1, 0, 0, 65536 });
+            visualHispeedNumeric.Name = "visualHispeedNumeric";
+            visualHispeedNumeric.Size = new Size(102, 29);
+            visualHispeedNumeric.TabIndex = 11;
+            visualHispeedNumeric.TextAlign = HorizontalAlignment.Center;
+            visualHispeedNumeric.Value = new decimal(new int[] { 15, 0, 0, 65536 });
+            visualHispeedNumeric.ValueChanged += visualHispeedNumeric_ValueChanged;
             // 
             // insertButton
             // 
-            this.insertButton.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            this.insertButton.Location = new System.Drawing.Point(12, 612);
-            this.insertButton.Name = "insertButton";
-            this.insertButton.Size = new System.Drawing.Size(239, 39);
-            this.insertButton.TabIndex = 12;
-            this.insertButton.Text = "Insert Object (I)";
-            this.insertButton.UseVisualStyleBackColor = true;
-            this.insertButton.Click += new System.EventHandler(this.insertButton_Click);
+            insertButton.Font = new Font("Segoe UI", 11F, FontStyle.Regular, GraphicsUnit.Point);
+            insertButton.Location = new Point(12, 612);
+            insertButton.Name = "insertButton";
+            insertButton.Size = new Size(239, 39);
+            insertButton.TabIndex = 12;
+            insertButton.Text = "Insert Object (I)";
+            insertButton.UseVisualStyleBackColor = true;
+            insertButton.Click += insertButton_Click;
             // 
             // fileToolStripMenuItem
             // 
-            this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.newToolStripMenuItem,
-            this.openToolStripMenuItem,
-            this.saveToolStripMenuItem,
-            this.saveAsToolStripMenuItem,
-            this.exitToolStripMenuItem});
-            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
-            this.fileToolStripMenuItem.Text = "File";
+            fileToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { newToolStripMenuItem, openToolStripMenuItem, saveToolStripMenuItem, saveAsToolStripMenuItem, exitToolStripMenuItem });
+            fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+            fileToolStripMenuItem.Size = new Size(37, 20);
+            fileToolStripMenuItem.Text = "File";
             // 
             // newToolStripMenuItem
             // 
-            this.newToolStripMenuItem.Name = "newToolStripMenuItem";
-            this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
-            this.newToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
-            this.newToolStripMenuItem.Text = "New";
-            this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
+            newToolStripMenuItem.Name = "newToolStripMenuItem";
+            newToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.N;
+            newToolStripMenuItem.Size = new Size(186, 22);
+            newToolStripMenuItem.Text = "New";
+            newToolStripMenuItem.Click += newToolStripMenuItem_Click;
             // 
             // openToolStripMenuItem
             // 
-            this.openToolStripMenuItem.Name = "openToolStripMenuItem";
-            this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
-            this.openToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
-            this.openToolStripMenuItem.Text = "Open";
-            this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
+            openToolStripMenuItem.Name = "openToolStripMenuItem";
+            openToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.O;
+            openToolStripMenuItem.Size = new Size(186, 22);
+            openToolStripMenuItem.Text = "Open";
+            openToolStripMenuItem.Click += openToolStripMenuItem_Click;
             // 
             // saveToolStripMenuItem
             // 
-            this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
-            this.saveToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
-            this.saveToolStripMenuItem.Text = "Save";
-            this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
+            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
+            saveToolStripMenuItem.Size = new Size(186, 22);
+            saveToolStripMenuItem.Text = "Save";
+            saveToolStripMenuItem.Click += saveToolStripMenuItem_Click;
             // 
             // saveAsToolStripMenuItem
             // 
-            this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
-            this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.S)));
-            this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
-            this.saveAsToolStripMenuItem.Text = "Save As";
-            this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click);
+            saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
+            saveAsToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.Shift | Keys.S;
+            saveAsToolStripMenuItem.Size = new Size(186, 22);
+            saveAsToolStripMenuItem.Text = "Save As";
+            saveAsToolStripMenuItem.Click += saveAsToolStripMenuItem_Click;
             // 
             // exitToolStripMenuItem
             // 
-            this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-            this.exitToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
-            this.exitToolStripMenuItem.Text = "Exit";
-            this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
+            exitToolStripMenuItem.Name = "exitToolStripMenuItem";
+            exitToolStripMenuItem.Size = new Size(186, 22);
+            exitToolStripMenuItem.Text = "Exit";
+            exitToolStripMenuItem.Click += exitToolStripMenuItem_Click;
             // 
             // viewToolStripMenuItem
             // 
-            this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.showCursorToolStripMenuItem,
-            this.showCursorDuringPlaybackToolStripMenuItem,
-            this.highlightViewedNoteToolStripMenuItem,
-            this.selectLastInsertedNoteToolStripMenuItem,
-            this.showGimmicksInCircleViewToolStripMenuItem,
-            this.showGimmicksDuringPlaybackToolStripMenuItem});
-            this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
-            this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
-            this.viewToolStripMenuItem.Text = "View";
+            viewToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { showCursorToolStripMenuItem, showCursorDuringPlaybackToolStripMenuItem, highlightViewedNoteToolStripMenuItem, selectLastInsertedNoteToolStripMenuItem, showGimmicksInCircleViewToolStripMenuItem, showGimmicksDuringPlaybackToolStripMenuItem });
+            viewToolStripMenuItem.Name = "viewToolStripMenuItem";
+            viewToolStripMenuItem.Size = new Size(44, 20);
+            viewToolStripMenuItem.Text = "View";
             // 
             // showCursorToolStripMenuItem
             // 
-            this.showCursorToolStripMenuItem.Checked = true;
-            this.showCursorToolStripMenuItem.CheckOnClick = true;
-            this.showCursorToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.showCursorToolStripMenuItem.Name = "showCursorToolStripMenuItem";
-            this.showCursorToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
-            this.showCursorToolStripMenuItem.Text = "Show Cursor";
-            this.showCursorToolStripMenuItem.Click += new System.EventHandler(this.showCursorToolStripMenuItem_Click);
+            showCursorToolStripMenuItem.Checked = true;
+            showCursorToolStripMenuItem.CheckOnClick = true;
+            showCursorToolStripMenuItem.CheckState = CheckState.Checked;
+            showCursorToolStripMenuItem.Name = "showCursorToolStripMenuItem";
+            showCursorToolStripMenuItem.Size = new Size(248, 22);
+            showCursorToolStripMenuItem.Text = "Show Cursor";
+            showCursorToolStripMenuItem.Click += showCursorToolStripMenuItem_Click;
             // 
             // showCursorDuringPlaybackToolStripMenuItem
             // 
-            this.showCursorDuringPlaybackToolStripMenuItem.Name = "showCursorDuringPlaybackToolStripMenuItem";
-            this.showCursorDuringPlaybackToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
-            this.showCursorDuringPlaybackToolStripMenuItem.Text = "Show Cursor During Playback";
+            showCursorDuringPlaybackToolStripMenuItem.Name = "showCursorDuringPlaybackToolStripMenuItem";
+            showCursorDuringPlaybackToolStripMenuItem.Size = new Size(248, 22);
+            showCursorDuringPlaybackToolStripMenuItem.Text = "Show Cursor During Playback";
             // 
             // highlightViewedNoteToolStripMenuItem
             // 
-            this.highlightViewedNoteToolStripMenuItem.Checked = true;
-            this.highlightViewedNoteToolStripMenuItem.CheckOnClick = true;
-            this.highlightViewedNoteToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.highlightViewedNoteToolStripMenuItem.Name = "highlightViewedNoteToolStripMenuItem";
-            this.highlightViewedNoteToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
-            this.highlightViewedNoteToolStripMenuItem.Text = "Highlight Viewed Note";
+            highlightViewedNoteToolStripMenuItem.Checked = true;
+            highlightViewedNoteToolStripMenuItem.CheckOnClick = true;
+            highlightViewedNoteToolStripMenuItem.CheckState = CheckState.Checked;
+            highlightViewedNoteToolStripMenuItem.Name = "highlightViewedNoteToolStripMenuItem";
+            highlightViewedNoteToolStripMenuItem.Size = new Size(248, 22);
+            highlightViewedNoteToolStripMenuItem.Text = "Highlight Viewed Note";
             // 
             // selectLastInsertedNoteToolStripMenuItem
             // 
-            this.selectLastInsertedNoteToolStripMenuItem.Checked = true;
-            this.selectLastInsertedNoteToolStripMenuItem.CheckOnClick = true;
-            this.selectLastInsertedNoteToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.selectLastInsertedNoteToolStripMenuItem.Name = "selectLastInsertedNoteToolStripMenuItem";
-            this.selectLastInsertedNoteToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
-            this.selectLastInsertedNoteToolStripMenuItem.Text = "Select Last Inserted Note";
+            selectLastInsertedNoteToolStripMenuItem.Checked = true;
+            selectLastInsertedNoteToolStripMenuItem.CheckOnClick = true;
+            selectLastInsertedNoteToolStripMenuItem.CheckState = CheckState.Checked;
+            selectLastInsertedNoteToolStripMenuItem.Name = "selectLastInsertedNoteToolStripMenuItem";
+            selectLastInsertedNoteToolStripMenuItem.Size = new Size(248, 22);
+            selectLastInsertedNoteToolStripMenuItem.Text = "Select Last Inserted Note";
             // 
             // showGimmicksInCircleViewToolStripMenuItem
             // 
-            this.showGimmicksInCircleViewToolStripMenuItem.Checked = true;
-            this.showGimmicksInCircleViewToolStripMenuItem.CheckOnClick = true;
-            this.showGimmicksInCircleViewToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.showGimmicksInCircleViewToolStripMenuItem.Name = "showGimmicksInCircleViewToolStripMenuItem";
-            this.showGimmicksInCircleViewToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
-            this.showGimmicksInCircleViewToolStripMenuItem.Text = "Show Gimmicks In Circle View";
-            this.showGimmicksInCircleViewToolStripMenuItem.Click += new System.EventHandler(this.showGimmicksInCircleViewToolStripMenuItem_Click);
+            showGimmicksInCircleViewToolStripMenuItem.Checked = true;
+            showGimmicksInCircleViewToolStripMenuItem.CheckOnClick = true;
+            showGimmicksInCircleViewToolStripMenuItem.CheckState = CheckState.Checked;
+            showGimmicksInCircleViewToolStripMenuItem.Name = "showGimmicksInCircleViewToolStripMenuItem";
+            showGimmicksInCircleViewToolStripMenuItem.Size = new Size(248, 22);
+            showGimmicksInCircleViewToolStripMenuItem.Text = "Show Gimmicks In Circle View";
+            showGimmicksInCircleViewToolStripMenuItem.Click += showGimmicksInCircleViewToolStripMenuItem_Click;
             // 
             // showGimmicksDuringPlaybackToolStripMenuItem
             // 
-            this.showGimmicksDuringPlaybackToolStripMenuItem.CheckOnClick = true;
-            this.showGimmicksDuringPlaybackToolStripMenuItem.Name = "showGimmicksDuringPlaybackToolStripMenuItem";
-            this.showGimmicksDuringPlaybackToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
-            this.showGimmicksDuringPlaybackToolStripMenuItem.Text = "Show Gimmicks During Playback";
-            this.showGimmicksDuringPlaybackToolStripMenuItem.Click += new System.EventHandler(this.showGimmicksDuringPlaybackToolStripMenuItem_Click);
+            showGimmicksDuringPlaybackToolStripMenuItem.CheckOnClick = true;
+            showGimmicksDuringPlaybackToolStripMenuItem.Name = "showGimmicksDuringPlaybackToolStripMenuItem";
+            showGimmicksDuringPlaybackToolStripMenuItem.Size = new Size(248, 22);
+            showGimmicksDuringPlaybackToolStripMenuItem.Text = "Show Gimmicks During Playback";
+            showGimmicksDuringPlaybackToolStripMenuItem.Click += showGimmicksDuringPlaybackToolStripMenuItem_Click;
             // 
             // chartToolStripMenuItem
             // 
-            this.chartToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.initialChartSettingsToolStripMenuItem});
-            this.chartToolStripMenuItem.Name = "chartToolStripMenuItem";
-            this.chartToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
-            this.chartToolStripMenuItem.Text = "Chart";
+            chartToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { initialChartSettingsToolStripMenuItem });
+            chartToolStripMenuItem.Name = "chartToolStripMenuItem";
+            chartToolStripMenuItem.Size = new Size(48, 20);
+            chartToolStripMenuItem.Text = "Chart";
             // 
             // initialChartSettingsToolStripMenuItem
             // 
-            this.initialChartSettingsToolStripMenuItem.Name = "initialChartSettingsToolStripMenuItem";
-            this.initialChartSettingsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.initialChartSettingsToolStripMenuItem.Text = "Initial Chart Settings";
-            this.initialChartSettingsToolStripMenuItem.Click += new System.EventHandler(this.initialChartSettingsToolStripMenuItem_Click);
+            initialChartSettingsToolStripMenuItem.Name = "initialChartSettingsToolStripMenuItem";
+            initialChartSettingsToolStripMenuItem.Size = new Size(180, 22);
+            initialChartSettingsToolStripMenuItem.Text = "Initial Chart Settings";
+            initialChartSettingsToolStripMenuItem.Click += initialChartSettingsToolStripMenuItem_Click;
             // 
             // aboutToolStripMenuItem
             // 
-            this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(52, 20);
-            this.aboutToolStripMenuItem.Text = "About";
-            this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
+            aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
+            aboutToolStripMenuItem.Size = new Size(52, 20);
+            aboutToolStripMenuItem.Text = "About";
+            aboutToolStripMenuItem.Click += aboutToolStripMenuItem_Click;
             // 
             // menuStrip
             // 
-            this.menuStrip.BackColor = System.Drawing.SystemColors.ControlDark;
-            this.menuStrip.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            this.menuStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
-            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.fileToolStripMenuItem,
-            this.editToolStripMenuItem,
-            this.viewToolStripMenuItem,
-            this.chartToolStripMenuItem,
-            this.aboutToolStripMenuItem});
-            this.menuStrip.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip.Name = "menuStrip";
-            this.menuStrip.Size = new System.Drawing.Size(1142, 24);
-            this.menuStrip.TabIndex = 0;
-            this.menuStrip.Text = "menuStrip1";
+            menuStrip.BackColor = SystemColors.ControlDark;
+            menuStrip.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
+            menuStrip.ImageScalingSize = new Size(24, 24);
+            menuStrip.Items.AddRange(new ToolStripItem[] { fileToolStripMenuItem, editToolStripMenuItem, viewToolStripMenuItem, chartToolStripMenuItem, aboutToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.Size = new Size(1142, 24);
+            menuStrip.TabIndex = 0;
+            menuStrip.Text = "menuStrip1";
             // 
             // editToolStripMenuItem
             // 
-            this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.undoToolStripMenuItem,
-            this.redoToolStripMenuItem});
-            this.editToolStripMenuItem.Name = "editToolStripMenuItem";
-            this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
-            this.editToolStripMenuItem.Text = "Edit";
+            editToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { undoToolStripMenuItem, redoToolStripMenuItem , toolStripSeparator1, dragPlaceNoteToolStripMenuItem });
+            editToolStripMenuItem.Name = "editToolStripMenuItem";
+            editToolStripMenuItem.Size = new Size(39, 20);
+            editToolStripMenuItem.Text = "Edit";
             // 
             // undoToolStripMenuItem
             // 
-            this.undoToolStripMenuItem.Name = "undoToolStripMenuItem";
-            this.undoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z)));
-            this.undoToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
-            this.undoToolStripMenuItem.Text = "Undo";
-            this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click);
+            undoToolStripMenuItem.Name = "undoToolStripMenuItem";
+            undoToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.Z;
+            undoToolStripMenuItem.Size = new Size(180, 22);
+            undoToolStripMenuItem.Text = "Undo";
+            undoToolStripMenuItem.Click += undoToolStripMenuItem_Click;
             // 
             // redoToolStripMenuItem
             // 
-            this.redoToolStripMenuItem.Name = "redoToolStripMenuItem";
-            this.redoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y)));
-            this.redoToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
-            this.redoToolStripMenuItem.Text = "Redo";
-            this.redoToolStripMenuItem.Click += new System.EventHandler(this.redoToolStripMenuItem_Click);
+            redoToolStripMenuItem.Name = "redoToolStripMenuItem";
+            redoToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.Y;
+            redoToolStripMenuItem.Size = new Size(180, 22);
+            redoToolStripMenuItem.Text = "Redo";
+            redoToolStripMenuItem.Click += redoToolStripMenuItem_Click;
             // 
             // groupBox6
             // 
-            this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupBox6.Controls.Add(this.gimmickJumpToCurrTimeButton);
-            this.groupBox6.Controls.Add(this.gimmickDeleteButton);
-            this.groupBox6.Controls.Add(this.gimmickEditButton);
-            this.groupBox6.Controls.Add(this.gimmickBeatLabel);
-            this.groupBox6.Controls.Add(this.gimmickValueLabel);
-            this.groupBox6.Controls.Add(this.gimmickTypeLabel);
-            this.groupBox6.Controls.Add(this.gimmickMeasureLabel);
-            this.groupBox6.Controls.Add(this.label8);
-            this.groupBox6.Controls.Add(this.label7);
-            this.groupBox6.Controls.Add(this.label6);
-            this.groupBox6.Controls.Add(this.label5);
-            this.groupBox6.Controls.Add(this.gimmickNextButton);
-            this.groupBox6.Controls.Add(this.gimmickPrevButton);
-            this.groupBox6.Location = new System.Drawing.Point(874, 602);
-            this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(256, 173);
-            this.groupBox6.TabIndex = 33;
-            this.groupBox6.TabStop = false;
-            this.groupBox6.Text = "Gimmick View";
+            groupBox6.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            groupBox6.Controls.Add(gimmickJumpToCurrTimeButton);
+            groupBox6.Controls.Add(gimmickDeleteButton);
+            groupBox6.Controls.Add(gimmickEditButton);
+            groupBox6.Controls.Add(gimmickBeatLabel);
+            groupBox6.Controls.Add(gimmickValueLabel);
+            groupBox6.Controls.Add(gimmickTypeLabel);
+            groupBox6.Controls.Add(gimmickMeasureLabel);
+            groupBox6.Controls.Add(label8);
+            groupBox6.Controls.Add(label7);
+            groupBox6.Controls.Add(label6);
+            groupBox6.Controls.Add(label5);
+            groupBox6.Controls.Add(gimmickNextButton);
+            groupBox6.Controls.Add(gimmickPrevButton);
+            groupBox6.Location = new Point(874, 602);
+            groupBox6.Name = "groupBox6";
+            groupBox6.Size = new Size(256, 173);
+            groupBox6.TabIndex = 33;
+            groupBox6.TabStop = false;
+            groupBox6.Text = "Gimmick View";
             // 
             // gimmickJumpToCurrTimeButton
             // 
-            this.gimmickJumpToCurrTimeButton.Location = new System.Drawing.Point(7, 48);
-            this.gimmickJumpToCurrTimeButton.Name = "gimmickJumpToCurrTimeButton";
-            this.gimmickJumpToCurrTimeButton.Size = new System.Drawing.Size(243, 23);
-            this.gimmickJumpToCurrTimeButton.TabIndex = 14;
-            this.gimmickJumpToCurrTimeButton.Text = "Jump To Nearest Gimmick @ Current Time";
-            this.gimmickJumpToCurrTimeButton.UseVisualStyleBackColor = true;
-            this.gimmickJumpToCurrTimeButton.Click += new System.EventHandler(this.gimmickJumpToCurrTimeButton_Click);
+            gimmickJumpToCurrTimeButton.Location = new Point(7, 48);
+            gimmickJumpToCurrTimeButton.Name = "gimmickJumpToCurrTimeButton";
+            gimmickJumpToCurrTimeButton.Size = new Size(243, 23);
+            gimmickJumpToCurrTimeButton.TabIndex = 14;
+            gimmickJumpToCurrTimeButton.Text = "Jump To Nearest Gimmick @ Current Time";
+            gimmickJumpToCurrTimeButton.UseVisualStyleBackColor = true;
+            gimmickJumpToCurrTimeButton.Click += gimmickJumpToCurrTimeButton_Click;
             // 
             // gimmickDeleteButton
             // 
-            this.gimmickDeleteButton.ForeColor = System.Drawing.Color.Red;
-            this.gimmickDeleteButton.Location = new System.Drawing.Point(134, 139);
-            this.gimmickDeleteButton.Name = "gimmickDeleteButton";
-            this.gimmickDeleteButton.Size = new System.Drawing.Size(113, 23);
-            this.gimmickDeleteButton.TabIndex = 11;
-            this.gimmickDeleteButton.Text = "Delete Gimmick";
-            this.gimmickDeleteButton.UseVisualStyleBackColor = true;
-            this.gimmickDeleteButton.Click += new System.EventHandler(this.gimmickDeleteButton_Click);
+            gimmickDeleteButton.ForeColor = Color.Red;
+            gimmickDeleteButton.Location = new Point(134, 139);
+            gimmickDeleteButton.Name = "gimmickDeleteButton";
+            gimmickDeleteButton.Size = new Size(113, 23);
+            gimmickDeleteButton.TabIndex = 11;
+            gimmickDeleteButton.Text = "Delete Gimmick";
+            gimmickDeleteButton.UseVisualStyleBackColor = true;
+            gimmickDeleteButton.Click += gimmickDeleteButton_Click;
             // 
             // gimmickEditButton
             // 
-            this.gimmickEditButton.Location = new System.Drawing.Point(6, 139);
-            this.gimmickEditButton.Name = "gimmickEditButton";
-            this.gimmickEditButton.Size = new System.Drawing.Size(113, 23);
-            this.gimmickEditButton.TabIndex = 10;
-            this.gimmickEditButton.Text = "Edit Gimmick";
-            this.gimmickEditButton.UseVisualStyleBackColor = true;
-            this.gimmickEditButton.Click += new System.EventHandler(this.gimmickEditButton_Click);
+            gimmickEditButton.Location = new Point(6, 139);
+            gimmickEditButton.Name = "gimmickEditButton";
+            gimmickEditButton.Size = new Size(113, 23);
+            gimmickEditButton.TabIndex = 10;
+            gimmickEditButton.Text = "Edit Gimmick";
+            gimmickEditButton.UseVisualStyleBackColor = true;
+            gimmickEditButton.Click += gimmickEditButton_Click;
             // 
             // gimmickBeatLabel
             // 
-            this.gimmickBeatLabel.AutoSize = true;
-            this.gimmickBeatLabel.Location = new System.Drawing.Point(173, 78);
-            this.gimmickBeatLabel.Name = "gimmickBeatLabel";
-            this.gimmickBeatLabel.Size = new System.Drawing.Size(36, 15);
-            this.gimmickBeatLabel.TabIndex = 9;
-            this.gimmickBeatLabel.Text = "None";
+            gimmickBeatLabel.AutoSize = true;
+            gimmickBeatLabel.Location = new Point(173, 78);
+            gimmickBeatLabel.Name = "gimmickBeatLabel";
+            gimmickBeatLabel.Size = new Size(36, 15);
+            gimmickBeatLabel.TabIndex = 9;
+            gimmickBeatLabel.Text = "None";
             // 
             // gimmickValueLabel
             // 
-            this.gimmickValueLabel.AutoSize = true;
-            this.gimmickValueLabel.Location = new System.Drawing.Point(76, 120);
-            this.gimmickValueLabel.Name = "gimmickValueLabel";
-            this.gimmickValueLabel.Size = new System.Drawing.Size(36, 15);
-            this.gimmickValueLabel.TabIndex = 8;
-            this.gimmickValueLabel.Text = "None";
+            gimmickValueLabel.AutoSize = true;
+            gimmickValueLabel.Location = new Point(76, 120);
+            gimmickValueLabel.Name = "gimmickValueLabel";
+            gimmickValueLabel.Size = new Size(36, 15);
+            gimmickValueLabel.TabIndex = 8;
+            gimmickValueLabel.Text = "None";
             // 
             // gimmickTypeLabel
             // 
-            this.gimmickTypeLabel.AutoSize = true;
-            this.gimmickTypeLabel.Location = new System.Drawing.Point(76, 99);
-            this.gimmickTypeLabel.Name = "gimmickTypeLabel";
-            this.gimmickTypeLabel.Size = new System.Drawing.Size(36, 15);
-            this.gimmickTypeLabel.TabIndex = 7;
-            this.gimmickTypeLabel.Text = "None";
+            gimmickTypeLabel.AutoSize = true;
+            gimmickTypeLabel.Location = new Point(76, 99);
+            gimmickTypeLabel.Name = "gimmickTypeLabel";
+            gimmickTypeLabel.Size = new Size(36, 15);
+            gimmickTypeLabel.TabIndex = 7;
+            gimmickTypeLabel.Text = "None";
             // 
             // gimmickMeasureLabel
             // 
-            this.gimmickMeasureLabel.AutoSize = true;
-            this.gimmickMeasureLabel.Location = new System.Drawing.Point(76, 78);
-            this.gimmickMeasureLabel.Name = "gimmickMeasureLabel";
-            this.gimmickMeasureLabel.Size = new System.Drawing.Size(36, 15);
-            this.gimmickMeasureLabel.TabIndex = 6;
-            this.gimmickMeasureLabel.Text = "None";
+            gimmickMeasureLabel.AutoSize = true;
+            gimmickMeasureLabel.Location = new Point(76, 78);
+            gimmickMeasureLabel.Name = "gimmickMeasureLabel";
+            gimmickMeasureLabel.Size = new Size(36, 15);
+            gimmickMeasureLabel.TabIndex = 6;
+            gimmickMeasureLabel.Text = "None";
             // 
             // label8
             // 
-            this.label8.AutoSize = true;
-            this.label8.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
-            this.label8.Location = new System.Drawing.Point(128, 76);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(39, 17);
-            this.label8.TabIndex = 5;
-            this.label8.Text = "Beat:";
+            label8.AutoSize = true;
+            label8.Font = new Font("Segoe UI", 9.75F, FontStyle.Bold, GraphicsUnit.Point);
+            label8.Location = new Point(128, 76);
+            label8.Name = "label8";
+            label8.Size = new Size(39, 17);
+            label8.TabIndex = 5;
+            label8.Text = "Beat:";
             // 
             // label7
             // 
-            this.label7.AutoSize = true;
-            this.label7.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
-            this.label7.Location = new System.Drawing.Point(24, 118);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(46, 17);
-            this.label7.TabIndex = 4;
-            this.label7.Text = "Value:";
+            label7.AutoSize = true;
+            label7.Font = new Font("Segoe UI", 9.75F, FontStyle.Bold, GraphicsUnit.Point);
+            label7.Location = new Point(24, 118);
+            label7.Name = "label7";
+            label7.Size = new Size(46, 17);
+            label7.TabIndex = 4;
+            label7.Text = "Value:";
             // 
             // label6
             // 
-            this.label6.AutoSize = true;
-            this.label6.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
-            this.label6.Location = new System.Drawing.Point(29, 97);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(41, 17);
-            this.label6.TabIndex = 3;
-            this.label6.Text = "Type:";
+            label6.AutoSize = true;
+            label6.Font = new Font("Segoe UI", 9.75F, FontStyle.Bold, GraphicsUnit.Point);
+            label6.Location = new Point(29, 97);
+            label6.Name = "label6";
+            label6.Size = new Size(41, 17);
+            label6.TabIndex = 3;
+            label6.Text = "Type:";
             // 
             // label5
             // 
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
-            this.label5.Location = new System.Drawing.Point(6, 76);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(64, 17);
-            this.label5.TabIndex = 2;
-            this.label5.Text = "Measure:";
+            label5.AutoSize = true;
+            label5.Font = new Font("Segoe UI", 9.75F, FontStyle.Bold, GraphicsUnit.Point);
+            label5.Location = new Point(6, 76);
+            label5.Name = "label5";
+            label5.Size = new Size(64, 17);
+            label5.TabIndex = 2;
+            label5.Text = "Measure:";
             // 
             // gimmickNextButton
             // 
-            this.gimmickNextButton.Location = new System.Drawing.Point(134, 19);
-            this.gimmickNextButton.Name = "gimmickNextButton";
-            this.gimmickNextButton.Size = new System.Drawing.Size(116, 23);
-            this.gimmickNextButton.TabIndex = 1;
-            this.gimmickNextButton.Text = "Next Gimmick";
-            this.gimmickNextButton.UseVisualStyleBackColor = true;
-            this.gimmickNextButton.Click += new System.EventHandler(this.gimmickNextButton_Click);
+            gimmickNextButton.Location = new Point(134, 19);
+            gimmickNextButton.Name = "gimmickNextButton";
+            gimmickNextButton.Size = new Size(116, 23);
+            gimmickNextButton.TabIndex = 1;
+            gimmickNextButton.Text = "Next Gimmick";
+            gimmickNextButton.UseVisualStyleBackColor = true;
+            gimmickNextButton.Click += gimmickNextButton_Click;
             // 
             // gimmickPrevButton
             // 
-            this.gimmickPrevButton.Location = new System.Drawing.Point(6, 19);
-            this.gimmickPrevButton.Name = "gimmickPrevButton";
-            this.gimmickPrevButton.Size = new System.Drawing.Size(116, 23);
-            this.gimmickPrevButton.TabIndex = 0;
-            this.gimmickPrevButton.Text = "Previous Gimmick";
-            this.gimmickPrevButton.UseVisualStyleBackColor = true;
-            this.gimmickPrevButton.Click += new System.EventHandler(this.gimmickPrevButton_Click);
+            gimmickPrevButton.Location = new Point(6, 19);
+            gimmickPrevButton.Name = "gimmickPrevButton";
+            gimmickPrevButton.Size = new Size(116, 23);
+            gimmickPrevButton.TabIndex = 0;
+            gimmickPrevButton.Text = "Previous Gimmick";
+            gimmickPrevButton.UseVisualStyleBackColor = true;
+            gimmickPrevButton.Click += gimmickPrevButton_Click;
             // 
             // noteViewGroupBox
             // 
-            this.noteViewGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.noteViewGroupBox.Controls.Add(this.noteMaskLabel);
-            this.noteViewGroupBox.Controls.Add(this.label9);
-            this.noteViewGroupBox.Controls.Add(this.noteSizeLabel);
-            this.noteViewGroupBox.Controls.Add(this.label17);
-            this.noteViewGroupBox.Controls.Add(this.noteJumpToCurrTimeButton);
-            this.noteViewGroupBox.Controls.Add(this.noteDeleteSelectedButton);
-            this.noteViewGroupBox.Controls.Add(this.noteEditSelectedButton);
-            this.noteViewGroupBox.Controls.Add(this.noteBeatLabel);
-            this.noteViewGroupBox.Controls.Add(this.notePositionLabel);
-            this.noteViewGroupBox.Controls.Add(this.noteTypeLabel);
-            this.noteViewGroupBox.Controls.Add(this.noteMeasureLabel);
-            this.noteViewGroupBox.Controls.Add(this.label13);
-            this.noteViewGroupBox.Controls.Add(this.label14);
-            this.noteViewGroupBox.Controls.Add(this.label15);
-            this.noteViewGroupBox.Controls.Add(this.label16);
-            this.noteViewGroupBox.Controls.Add(this.noteNextButton);
-            this.noteViewGroupBox.Controls.Add(this.notePrevButton);
-            this.noteViewGroupBox.Location = new System.Drawing.Point(874, 389);
-            this.noteViewGroupBox.Name = "noteViewGroupBox";
-            this.noteViewGroupBox.Size = new System.Drawing.Size(256, 207);
-            this.noteViewGroupBox.TabIndex = 34;
-            this.noteViewGroupBox.TabStop = false;
-            this.noteViewGroupBox.Text = "Note View";
+            noteViewGroupBox.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            noteViewGroupBox.Controls.Add(noteMaskLabel);
+            noteViewGroupBox.Controls.Add(label9);
+            noteViewGroupBox.Controls.Add(noteSizeLabel);
+            noteViewGroupBox.Controls.Add(label17);
+            noteViewGroupBox.Controls.Add(noteJumpToCurrTimeButton);
+            noteViewGroupBox.Controls.Add(noteDeleteSelectedButton);
+            noteViewGroupBox.Controls.Add(noteEditSelectedButton);
+            noteViewGroupBox.Controls.Add(noteBeatLabel);
+            noteViewGroupBox.Controls.Add(notePositionLabel);
+            noteViewGroupBox.Controls.Add(noteTypeLabel);
+            noteViewGroupBox.Controls.Add(noteMeasureLabel);
+            noteViewGroupBox.Controls.Add(label13);
+            noteViewGroupBox.Controls.Add(label14);
+            noteViewGroupBox.Controls.Add(label15);
+            noteViewGroupBox.Controls.Add(label16);
+            noteViewGroupBox.Controls.Add(noteNextButton);
+            noteViewGroupBox.Controls.Add(notePrevButton);
+            noteViewGroupBox.Location = new Point(874, 389);
+            noteViewGroupBox.Name = "noteViewGroupBox";
+            noteViewGroupBox.Size = new Size(256, 207);
+            noteViewGroupBox.TabIndex = 34;
+            noteViewGroupBox.TabStop = false;
+            noteViewGroupBox.Text = "Note View";
             // 
             // noteMaskLabel
             // 
-            this.noteMaskLabel.AutoSize = true;
-            this.noteMaskLabel.Location = new System.Drawing.Point(173, 139);
-            this.noteMaskLabel.Name = "noteMaskLabel";
-            this.noteMaskLabel.Size = new System.Drawing.Size(29, 15);
-            this.noteMaskLabel.TabIndex = 17;
-            this.noteMaskLabel.Text = "N/A";
+            noteMaskLabel.AutoSize = true;
+            noteMaskLabel.Location = new Point(173, 139);
+            noteMaskLabel.Name = "noteMaskLabel";
+            noteMaskLabel.Size = new Size(29, 15);
+            noteMaskLabel.TabIndex = 17;
+            noteMaskLabel.Text = "N/A";
             // 
             // label9
             // 
-            this.label9.AutoSize = true;
-            this.label9.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
-            this.label9.Location = new System.Drawing.Point(85, 137);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(82, 17);
-            this.label9.TabIndex = 16;
-            this.label9.Text = "Mask Value:";
+            label9.AutoSize = true;
+            label9.Font = new Font("Segoe UI", 9.75F, FontStyle.Bold, GraphicsUnit.Point);
+            label9.Location = new Point(85, 137);
+            label9.Name = "label9";
+            label9.Size = new Size(82, 17);
+            label9.TabIndex = 16;
+            label9.Text = "Mask Value:";
             // 
             // noteSizeLabel
             // 
-            this.noteSizeLabel.AutoSize = true;
-            this.noteSizeLabel.Location = new System.Drawing.Point(173, 118);
-            this.noteSizeLabel.Name = "noteSizeLabel";
-            this.noteSizeLabel.Size = new System.Drawing.Size(36, 15);
-            this.noteSizeLabel.TabIndex = 15;
-            this.noteSizeLabel.Text = "None";
+            noteSizeLabel.AutoSize = true;
+            noteSizeLabel.Location = new Point(173, 118);
+            noteSizeLabel.Name = "noteSizeLabel";
+            noteSizeLabel.Size = new Size(36, 15);
+            noteSizeLabel.TabIndex = 15;
+            noteSizeLabel.Text = "None";
             // 
             // label17
             // 
-            this.label17.AutoSize = true;
-            this.label17.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
-            this.label17.Location = new System.Drawing.Point(131, 116);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(36, 17);
-            this.label17.TabIndex = 14;
-            this.label17.Text = "Size:";
+            label17.AutoSize = true;
+            label17.Font = new Font("Segoe UI", 9.75F, FontStyle.Bold, GraphicsUnit.Point);
+            label17.Location = new Point(131, 116);
+            label17.Name = "label17";
+            label17.Size = new Size(36, 17);
+            label17.TabIndex = 14;
+            label17.Text = "Size:";
             // 
             // noteJumpToCurrTimeButton
             // 
-            this.noteJumpToCurrTimeButton.Location = new System.Drawing.Point(7, 48);
-            this.noteJumpToCurrTimeButton.Name = "noteJumpToCurrTimeButton";
-            this.noteJumpToCurrTimeButton.Size = new System.Drawing.Size(243, 23);
-            this.noteJumpToCurrTimeButton.TabIndex = 13;
-            this.noteJumpToCurrTimeButton.Text = "Jump To Nearest Note @ Current Time";
-            this.noteJumpToCurrTimeButton.UseVisualStyleBackColor = true;
-            this.noteJumpToCurrTimeButton.Click += new System.EventHandler(this.noteJumpToCurrTimeButton_Click);
+            noteJumpToCurrTimeButton.Location = new Point(7, 48);
+            noteJumpToCurrTimeButton.Name = "noteJumpToCurrTimeButton";
+            noteJumpToCurrTimeButton.Size = new Size(243, 23);
+            noteJumpToCurrTimeButton.TabIndex = 13;
+            noteJumpToCurrTimeButton.Text = "Jump To Nearest Note @ Current Time";
+            noteJumpToCurrTimeButton.UseVisualStyleBackColor = true;
+            noteJumpToCurrTimeButton.Click += noteJumpToCurrTimeButton_Click;
             // 
             // noteDeleteSelectedButton
             // 
-            this.noteDeleteSelectedButton.ForeColor = System.Drawing.Color.Red;
-            this.noteDeleteSelectedButton.Location = new System.Drawing.Point(134, 157);
-            this.noteDeleteSelectedButton.Name = "noteDeleteSelectedButton";
-            this.noteDeleteSelectedButton.Size = new System.Drawing.Size(113, 43);
-            this.noteDeleteSelectedButton.TabIndex = 11;
-            this.noteDeleteSelectedButton.Text = "Delete Selected Note";
-            this.noteDeleteSelectedButton.UseVisualStyleBackColor = true;
-            this.noteDeleteSelectedButton.Click += new System.EventHandler(this.noteDeleteSelectedButton_Click);
+            noteDeleteSelectedButton.ForeColor = Color.Red;
+            noteDeleteSelectedButton.Location = new Point(134, 157);
+            noteDeleteSelectedButton.Name = "noteDeleteSelectedButton";
+            noteDeleteSelectedButton.Size = new Size(113, 43);
+            noteDeleteSelectedButton.TabIndex = 11;
+            noteDeleteSelectedButton.Text = "Delete Selected Note";
+            noteDeleteSelectedButton.UseVisualStyleBackColor = true;
+            noteDeleteSelectedButton.Click += noteDeleteSelectedButton_Click;
             // 
             // noteEditSelectedButton
             // 
-            this.noteEditSelectedButton.Location = new System.Drawing.Point(6, 157);
-            this.noteEditSelectedButton.Name = "noteEditSelectedButton";
-            this.noteEditSelectedButton.Size = new System.Drawing.Size(113, 43);
-            this.noteEditSelectedButton.TabIndex = 10;
-            this.noteEditSelectedButton.Text = "Edit Selected Note";
-            this.noteEditSelectedButton.UseVisualStyleBackColor = true;
-            this.noteEditSelectedButton.Click += new System.EventHandler(this.noteEditSelectedButton_Click);
+            noteEditSelectedButton.Location = new Point(6, 157);
+            noteEditSelectedButton.Name = "noteEditSelectedButton";
+            noteEditSelectedButton.Size = new Size(113, 43);
+            noteEditSelectedButton.TabIndex = 10;
+            noteEditSelectedButton.Text = "Edit Selected Note";
+            noteEditSelectedButton.UseVisualStyleBackColor = true;
+            noteEditSelectedButton.Click += noteEditSelectedButton_Click;
             // 
             // noteBeatLabel
             // 
-            this.noteBeatLabel.AutoSize = true;
-            this.noteBeatLabel.Location = new System.Drawing.Point(173, 76);
-            this.noteBeatLabel.Name = "noteBeatLabel";
-            this.noteBeatLabel.Size = new System.Drawing.Size(36, 15);
-            this.noteBeatLabel.TabIndex = 9;
-            this.noteBeatLabel.Text = "None";
+            noteBeatLabel.AutoSize = true;
+            noteBeatLabel.Location = new Point(173, 76);
+            noteBeatLabel.Name = "noteBeatLabel";
+            noteBeatLabel.Size = new Size(36, 15);
+            noteBeatLabel.TabIndex = 9;
+            noteBeatLabel.Text = "None";
             // 
             // notePositionLabel
             // 
-            this.notePositionLabel.AutoSize = true;
-            this.notePositionLabel.Location = new System.Drawing.Point(76, 118);
-            this.notePositionLabel.Name = "notePositionLabel";
-            this.notePositionLabel.Size = new System.Drawing.Size(36, 15);
-            this.notePositionLabel.TabIndex = 8;
-            this.notePositionLabel.Text = "None";
+            notePositionLabel.AutoSize = true;
+            notePositionLabel.Location = new Point(76, 118);
+            notePositionLabel.Name = "notePositionLabel";
+            notePositionLabel.Size = new Size(36, 15);
+            notePositionLabel.TabIndex = 8;
+            notePositionLabel.Text = "None";
             // 
             // noteTypeLabel
             // 
-            this.noteTypeLabel.AutoSize = true;
-            this.noteTypeLabel.Location = new System.Drawing.Point(76, 97);
-            this.noteTypeLabel.Name = "noteTypeLabel";
-            this.noteTypeLabel.Size = new System.Drawing.Size(36, 15);
-            this.noteTypeLabel.TabIndex = 7;
-            this.noteTypeLabel.Text = "None";
+            noteTypeLabel.AutoSize = true;
+            noteTypeLabel.Location = new Point(76, 97);
+            noteTypeLabel.Name = "noteTypeLabel";
+            noteTypeLabel.Size = new Size(36, 15);
+            noteTypeLabel.TabIndex = 7;
+            noteTypeLabel.Text = "None";
             // 
             // noteMeasureLabel
             // 
-            this.noteMeasureLabel.AutoSize = true;
-            this.noteMeasureLabel.Location = new System.Drawing.Point(76, 76);
-            this.noteMeasureLabel.Name = "noteMeasureLabel";
-            this.noteMeasureLabel.Size = new System.Drawing.Size(36, 15);
-            this.noteMeasureLabel.TabIndex = 6;
-            this.noteMeasureLabel.Text = "None";
+            noteMeasureLabel.AutoSize = true;
+            noteMeasureLabel.Location = new Point(76, 76);
+            noteMeasureLabel.Name = "noteMeasureLabel";
+            noteMeasureLabel.Size = new Size(36, 15);
+            noteMeasureLabel.TabIndex = 6;
+            noteMeasureLabel.Text = "None";
             // 
             // label13
             // 
-            this.label13.AutoSize = true;
-            this.label13.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
-            this.label13.Location = new System.Drawing.Point(128, 74);
-            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(39, 17);
-            this.label13.TabIndex = 5;
-            this.label13.Text = "Beat:";
+            label13.AutoSize = true;
+            label13.Font = new Font("Segoe UI", 9.75F, FontStyle.Bold, GraphicsUnit.Point);
+            label13.Location = new Point(128, 74);
+            label13.Name = "label13";
+            label13.Size = new Size(39, 17);
+            label13.TabIndex = 5;
+            label13.Text = "Beat:";
             // 
             // label14
             // 
-            this.label14.AutoSize = true;
-            this.label14.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
-            this.label14.Location = new System.Drawing.Point(7, 116);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(63, 17);
-            this.label14.TabIndex = 4;
-            this.label14.Text = "Position:";
+            label14.AutoSize = true;
+            label14.Font = new Font("Segoe UI", 9.75F, FontStyle.Bold, GraphicsUnit.Point);
+            label14.Location = new Point(7, 116);
+            label14.Name = "label14";
+            label14.Size = new Size(63, 17);
+            label14.TabIndex = 4;
+            label14.Text = "Position:";
             // 
             // label15
             // 
-            this.label15.AutoSize = true;
-            this.label15.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
-            this.label15.Location = new System.Drawing.Point(29, 95);
-            this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(41, 17);
-            this.label15.TabIndex = 3;
-            this.label15.Text = "Type:";
+            label15.AutoSize = true;
+            label15.Font = new Font("Segoe UI", 9.75F, FontStyle.Bold, GraphicsUnit.Point);
+            label15.Location = new Point(29, 95);
+            label15.Name = "label15";
+            label15.Size = new Size(41, 17);
+            label15.TabIndex = 3;
+            label15.Text = "Type:";
             // 
             // label16
             // 
-            this.label16.AutoSize = true;
-            this.label16.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
-            this.label16.Location = new System.Drawing.Point(6, 74);
-            this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(64, 17);
-            this.label16.TabIndex = 2;
-            this.label16.Text = "Measure:";
+            label16.AutoSize = true;
+            label16.Font = new Font("Segoe UI", 9.75F, FontStyle.Bold, GraphicsUnit.Point);
+            label16.Location = new Point(6, 74);
+            label16.Name = "label16";
+            label16.Size = new Size(64, 17);
+            label16.TabIndex = 2;
+            label16.Text = "Measure:";
             // 
             // noteNextButton
             // 
-            this.noteNextButton.Location = new System.Drawing.Point(134, 19);
-            this.noteNextButton.Name = "noteNextButton";
-            this.noteNextButton.Size = new System.Drawing.Size(116, 23);
-            this.noteNextButton.TabIndex = 1;
-            this.noteNextButton.Text = "Next Note >";
-            this.noteNextButton.UseVisualStyleBackColor = true;
-            this.noteNextButton.Click += new System.EventHandler(this.noteNextButton_Click);
+            noteNextButton.Location = new Point(134, 19);
+            noteNextButton.Name = "noteNextButton";
+            noteNextButton.Size = new Size(116, 23);
+            noteNextButton.TabIndex = 1;
+            noteNextButton.Text = "Next Note >";
+            noteNextButton.UseVisualStyleBackColor = true;
+            noteNextButton.Click += noteNextButton_Click;
             // 
             // notePrevButton
             // 
-            this.notePrevButton.Location = new System.Drawing.Point(6, 19);
-            this.notePrevButton.Name = "notePrevButton";
-            this.notePrevButton.Size = new System.Drawing.Size(116, 23);
-            this.notePrevButton.TabIndex = 0;
-            this.notePrevButton.Text = "< Previous Note";
-            this.notePrevButton.UseVisualStyleBackColor = true;
-            this.notePrevButton.Click += new System.EventHandler(this.notePrevButton_Click);
+            notePrevButton.Location = new Point(6, 19);
+            notePrevButton.Name = "notePrevButton";
+            notePrevButton.Size = new Size(116, 23);
+            notePrevButton.TabIndex = 0;
+            notePrevButton.Text = "< Previous Note";
+            notePrevButton.UseVisualStyleBackColor = true;
+            notePrevButton.Click += notePrevButton_Click;
             // 
             // autoSaveTimer
             // 
-            this.autoSaveTimer.Tick += new System.EventHandler(this.autoSaveTimer_Tick);
+            autoSaveTimer.Tick += autoSaveTimer_Tick;
+            // 
+            // groupBox3
+            // 
+            groupBox3.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            groupBox3.Controls.Add(notesOnBeat);
+            groupBox3.Location = new Point(874, 223);
+            groupBox3.Name = "groupBox3";
+            groupBox3.Size = new Size(256, 160);
+            groupBox3.TabIndex = 35;
+            groupBox3.TabStop = false;
+            groupBox3.Text = "Notes on Beat";
+            // 
+            // notesOnBeat
+            // 
+            notesOnBeat.Columns.AddRange(new ColumnHeader[] { Type, Position, Size });
+            notesOnBeat.FullRowSelect = true;
+            notesOnBeat.HeaderStyle = ColumnHeaderStyle.Nonclickable;
+            notesOnBeat.Location = new Point(7, 22);
+            notesOnBeat.Name = "notesOnBeat";
+            notesOnBeat.Size = new Size(240, 130);
+            notesOnBeat.TabIndex = 0;
+            notesOnBeat.Tag = "Type";
+            notesOnBeat.UseCompatibleStateImageBehavior = false;
+            notesOnBeat.View = View.Details;
+            notesOnBeat.SelectedIndexChanged += notesOnBeat_SelectedIndexChanged;
+            // 
+            // Type
+            // 
+            Type.Tag = "Type";
+            Type.Text = "Type";
+            Type.Width = 100;
+            // 
+            // Position
+            // 
+            Position.Tag = "Position";
+            Position.Text = "Position";
+            Position.Width = 65;
+            // 
+            // Size
+            // 
+            Size.Tag = "Size";
+            Size.Text = "Size";
+            Size.Width = 50;
+            // 
+            // toolStripSeparator1
+            // 
+            toolStripSeparator1.Name = "toolStripSeparator1";
+            toolStripSeparator1.Size = new Size(177, 6);
+            // 
+            // dragPlaceNoteToolStripMenuItem
+            // 
+            dragPlaceNoteToolStripMenuItem.Checked = true;
+            dragPlaceNoteToolStripMenuItem.CheckOnClick = true;
+            dragPlaceNoteToolStripMenuItem.CheckState = CheckState.Checked;
+            dragPlaceNoteToolStripMenuItem.Name = "dragPlaceNoteToolStripMenuItem";
+            dragPlaceNoteToolStripMenuItem.Size = new Size(180, 22);
+            dragPlaceNoteToolStripMenuItem.Text = "Place Note on Drag";
             // 
             // MainForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.SystemColors.ControlDark;
-            this.ClientSize = new System.Drawing.Size(1142, 787);
-            this.Controls.Add(this.noteViewGroupBox);
-            this.Controls.Add(this.groupBox6);
-            this.Controls.Add(this.insertButton);
-            this.Controls.Add(this.groupBox9);
-            this.Controls.Add(this.playbackGroupBox);
-            this.Controls.Add(this.groupBox5);
-            this.Controls.Add(this.groupBox4);
-            this.Controls.Add(this.gimmickTypeGroupBox);
-            this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.groupBox1);
-            this.Controls.Add(this.circlePanel);
-            this.Controls.Add(this.menuStrip);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MainMenuStrip = this.menuStrip;
-            this.MinimumSize = new System.Drawing.Size(1158, 826);
-            this.Name = "MainForm";
-            this.Text = "BAKKA Editor - [New File]";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
-            this.Resize += new System.EventHandler(this.MainForm_Resize);
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.beat2Numeric)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.beat1Numeric)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.measureNumeric)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.sizeTrackBar)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.sizeNumeric)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.positionTrackBar)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.positionNumeric)).EndInit();
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.gimmickTypeGroupBox.ResumeLayout(false);
-            this.gimmickTypeGroupBox.PerformLayout();
-            this.groupBox4.ResumeLayout(false);
-            this.groupBox4.PerformLayout();
-            this.groupBox5.ResumeLayout(false);
-            this.groupBox5.PerformLayout();
-            this.playbackGroupBox.ResumeLayout(false);
-            this.playbackGroupBox.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.trackBarSpeed)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.trackBarVolume)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.songTrackBar)).EndInit();
-            this.groupBox9.ResumeLayout(false);
-            this.groupBox9.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.visualHispeedNumeric)).EndInit();
-            this.menuStrip.ResumeLayout(false);
-            this.menuStrip.PerformLayout();
-            this.groupBox6.ResumeLayout(false);
-            this.groupBox6.PerformLayout();
-            this.noteViewGroupBox.ResumeLayout(false);
-            this.noteViewGroupBox.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            BackColor = SystemColors.ControlDark;
+            ClientSize = new Size(1142, 787);
+            Controls.Add(groupBox3);
+            Controls.Add(noteViewGroupBox);
+            Controls.Add(groupBox6);
+            Controls.Add(insertButton);
+            Controls.Add(groupBox9);
+            Controls.Add(playbackGroupBox);
+            Controls.Add(groupBox5);
+            Controls.Add(groupBox4);
+            Controls.Add(gimmickTypeGroupBox);
+            Controls.Add(groupBox2);
+            Controls.Add(groupBox1);
+            Controls.Add(circlePanel);
+            Controls.Add(menuStrip);
+            Icon = (Icon)resources.GetObject("$this.Icon");
+            MainMenuStrip = menuStrip;
+            MinimumSize = new Size(1158, 826);
+            Name = "MainForm";
+            Text = "BAKKA Editor - [New File]";
+            FormClosing += MainForm_FormClosing;
+            Resize += MainForm_Resize;
+            groupBox1.ResumeLayout(false);
+            groupBox1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)beat2Numeric).EndInit();
+            ((System.ComponentModel.ISupportInitialize)beat1Numeric).EndInit();
+            ((System.ComponentModel.ISupportInitialize)measureNumeric).EndInit();
+            ((System.ComponentModel.ISupportInitialize)sizeTrackBar).EndInit();
+            ((System.ComponentModel.ISupportInitialize)sizeNumeric).EndInit();
+            ((System.ComponentModel.ISupportInitialize)positionTrackBar).EndInit();
+            ((System.ComponentModel.ISupportInitialize)positionNumeric).EndInit();
+            groupBox2.ResumeLayout(false);
+            groupBox2.PerformLayout();
+            gimmickTypeGroupBox.ResumeLayout(false);
+            gimmickTypeGroupBox.PerformLayout();
+            groupBox4.ResumeLayout(false);
+            groupBox4.PerformLayout();
+            groupBox5.ResumeLayout(false);
+            groupBox5.PerformLayout();
+            playbackGroupBox.ResumeLayout(false);
+            playbackGroupBox.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)trackBarSpeed).EndInit();
+            ((System.ComponentModel.ISupportInitialize)trackBarVolume).EndInit();
+            ((System.ComponentModel.ISupportInitialize)songTrackBar).EndInit();
+            groupBox9.ResumeLayout(false);
+            groupBox9.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)visualHispeedNumeric).EndInit();
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
+            groupBox6.ResumeLayout(false);
+            groupBox6.PerformLayout();
+            noteViewGroupBox.ResumeLayout(false);
+            noteViewGroupBox.PerformLayout();
+            groupBox3.ResumeLayout(false);
+            ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
@@ -1588,5 +1571,12 @@
         private Button gimmickJumpToCurrTimeButton;
         private ToolStripMenuItem showGimmicksInCircleViewToolStripMenuItem;
         private ToolStripMenuItem showGimmicksDuringPlaybackToolStripMenuItem;
+        private GroupBox groupBox3;
+        private ListView notesOnBeat;
+        private ColumnHeader Type;
+        private ColumnHeader Position;
+        private ColumnHeader Size;
+        private ToolStripSeparator toolStripSeparator1;
+        private ToolStripMenuItem dragPlaceNoteToolStripMenuItem;
     }
 }
\ No newline at end of file
diff --git a/BAKKA-Editor/MainForm.cs b/BAKKA-Editor/MainForm.cs
index 724a15d..096b27e 100644
--- a/BAKKA-Editor/MainForm.cs
+++ b/BAKKA-Editor/MainForm.cs
@@ -4,6 +4,7 @@ using IrrKlang;
 using BAKKA_Editor.Operations;
 using Tomlyn;
 using System.Security.Cryptography.X509Certificates;
+using System.Text;
 
 namespace BAKKA_Editor
 {
@@ -124,15 +125,15 @@ namespace BAKKA_Editor
                 File.WriteAllText("settings.toml", Toml.FromModel(userSettings));
             }
             // Apply settings
-            showCursorToolStripMenuItem.Checked                 = userSettings.ViewSettings.ShowCursor;
-            showCursorDuringPlaybackToolStripMenuItem.Checked   = userSettings.ViewSettings.ShowCursorDuringPlayback;
-            highlightViewedNoteToolStripMenuItem.Checked        = userSettings.ViewSettings.HighlightViewedNote;
-            showGimmicksInCircleViewToolStripMenuItem.Checked   = userSettings.ViewSettings.ShowGimmicks;
+            showCursorToolStripMenuItem.Checked = userSettings.ViewSettings.ShowCursor;
+            showCursorDuringPlaybackToolStripMenuItem.Checked = userSettings.ViewSettings.ShowCursorDuringPlayback;
+            highlightViewedNoteToolStripMenuItem.Checked = userSettings.ViewSettings.HighlightViewedNote;
+            showGimmicksInCircleViewToolStripMenuItem.Checked = userSettings.ViewSettings.ShowGimmicks;
             showGimmicksDuringPlaybackToolStripMenuItem.Checked = userSettings.ViewSettings.ShowGimmicksDuringPlayback;
-            selectLastInsertedNoteToolStripMenuItem.Checked     = userSettings.ViewSettings.SelectLastInsertedNote;
-            visualHispeedNumeric.Value                          = (decimal)userSettings.ViewSettings.HispeedSetting;
-            trackBarVolume.Value                                = userSettings.ViewSettings.Volume;
-            autoSaveTimer.Interval                              = userSettings.SaveSettings.AutoSaveInterval * 60000;
+            selectLastInsertedNoteToolStripMenuItem.Checked = userSettings.ViewSettings.SelectLastInsertedNote;
+            visualHispeedNumeric.Value = (decimal)userSettings.ViewSettings.HispeedSetting;
+            trackBarVolume.Value = userSettings.ViewSettings.Volume;
+            autoSaveTimer.Interval = userSettings.SaveSettings.AutoSaveInterval * 60000;
             autoSaveTimer.Enabled = true;
             // Update hotkey labels
             tapButton.AppendHotkey(userSettings.HotkeySettings.TouchHotkey);
@@ -350,15 +351,15 @@ namespace BAKKA_Editor
             if (tempFilePath != "")
                 File.Delete(tempFilePath);
             // Apply settings
-            userSettings.ViewSettings.ShowCursor                    = showCursorToolStripMenuItem.Checked;
-            userSettings.ViewSettings.ShowCursorDuringPlayback      = showCursorDuringPlaybackToolStripMenuItem.Checked;
-            userSettings.ViewSettings.HighlightViewedNote           = highlightViewedNoteToolStripMenuItem.Checked;
-            userSettings.ViewSettings.ShowGimmicks                  = showGimmicksInCircleViewToolStripMenuItem.Checked;
-            userSettings.ViewSettings.ShowGimmicksDuringPlayback    = showGimmicksDuringPlaybackToolStripMenuItem.Checked;
-            userSettings.ViewSettings.SelectLastInsertedNote        = selectLastInsertedNoteToolStripMenuItem.Checked;
-            userSettings.ViewSettings.HispeedSetting                = circleView.Hispeed;
-            userSettings.ViewSettings.Volume                        = trackBarVolume.Value;
-            userSettings.SaveSettings.AutoSaveInterval              = autoSaveTimer.Interval / 60000;
+            userSettings.ViewSettings.ShowCursor = showCursorToolStripMenuItem.Checked;
+            userSettings.ViewSettings.ShowCursorDuringPlayback = showCursorDuringPlaybackToolStripMenuItem.Checked;
+            userSettings.ViewSettings.HighlightViewedNote = highlightViewedNoteToolStripMenuItem.Checked;
+            userSettings.ViewSettings.ShowGimmicks = showGimmicksInCircleViewToolStripMenuItem.Checked;
+            userSettings.ViewSettings.ShowGimmicksDuringPlayback = showGimmicksDuringPlaybackToolStripMenuItem.Checked;
+            userSettings.ViewSettings.SelectLastInsertedNote = selectLastInsertedNoteToolStripMenuItem.Checked;
+            userSettings.ViewSettings.HispeedSetting = circleView.Hispeed;
+            userSettings.ViewSettings.Volume = trackBarVolume.Value;
+            userSettings.SaveSettings.AutoSaveInterval = autoSaveTimer.Interval / 60000;
             //Update user settings.toml
             if (File.Exists("settings.toml"))
                 File.WriteAllText("settings.toml", Toml.FromModel(userSettings));
@@ -482,8 +483,8 @@ namespace BAKKA_Editor
                     minSize = 1;
                     break;
             }
-            if (sizeNumeric.Value < minSize)    sizeNumeric.Value = minSize;
-            if (sizeTrackBar.Value < minSize)   sizeTrackBar.Value = minSize;
+            if (sizeNumeric.Value < minSize) sizeNumeric.Value = minSize;
+            if (sizeTrackBar.Value < minSize) sizeTrackBar.Value = minSize;
             sizeNumeric.Minimum = minSize;
             sizeTrackBar.Minimum = minSize;
             circlePanel.Invalidate();
@@ -655,6 +656,8 @@ namespace BAKKA_Editor
             {
                 circleView.CurrentMeasure = (float)measureNumeric.Value + ((float)beat1Numeric.Value / (float)beat2Numeric.Value);
                 circlePanel.Invalidate();
+
+                UpdateNotesOnBeat();
             }
 
             if (currentNoteType == NoteType.HoldJoint || currentNoteType == NoteType.HoldEnd)
@@ -676,7 +679,7 @@ namespace BAKKA_Editor
                 insertButton.Enabled = false;
             }
             else
-            { 
+            {
                 insertButton.Enabled = true;
             }
         }
@@ -796,7 +799,7 @@ namespace BAKKA_Editor
             // don't reset hold state if we're already inserting a hold
             if (isInsertingHold)
                 return;
-            
+
             if (noBonusRadio.Checked)
                 SetSelectedObject(NoteType.HoldStartNoBonus);
             else if (bonusRadio.Checked)
@@ -818,7 +821,7 @@ namespace BAKKA_Editor
 
         private void endHoldCheck_CheckedChanged(object sender, EventArgs e)
         {
-            if(endHoldCheck.Checked && currentNoteType == NoteType.HoldJoint)
+            if (endHoldCheck.Checked && currentNoteType == NoteType.HoldJoint)
             {
                 SetSelectedObject(NoteType.HoldEnd);
             }
@@ -1044,6 +1047,7 @@ namespace BAKKA_Editor
                 {
                     playButton.Text = "Pause";
                     updateTimer.Enabled = true;
+                    notesOnBeat.Items.Clear();
                 }
                 playButton.AppendHotkey(userSettings.HotkeySettings.PlayHotkey);
             }
@@ -1117,7 +1121,7 @@ namespace BAKKA_Editor
             }
 
             var dist = Utils.GetDist(e.Location, circleView.mouseDownPt);
-            if (dist > 5.0f)
+            if (dist > 5.0f && dragPlaceNoteToolStripMenuItem.Checked)
                 InsertObject();
             circleView.UpdateMouseUp();
             circlePanel.Invalidate();
@@ -1250,6 +1254,7 @@ namespace BAKKA_Editor
                 if (selectLastInsertedNoteToolStripMenuItem.Checked)
                     nextSelectedNote = tempNote;
                 chart.Notes.Add(tempNote);
+                UpdateNotesOnBeat();
                 chart.IsSaved = false;
                 switch (currentNoteType)
                 {
@@ -1269,7 +1274,7 @@ namespace BAKKA_Editor
         private void SetNonHoldButtonState(bool state)
         {
             isInsertingHold = !state;
-            
+
             tapButton.Enabled = state;
             orangeButton.Enabled = state;
             greenButton.Enabled = state;
@@ -1388,13 +1393,13 @@ namespace BAKKA_Editor
             MessageBox.Show(
                 $"Authors: Goatgarien and VeroxZik\n" +
                 $"Contributions: Yellowberry, Farex-GH\n" +
-                $"Icon: IPIhypster", 
+                $"Icon: IPIhypster",
                 $"BAKKA Editor {fileVersion}");
         }
 
         private void initialChartSettingsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            ShowInitialSettings();   
+            ShowInitialSettings();
         }
 
         private void ShowInitialSettings()
@@ -1436,7 +1441,7 @@ namespace BAKKA_Editor
         {
             circlePanel.Invalidate();
         }
-        
+
         private void showGimmicksInCircleViewToolStripMenuItem_Click(object sender, EventArgs e)
         {
             circlePanel.Invalidate();
@@ -1654,7 +1659,7 @@ namespace BAKKA_Editor
             }
 
             // Prevent deletetion of initial BPM and time signature
-            if (chart.Gimmicks.Count == 0 
+            if (chart.Gimmicks.Count == 0
                 || (gimmick.Measure == 0 && (gimmick.GimmickType == GimmickType.BpmChange || gimmick.GimmickType == GimmickType.TimeSignatureChange)))
             {
                 gimmickDeleteButton.Enabled = false;
@@ -1669,7 +1674,7 @@ namespace BAKKA_Editor
         {
             if (val != -2)
                 selectedNoteIndex = val;
-            if(selectedNoteIndex == -1)
+            if (selectedNoteIndex == -1)
             {
                 noteMeasureLabel.Text = "None";
                 noteBeatLabel.Text = "None";
@@ -1798,7 +1803,7 @@ namespace BAKKA_Editor
             NoteOperation op2 = null;
             if (chart.Notes[selectedNoteIndex].NoteType == NoteType.HoldStartBonusFlair || chart.Notes[selectedNoteIndex].NoteType == NoteType.HoldStartNoBonus)
             {
-                if(chart.Notes[selectedNoteIndex].NextNote != null)
+                if (chart.Notes[selectedNoteIndex].NextNote != null)
                 {
                     if (chart.Notes[selectedNoteIndex].NextNote.NoteType == NoteType.HoldEnd)
                     {
@@ -1808,7 +1813,7 @@ namespace BAKKA_Editor
             }
             if (chart.Notes[selectedNoteIndex].NoteType == NoteType.HoldEnd)
             {
-                if(chart.Notes[selectedNoteIndex].PrevNote != null)
+                if (chart.Notes[selectedNoteIndex].PrevNote != null)
                 {
                     if (chart.Notes[selectedNoteIndex].PrevNote.NoteType == NoteType.HoldStartBonusFlair || chart.Notes[selectedNoteIndex].PrevNote.NoteType == NoteType.HoldStartNoBonus)
                     {
@@ -1836,7 +1841,7 @@ namespace BAKKA_Editor
             {
                 val = trackBarVolume.Maximum - trackBarVolume.Value;
             }
-            else if (!increase && (trackBarVolume.Value - val<trackBarVolume.Minimum))
+            else if (!increase && (trackBarVolume.Value - val < trackBarVolume.Minimum))
             {
                 val = trackBarVolume.Value - trackBarVolume.Minimum;
             }
@@ -1865,7 +1870,7 @@ namespace BAKKA_Editor
                     insertButton.Focus();
                     return true;
                 case Keys.Up | Keys.Shift:
-                    /* Fallthrough */
+                /* Fallthrough */
                 case Keys.Down | Keys.Shift:
                     keyData &= ~Keys.Shift;
                     playbackVolumeChange(keyData == Keys.Up);
@@ -2099,7 +2104,7 @@ namespace BAKKA_Editor
             }
         }
 
-        
+
         private void trackBarVolume_ValueChanged(object sender, EventArgs e)
         {
             /* No song, nothing to do. */
@@ -2108,7 +2113,7 @@ namespace BAKKA_Editor
                 return;
             }
             /* Volume is represented as a float from 0-1. */
-            currentSong.Volume = (float) trackBarVolume.Value / (float) trackBarVolume.Maximum;
+            currentSong.Volume = (float)trackBarVolume.Value / (float)trackBarVolume.Maximum;
             circlePanel.Invalidate();
         }
 
@@ -2154,7 +2159,7 @@ namespace BAKKA_Editor
 
         bool CurrentlyInsertingHold()
         {
-            if(currentNoteType == NoteType.HoldJoint || currentNoteType == NoteType.HoldEnd)
+            if (currentNoteType == NoteType.HoldJoint || currentNoteType == NoteType.HoldEnd)
             {
                 return true;
             }
@@ -2201,5 +2206,48 @@ namespace BAKKA_Editor
             circleView.showHispeed = showGimmicksDuringPlaybackToolStripMenuItem.Checked;
             circlePanel.Invalidate();
         }
+
+        private void UpdateNotesOnBeat()
+        {
+            // Fill list of notes on beat
+            notesOnBeat.Items.Clear();
+
+            var notes = chart.Notes.Where(n => n.BeatInfo.MeasureDecimal == circleView.CurrentMeasure).Select(n =>
+            {
+                var listItem = new ListViewItem(n.NoteType.ToLabel());
+                listItem.SubItems.Add(n.Position.ToString());
+                listItem.SubItems.Add(n.Size.ToString());
+
+                return listItem;
+            }).ToArray();
+
+            notesOnBeat.Items.AddRange(notes);
+        }
+
+        private void notesOnBeat_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (notesOnBeat.SelectedItems.Count != 1) return; 
+
+            var selectedNote = notesOnBeat.SelectedItems[0];
+            var noteType = selectedNote.Text;
+            var position = float.Parse(selectedNote.SubItems[1].Text);
+            var size = float.Parse(selectedNote.SubItems[2].Text);
+
+            float currentMeasure = circleView.CurrentMeasure;
+
+            // Find the matching selected note
+            var noteInChart = chart.Notes.FirstOrDefault(x => x.BeatInfo.MeasureDecimal == currentMeasure && 
+                x.NoteType.ToLabel() == noteType &&
+                x.Position == position &&
+                x.Size == size
+            );
+
+            if (noteInChart != null)
+            {
+                selectedNoteIndex = chart.Notes.IndexOf(noteInChart);
+                circlePanel.Invalidate();
+                UpdateNoteLabels();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/BAKKA-Editor/MainForm.resx b/BAKKA-Editor/MainForm.resx
index 999f8ab..7172856 100644
--- a/BAKKA-Editor/MainForm.resx
+++ b/BAKKA-Editor/MainForm.resx
@@ -1,4 +1,64 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">