Tidy up default program
Add keybindings