Refactor key mapping and move it to Super-a