Context menu improved; Note reposition ability added