updated layout and key bindings