Added more display options and key bindings