Update keybindings and tweaked structure