Better controls (1/20)

Better controls