Added selector and keyboard controls.