Update controls (17/20)

Update controls