Revamp keybindings and format