593 (599): Rearrange oncontextmenu