Minor code improvements to fit functionalyties (Key-Bindings)