Changed a few key mappings