Context menu improvements