Rearranged tree to be more sane. Made formatting changes to stage 2. Fixed a bug where edit would be bypassed if the note was just created.
Jon-William Lewis