Rearranged the context menu