Formatting and keybind changes