Simplified adding menu actions slightly

Now we automatically add the [ ] around the selection key instead
of making the caller specify them manually.
Started a menu unit test