Fix controls

Conflicts:
	index.js