Added more General shortcuts, and text navigation