Revert "Revert "Changed controls""

This reverts commit f6b26c1cdfe54e73314129af06301e153cbf352f.