Adjusted some key mapping