Some key bindings and ui tweaks