Added mappings for some extra keyboard keys
Adjusted shortcuts