Further changes to Badge view
Replacing ICommands by relayCommands