Fix delete logic and replace some commands

Now key combinations are also displayed in the context menu correctly.