Changed some of the key mappings