Fix bundles and reset arrow key mapping