Merge "Reorder the context menu and add divider"