Another update of controls

Hopefully this time it's going to be enough to pass certification at
Microsoft Store.