More work on the context menu