Add configuration
Key bindings fix